Compare commits

..

1203 Commits

Author SHA1 Message Date
Bryan Petty
c843b91448 This commit was manufactured by cvs2svn to create tag 'agide'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/agide@38809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 22:06:57 +00:00
Vadim Zeitlin
e56f4f9e90 use CXXFLAGS instead of CFLAGS in several places now that the tests are done using C++ compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 22:06:57 +00:00
Robin Dunn
e48f0e09bf Add AppendSubMenu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:56:56 +00:00
Robin Dunn
1412e528f8 Removed GetVisible and SetVisible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:56:24 +00:00
Robin Dunn
e0de65e8b8 Added wx.RendererNative.DrawCheckButton.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:55:25 +00:00
Robin Dunn
46992103a3 Added wx.StandardPaths.GetDocumentsDir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:54:14 +00:00
Robin Dunn
99a001dd43 Changed how the stock objects (wx.RED, wx.RED_PEN, wx.RED_BRUSH, etc.)
are initialized.  They are now created as a wrapper object that
initializes itself on first use (when an attribute of the object is
requested.)  This was needed because of similar delayed initialization
functionality that was implemented in wxWidgets, but the end result is
cleaner for wxPython as well, and allowed me to remove some ugly code
under the covers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:49:48 +00:00
Vadim Zeitlin
5d7b75542e regenaretd configure after AC_LANG changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:07:06 +00:00
Vadim Zeitlin
a24217f050 don't include GNOME FS header if we don't use it (and might not have it at all)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:06:25 +00:00
Vadim Zeitlin
d84cedb39e compile GTK+ test program using C compiler, not C++ one, otherwise it always fails as it uses undeclared functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:03:57 +00:00
Vadim Zeitlin
d240dea199 removed extra semicolon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 21:03:15 +00:00
Vadim Zeitlin
8006bf3c49 do all tests using C++ compiler, this should fix all problems due to testing with C compiler and compiling the real code later with the C++ one (such as bug 1472458); in case of problems, the last version using C for (most) tests is tagged BEFORE_LANG_CXX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 20:50:24 +00:00
Włodzimierz Skiba
5c1f6b2752 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 19:37:10 +00:00
Włodzimierz Skiba
a2e5beeebb Avoid deleting 'const' object.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 19:34:23 +00:00
Robert Roebling
862d8041ab Add wxRenderer::DrawCheckButton for use inside
wxDataViewCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 16:14:12 +00:00
Włodzimierz Skiba
f6630099a7 Blind build fix for night wxOS2 build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 12:30:57 +00:00
Włodzimierz Skiba
3a8db46f44 Fixes after stock gdi changes within core library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 10:01:38 +00:00
Włodzimierz Skiba
7520f3da33 wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 09:56:17 +00:00
Włodzimierz Skiba
18f3decb46 wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 09:05:00 +00:00
Włodzimierz Skiba
ce3e37f1ec [#1472076] Fixes after stock gdi changes within core library.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 08:29:15 +00:00
Włodzimierz Skiba
93763ad5ba wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 08:11:26 +00:00
Włodzimierz Skiba
8898456df4 wx/wxprec.h already includes wx/defs.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 07:24:35 +00:00
Vadim Zeitlin
2c1e249967 compilation fix for !WX_PRECOMP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 18:04:58 +00:00
Vadim Zeitlin
8258c3ddbd document that Remove(index) doesn't delete the window neither (replaces patch 1470834)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 17:01:16 +00:00
Vadim Zeitlin
484e841e33 corrected ancient event type constant in an example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 11:43:41 +00:00
Vadim Zeitlin
61bb5a9c1b implement Layout() so that sizers work correctly when the window is scrolled (1st part of the patch 1439905)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 02:00:48 +00:00
Vadim Zeitlin
f5e209857f don't use COMPRESSION_LZW by default, it's not implemented in our own libtiff (patch 1434275)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 01:54:10 +00:00
Vadim Zeitlin
b26a650c10 added insert_at property for the object nodes (patch 1185138)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 01:35:22 +00:00
Vadim Zeitlin
17af82fb4c added wxStandardPaths::GetDocumentsDir() (patch 1214360)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 01:12:04 +00:00
Vadim Zeitlin
af6c0f1de7 don't eat activation events (replaces patch 1465849)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-17 00:00:58 +00:00
Vadim Zeitlin
3700e21b91 added a menu allowing to quickly switch to any page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 23:57:57 +00:00
Vadim Zeitlin
fdfe568d12 no changes, just removed some commented out code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 23:43:49 +00:00
Vadim Zeitlin
a183ddba3e don't return items which are not visible from DoHitTest() (patch 1448508)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 23:41:52 +00:00
Vadim Zeitlin
1301e2289f added a menu allowing to change the border style used by the widget
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 23:39:11 +00:00
Vadim Zeitlin
6493aacaeb centralized the handling of border styles; added borders support for wxListBox and support of other kinds of borders (patch 1448088)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 23:38:26 +00:00
Vadim Zeitlin
3786c8b587 added wxMenu::AppendSubMenu() to avoid having to specify a dummy id when adding a submenu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 23:25:21 +00:00
Vadim Zeitlin
47ce5c4a5a clarified the rules for determining whether the path is absolute or relative (patch 1451229 and bug 1438196)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:44:19 +00:00
Vadim Zeitlin
432ea998aa added virtual dtor to wxHtmlWindowMouseHelper to avoid gcc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:41:15 +00:00
Vadim Zeitlin
1de8d512b7 simplify/cleanup wxTheXXXList and wxGDIObject code (patch 1452023 from Paul Cornett)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:33:24 +00:00
Vadim Zeitlin
d0914b9d8d build fixes for wxUSE_LOG==0 (modified patch 1450207)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:29:47 +00:00
Vadim Zeitlin
f516d98637 create stock GDI objects on demand; use const with GDI objects appropriately (patch 1445355)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:18:29 +00:00
Vadim Zeitlin
c4edcd7c86 documented Set/GetBitmapSelected() (patch 1339028)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:10:45 +00:00
Vadim Zeitlin
66df4ec643 show effects of mirroring toucan image with alpha (modified part of patch 1469817)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 21:41:59 +00:00
Vadim Zeitlin
051924b886 Handle alpha channel in wxImage::Mirror() and GetSubImage() (patch 1469817)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 21:37:39 +00:00
Vadim Zeitlin
2936a6b18c implement wxFileModificationTime() in terms of wxFileName::GetTimes() (replaces broken patch 1468592)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 21:24:22 +00:00
Vadim Zeitlin
57e988b8ef added overwrite parameter to wxRenameFile (patch 1467041)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 21:14:00 +00:00
Vadim Zeitlin
e3950b1852 added missing methods documentation (patch 1466949); also use \arg instead of \it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 21:09:12 +00:00
Julian Smart
d5363f57fb Make an image block beore writing it, if there's no data in the block
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 18:37:09 +00:00
Vadim Zeitlin
dd5cb4b197 define WX_DIR as WXWIN env var for Unix and not only Win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 15:47:11 +00:00
Vadim Zeitlin
c81032a760 allow specifying non default libraries for gnu output format (patch 1469464)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 15:42:00 +00:00
Julian Smart
4bfec1790f Changed the wxPlatform syntax as per Vadim's suggestions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 09:31:06 +00:00
Vadim Zeitlin
e4861c72be HitTest() seems to be implemented on most platforms now (replaces patch 1467212)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 01:24:32 +00:00
Vadim Zeitlin
c9d9b9c11a fixed typo in EVT_SCROLLWIN_BOTTOM documentation (patch 1463429)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 01:16:16 +00:00
Vadim Zeitlin
760f0fc2f4 set up scrollbars correctly when we don't need them (fixes the problems reported by the patches 1460482 and 1456060)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 01:14:28 +00:00
Vadim Zeitlin
6fb683081c removed unnecessary (the problem is due to a bug elsewhere) test for vertical scroll position in OnScroll() introduced in rev 1.400
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 01:10:28 +00:00
Vadim Zeitlin
cf76cd4eba a tentatively better fix for the problem of patch 1456060: don't use m_linesPerPage directly as it's initialized on demand by GetCountPerPage(); also removed some stray tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 00:48:34 +00:00
Julian Smart
55d452c6f9 Typo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 19:34:18 +00:00
Vadim Zeitlin
d364df5fee removed unneeded reverse_iterator::operator->() which provokes VC6 warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 18:39:56 +00:00
Julian Smart
230c90774f Easier platform testing class and function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 17:40:13 +00:00
Vadim Zeitlin
481203cb23 made width computation in GetTextExtent() more precise, especially for italics fonts (based on the code from Wlodek Szafran)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 15:08:43 +00:00
Vadim Zeitlin
968f291be6 added wxString::rbegin() and rend()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 15:03:57 +00:00
Stefan Neis
d704d2f5dc Replaced "uint" (which may be or may not be defined depending on platform)
by "guint".


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 10:01:21 +00:00
Robin Dunn
e9d6f3a473 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 07:30:59 +00:00
Robin Dunn
89a3d0f772 Avoid assert that was hidden by IsStandard bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 06:54:37 +00:00
Robin Dunn
7017fd6745 IsStandard needs to check m_type, not m_format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 06:53:56 +00:00
Robin Dunn
c072c75701 Give wxDataObjectComposite a way to report what kind of data was given
to it from the clipboard or DnD source.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 05:35:08 +00:00
Robin Dunn
4725f47eb2 Various wxHtml updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 05:30:35 +00:00
Robin Dunn
de871c916e Add wxButtonToolBar, but since it is currently only enabled for Mac
leave it #if'd out for now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 05:15:56 +00:00
Robin Dunn
2890ca155b Remove wxHVScrolledWindow wrappers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 05:06:41 +00:00
Robin Dunn
1564807335 Wrap some deprecation wrappers around newly deprecated items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 05:02:59 +00:00
Robin Dunn
e6f85a8554 Add some missing wxPyBeginBlockThreads calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 04:29:30 +00:00
Vadim Zeitlin
619297ab30 slight simplification of coords translation code in GetBoundingRect()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-15 01:16:52 +00:00
Vadim Zeitlin
96c59453c5 removed reference to hvscroll.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 23:03:28 +00:00
Vadim Zeitlin
4c384a0b37 reverted wxHVScrolledWindow patch (back to rev 1.10)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 22:03:07 +00:00
Václav Slavík
5e888f8eef don't use deprecated interface
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 21:02:54 +00:00
Václav Slavík
31297dbbd0 use public inheritance when deriving from wxHtmlWindowMouseHelper so that overriden methods can call base versions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 20:43:06 +00:00
Włodzimierz Skiba
561db924ca Deprecated and obsolete parts marked up for backward compatibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 20:06:39 +00:00
Włodzimierz Skiba
3ed377f13a Build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 19:56:03 +00:00
Włodzimierz Skiba
1d94e268dd Deprecated and obsolete parts marked up for backward compatibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 19:54:51 +00:00
Włodzimierz Skiba
89831b54e6 Deprecated and obsolete parts marked up for backward compatibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 19:32:51 +00:00
Włodzimierz Skiba
8243a33965 HitTest is not deprecated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 18:17:16 +00:00
Vadim Zeitlin
bf5752a4a0 respect the specified font encoding in DoGetTextExtent() instead of always using m_font
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 17:34:35 +00:00
Vadim Zeitlin
1a6c768b17 added wxGTK_CONV_FONT/ENC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 17:32:25 +00:00
Vadim Zeitlin
63916e4494 don't show vertical scrollbar if we don't need it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 17:16:45 +00:00
Włodzimierz Skiba
40ff126ac4 Deprecated and obsolete parts marked up for backward compatibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 17:01:16 +00:00
Julian Smart
006591def7 Spacing tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 16:25:33 +00:00
Vadim Zeitlin
234b1c0147 reverted wxHVScrolledWindow patch (rev 1.19/1.21 of vscroll.h/.cpp) because not only we don't want to duplicate code like this but it also broke wxHtmlListBox by making scrolling in it O(N) instead of O(1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 15:55:28 +00:00
Julian Smart
fac6eaec24 Simulated text labels and toggle highlights under buttons
Removed background colour


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 15:49:57 +00:00
Julian Smart
b95c06ba08 Reversed accidental commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 15:24:50 +00:00
Vadim Zeitlin
959b1a338e fixed bug with not taking background colour into account introduced in 1.24
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 15:22:31 +00:00
Julian Smart
77631b1d81 Implemented Mac-style button toggling within wxButtonToolBar, and line
under toolbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 12:40:34 +00:00
Julian Smart
1a1190b245 Allow specification of border spacing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 12:38:48 +00:00
Włodzimierz Skiba
9d9d3d55c9 MSLU with DMC build fix [#1469456].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 12:16:29 +00:00
Václav Slavík
88a1b6485f don't show the I-beam cursor over text in wxHtmlListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 11:38:36 +00:00
Julian Smart
b887dc7b5a wxButtonToolBar only useful on Mac right now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 10:09:11 +00:00
Julian Smart
e5f49cbf82 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 09:31:47 +00:00
Julian Smart
64d3ed176d Steps towards implementing native-style, non-top-level toolbars on Mac
by implementing a toolbar class that uses native buttons.
Ultimately this should allow wxToolbook and wxPropertySheetDialog
classes to look native, when we complete the button API improvements
to combine text, bitmaps and toggling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 09:15:10 +00:00
Jamie Gadd
44c930ebba Fix bug in GetTimeZone where timezone wasn't set.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-14 03:05:45 +00:00
Václav Slavík
bc55e31bdc 1. added abstract interface to wxHtmlWindow for use by wxHtmlWinParser and implemented it for wxHtmlListBox
2. used the above to implement clickable links support in wxHtmlListBox


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 22:08:28 +00:00
Włodzimierz Skiba
e0d5d9af8b All book controls shares wxBK_* flags [bug #1469980].
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 18:24:38 +00:00
Julian Smart
9916dbf643 Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 14:37:11 +00:00
Julian Smart
87cf52d8ac On screens with restricted space, it's useful to be able to add controls
to e.g. the wxChoice control of a wxChoicebook. GetControlSizer
allows an app to do that, and we also add a control margin which
may or may not be respected by individual book controls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 14:22:32 +00:00
Jamie Gadd
7a9f5d5a79 Fix casts from void* to int on x86_64 gcc by using wxUIntPtr instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 12:41:21 +00:00
Vadim Zeitlin
a78c43f158 initialize nulLen to 0 for all compilers as some versions of gcc don't see that it's not used if left uninitialized too (bug 1469637)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 12:16:38 +00:00
Julian Smart
5ccc3f8470 Added Makefile.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-13 08:25:22 +00:00
Stefan Neis
0934d91c7b Fixed GetSelection to behave the same as for the other ports, added
GetCurrentSelection.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 20:31:46 +00:00
Vadim Zeitlin
43563ef2dd mention UTF-16/32 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 16:22:14 +00:00
Julian Smart
ca3af33701 Addd IsDynamic, added const to CreateObject
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 14:29:50 +00:00
Julian Smart
cb8acbd632 Added IsDynamic to XTI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 13:46:21 +00:00
Julian Smart
dd456db5e6 Applied patch [ 1463711 ] wxRichTextCtrl fix for pasting text
(too many linefeeds).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 13:33:48 +00:00
Julian Smart
0c06c9839c Applied patch [ 1211299 ] Minor mod to wxClassInfo to improve usability
David Falkinder


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 13:06:05 +00:00
Vadim Zeitlin
171a1afede made ShouldPreventAppExit() public
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 00:47:36 +00:00
Vadim Zeitlin
46e86fc347 a better compilation fix after wxGTK_CONV changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-12 00:17:36 +00:00
Vadim Zeitlin
c334a69083 removed spurious if in DoGradientFillLinear()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 21:28:12 +00:00
Vadim Zeitlin
b8f3257625 compilation fix after wxGTK_CONV changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 21:24:52 +00:00
Włodzimierz Skiba
bd755fdc3f Update wxMGL/wxOS2 makefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 18:32:49 +00:00
Vadim Zeitlin
5851053a96 added wx/font.h include to fix PCH-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 14:18:20 +00:00
Włodzimierz Skiba
f321851acb Regenerated Makefile after wxBaseOS2 fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 13:26:11 +00:00
Stefan Csomor
0c81ef7fce Ryan's patch 1468129 ,
1) Don't hog mouse events from other windows
2) Don't crash on mouse and other events when a bad file is loaded
3) Correctly detect whether a file can be loaded or not (Forgot to call ::ClearMoviesStickyError())
4) Real workaround for the wxNotebook issue (by using offscreen GWorld)
5) Nuke of CreateMovieControl version and many other cleanups


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 05:53:55 +00:00
Stefan Csomor
786a9df157 Ryan's patch 1467727 , removing the SetValue from SetRange when not needed and some cleanups
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 05:45:31 +00:00
Robin Dunn
2d6a2f1d78 Add wxST_DOTS_MIDDLE and wxST_DOTS_END constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 01:43:37 +00:00
Vadim Zeitlin
4693d68648 removed wxGTK2 hack, not needed any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 01:37:36 +00:00
Vadim Zeitlin
77c514d111 if we don't convert message catalog strings to the UI encoding, use message catalog encoding for the UI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 01:34:03 +00:00
Robin Dunn
ffb4a474d3 Acquire the GIL in GetSelections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 01:18:23 +00:00
Vadim Zeitlin
1cef1b4ab6 Unicode compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 01:05:18 +00:00
Vadim Zeitlin
7a4b1e6623 some code simplifications, no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 01:04:21 +00:00
Vadim Zeitlin
d5bef0a323 added wxConvUI which determines the conversion used for the UI elements and can be changed from the user code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 00:36:24 +00:00
Vadim Zeitlin
ef95ce4170 documented all the other global conversion objects (wxConvLocal, wxConvISO8859_1, wxConvUTF8)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-11 00:33:18 +00:00
Vadim Zeitlin
12bc5f9ad2 use wxConvLocal for wxFONTENCODING_SYSTEM/DEFAULT in wxConvertToGTK()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 23:53:09 +00:00
Vadim Zeitlin
d0311dd366 all encodings are available in GTK+ 2 (because we always convert to UTF-8 anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 22:26:36 +00:00
Vadim Zeitlin
5f11fef543 use the encoding of the font which is used to draw the text when convering it to UTF-8 in wxGTK_CONV; the old wxGTK_CONV renamed to wxGTK_CONV_SYS (uses system encoding) and used in the contexts where no font is available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 22:22:13 +00:00
Vadim Zeitlin
0e05227246 no changes, just corrected the comment for wxConvLocal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 21:53:42 +00:00
Vadim Zeitlin
33de8c70f3 wxGetActiveWindow() exists in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 19:42:56 +00:00
Włodzimierz Skiba
7e04a500df Bug #1467905: wxOS2 headers not included in wxBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 19:10:43 +00:00
Vadim Zeitlin
99257cbe01 don't let the user modify the contents of read-only control (modified patch 1463707)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 16:22:42 +00:00
Vadim Zeitlin
fc298ea781 added wxDCClipper ctor overload taking a wxRegion and documented it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 15:08:10 +00:00
David Surovell
12cb759190 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 14:58:15 +00:00
Włodzimierz Skiba
f7c3b945ec Blind check for compatibility flags.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 13:42:28 +00:00
Roman Rolinsky
0cbb7d59d4 added TreeCtrl.WindowIndex method for skipping items like MenuBar
when counting window children


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 13:13:51 +00:00
Vadim Zeitlin
f3190d1cea use #if WXWIN_COMPATIBILITY_2_6 guard around implementation of wxNotebookSizer ctor too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 13:04:25 +00:00
Vadim Zeitlin
3abb199dee use #if WXWIN_COMPATIBILITY_2_6 guard around implementation of wxBookCtrlSizer ctor too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 12:54:52 +00:00
Stefan Csomor
37c287c49c cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 11:45:54 +00:00
David Surovell
1dc0f664d7 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 08:04:13 +00:00
David Surovell
520b09fcda cleanup - reformatting, pt 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 04:45:25 +00:00
David Surovell
cee24bf7ab cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 03:54:42 +00:00
Vadim Zeitlin
a3669332df use wxGTK_CONV instead of directly using wxConvLocal (simplifies code avoiding needless #ifdefs and prepares for further wxGTK_CONV changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 01:39:38 +00:00
Vadim Zeitlin
2f4f6de77b added wxWxCharBuffer which stands for buffer of wxChars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 01:35:21 +00:00
Vadim Zeitlin
777f37e0cc don't generate wxEVT_CONTEXT_MENU messages for right clicks in the list control header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 01:17:49 +00:00
Vadim Zeitlin
2754877b7c fix for the previous commit: delete m_conv after calling Flush() which uses it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-10 00:52:21 +00:00
Vadim Zeitlin
3952889a90 really fix warning about implicitly converting 0 and 1 to size_t -- use explicit cast to size_type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 22:47:46 +00:00
Vadim Zeitlin
84a9b3f89e ISO8859-1 is also supported by GTK+ 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 20:42:40 +00:00
Vadim Zeitlin
7182d62a02 added more files to parse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 19:55:48 +00:00
Stefan Csomor
3281bf6779 make the string properly 0 terminated and allow for one char more on the output buffer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 12:51:03 +00:00
Vadim Zeitlin
2dcd83af91 very minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 11:00:45 +00:00
Stefan Csomor
75b324211c in case of an faulty event this might not get initialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 08:53:39 +00:00
Stefan Csomor
d995756723 conversion fix by Ryan
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 08:48:36 +00:00
Stefan Csomor
ef2c03d913 listbox cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 08:37:56 +00:00
Stefan Csomor
b4726a583d listbox cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 06:50:54 +00:00
Stefan Csomor
ba5b8a68f7 listbox cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 06:42:32 +00:00
Robin Dunn
c5ce3dfb1e Added CmdDown() to grid events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 00:15:04 +00:00
Robin Dunn
2b01fd4918 Use CmdDown in mouse events instead of ControlDown so Mac users can
multi-select with shift and cmd like they are used to.  Other
platforms are not affected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-09 00:09:35 +00:00
Robin Dunn
afd0f084f4 Added missing not operator that was preventing the drawing of the
gridlines


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 23:09:46 +00:00
Vadim Zeitlin
4c82058341 don't redefine _CRT_SECURE_NO_DEPRECATE and _CRT_NON_CONFORMING_SWPRINTFS if already defined (patch 1463364)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 22:58:54 +00:00
Vadim Zeitlin
031943ac4c changed DoMessageFromThreadWait() to not block if there are no messages, this avoids the need for sending a dummy WM_NULL from the thread wait loop (replaces patch 1459812)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 22:51:42 +00:00
Robin Dunn
284ee6c3da Give wx.GridTableBase a destructor, and clear the ownership when it is
passed to SetTable.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 21:49:20 +00:00
Stefan Csomor
66bc84a900 ellipsis support for static text (mac), applied patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 15:32:18 +00:00
Stefan Csomor
3271d7376a fixing Clipboard::IsSupported when asking for unicode text and only non-unicode text is available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 15:26:05 +00:00
Julian Smart
429bf2309b Corrected FindString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 14:58:08 +00:00
Stefan Csomor
2fbfb7d6fb changing coordinates to client-area relative (patch 1378189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 14:33:00 +00:00
Stefan Csomor
51478cd68d allowing the suppression of SetValue event-triggering (needed for composite controls)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 13:00:13 +00:00
Stefan Csomor
32efab35c1 applying patch 1411230
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 11:43:13 +00:00
David Surovell
a074f61eae minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 09:14:06 +00:00
Robin Dunn
73b2a9a749 First pass at integrating a code generator in XRCed. Initial patch
from Eli Golovinsky, with lots of additional mods by me.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 06:17:11 +00:00
Stefan Csomor
1413285777 ellipsis support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-08 05:52:43 +00:00
Vadim Zeitlin
36b4d42311 fix recently introduced memory leak of m_conv (bug 1466559)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 22:41:11 +00:00
Robin Dunn
a2234452a7 wxNotebookSizer is gone now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 19:24:39 +00:00
Stefan Csomor
f5158fa61f applied patch 1378261
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 19:21:50 +00:00
Stefan Csomor
c4d9fc3947 applied patch 1466370
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 18:59:51 +00:00
Stefan Csomor
b1fd3badf5 applied patch 1465549
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 18:56:13 +00:00
David Surovell
2f02438455 cleanup - added whitespace around operators, some blank lines, fixed comment typos, broke up one-line if-stmts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 16:51:36 +00:00
Julian Smart
26de4d605a Added minimal Info.plist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 07:12:36 +00:00
Vadim Zeitlin
daf9adeb97 added html headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 00:39:50 +00:00
Vadim Zeitlin
65afac3fbc added wxTLW::ShouldPreventAppExit() which can be overridden to allow closing the application even if some windows are still opened; use it for wxHtmlHelpFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-07 00:38:49 +00:00
Vadim Zeitlin
2ed8c8dd1f some compilers warn about implicitly converting 0 and 1 to size_t -- use 0u and 1u instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 23:45:14 +00:00
Vadim Zeitlin
2e2cf78dc1 fixed gcc warnings about not initializing the base class in copy ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 17:11:25 +00:00
Vadim Zeitlin
402dfce7b3 GetBoundingRect() is supposed to return the logical coordinates, even in !textOnly case; also documented it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 14:27:34 +00:00
Vadim Zeitlin
9088c87bd0 leave enough space for the trailing NUL when converting UTF-16 to UTF-32 in Mac conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 12:43:38 +00:00
Vadim Zeitlin
faa112c4ca don't crash if conversion of a command line argument to Unicode fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 12:38:31 +00:00
Mart Raudsepp
5e08131542 wxGTK2: No need to check for __WXGTK20__ here either (and test cia script again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 12:06:37 +00:00
Mart Raudsepp
2ec371fda2 wxGTK2: No need to check for __WXGTK20__ here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 12:01:04 +00:00
Mart Raudsepp
afeb58f16b wxGTK2: We don't need to check for __WXGTK20__ here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 11:59:07 +00:00
Vadim Zeitlin
8d3dd06948 added missing const to fix last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 11:51:41 +00:00
Vadim Zeitlin
46f4cdbeaf changed the version and the date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 11:29:22 +00:00
Vadim Zeitlin
e27a15e146 added a cast to wxDecodeSurrogate() to fix wxMSW cross-compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 11:27:40 +00:00
Robin Dunn
fdcbb1ce01 Minor tweaks to bring up to date with CVS changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 02:35:05 +00:00
Robin Dunn
dd8659cac6 Update with 2.6.3.2 info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 02:34:10 +00:00
David Surovell
ef1991645a cleanup (repeat of v197) - added whitespace around operators, some blank lines, fixed comment typos, renamed out-in vars to outBuff-inBuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 02:30:52 +00:00
Robin Dunn
0cdd86d6d0 wx.lib.pubsub updates from Oliver Schoenborn:
- the hash problem re non-hashable objects
    - now supports listeners that use *args as an argument
      (listener(*args) was not passing the validity test)
    - corrected some mistakes in documentation
    - added some clarifications (hopefully useful for first time
      users)
    - changed the way singleton is implemented since old way prevented
      pydoc etc from extracting docs for Publisher


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 01:15:20 +00:00
Robin Dunn
2f643d0600 Force a full refresh when the focus changes so the bitmap button will
redraw its label if needed.  Also give defaults to more of the ctor parameters.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-06 00:12:11 +00:00
Vadim Zeitlin
bfaee57e81 really fixed number of bytes written in WriteString() in Unicode mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 23:19:09 +00:00
Vadim Zeitlin
35d11700a5 implemented UTF-16/32 using To/FromWChar() instead of MB2WC/WC2MB for sizeof(wchar_t)==4 platforms too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 23:04:10 +00:00
Vadim Zeitlin
467e04791c 1. use a manifest constant wxNO_LEN instead of -1 for lengths everywhere
2. reimplemented UTF-16/32 conversions using To/FromWChar() API instead
   of MB2WC/WC2MB for Windows (or rather SIZEOF_WCHAR_T == 2 platforms),
   the first tangible result is that reading UTF-32BE text streams now
   works too
3. more off by 1 fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 22:12:45 +00:00
Vadim Zeitlin
e6a87338f0 name the test just MBConv instead of MBConvTestCase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 21:03:25 +00:00
Vadim Zeitlin
1fc9e0d31e name the test just Unicode instead of UnicodeTestCase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 19:59:27 +00:00
David Surovell
d32a507d02 cleanup - added whitespace around operators, some blank lines, fixed comment typos, renamed out-in vars to outBuff-inBuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 18:02:26 +00:00
Roman Rolinsky
20002db0f8 implemented locating objects in gridbag sizer,
expanding tree to show selected object


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 17:36:21 +00:00
Vadim Zeitlin
d3478e2cf1 Mac compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 17:10:01 +00:00
Vadim Zeitlin
e835ec0100 added wxMBConv::Clone() to be able to copy conversion objects polymorphically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 16:54:02 +00:00
Vadim Zeitlin
3793402c74 also fixed WriteString() to work correctly when outputting UTF-16/32: can't use strlen() with these encodings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 16:28:29 +00:00
Vadim Zeitlin
d7f73361b9 fixed NextChar() to read the entire character at once as before it stopped on the first byte for ASCII input encoded as UTF-32LE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 16:17:58 +00:00
Vadim Zeitlin
d36c9347ea added wxMBConv::Clone() to be able to copy conversion objects polymorphically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 16:10:08 +00:00
Vadim Zeitlin
64f56529a8 properly NUL-terminate the output in wxMBConvUTF16swap::WC2MB()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 15:18:05 +00:00
Vadim Zeitlin
d31a29b566 rebaked after adding convautotest.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 15:07:06 +00:00
Vadim Zeitlin
a1999705b6 rebaked after adding convauto.cpp/.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 15:06:15 +00:00
Roman Rolinsky
28e65e0fa0 Second fix for Copy/Paste (using expat.native_encoding property).
Added cellpos,cellspan properties for Spacer in GridBag sizer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 14:55:17 +00:00
Vadim Zeitlin
a29cce78aa tests for wxConvAuto
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 14:38:42 +00:00
Vadim Zeitlin
830f8f11bc 1. changed all "wxMBConv& conv" parameters to "const wxMBConv&"
2. this allows to use wxConvAuto() instead of wxConvUTF8 as default value
   for this parameter in the classes which read text from the file: wxConvAuto
   automatically recognizes the BOM at the start of file and uses the correct
   conversion
3. don't use Windows for UTF-7 conversions as there is no way to make it
   fail on invalid UTF-7 strings; use our own wxMBConvUtf7 instead


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 14:37:47 +00:00
Mart Raudsepp
cc845a6142 encconv.cpp: Remove comment about 5 being big enough value for ENC_PER_PLATFORM - it should be the minimum
necessary instead.
fmapbase.cpp: Slightly reduce the size of an array - it should be reduced further (we only have one item with the
size of 9, rest are not over 6)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 10:02:28 +00:00
Mart Raudsepp
da9619e046 Update unictabl.inc manually, keeping KOI8-U, while doing it as close as possible for as how the regenerator would
have done if it had a matching KOI8-U.TXT file at hand.
This moves 5.9KB from .data to .rodata (guaranteed to be shared among wx apps).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 00:37:45 +00:00
Mart Raudsepp
cd1a22d1d3 Support having const encoding tables. Modify generator code to regenerate as such.
Can't simply regenerate src/common/unictabl.inc, because KOI8-U.TXT is missing, and mk_fallbacks has issues
(sort +2 isn't valid on my system)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 00:30:18 +00:00
Mart Raudsepp
c260cbf80d Make the unicode table scripts generate file with whitespacing done as has been manually edited despite the
warning on top.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-05 00:18:31 +00:00
Robin Dunn
b82f68a95b Docstring fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 23:33:01 +00:00
Robin Dunn
985eb16c7b EVT_TEXT_ENTER handler on a combobox needs evt.Skip() otherwise the
dropdown may not close


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 23:29:14 +00:00
Mart Raudsepp
8ddbb13781 Make EquivalentEncodings 3-dimensional array const, moving 864 bytes from data segment (copy-on-write) to
.rodata segment (always guaranteed to be shared among processes) in wxBase.
Make said array as big as necessary, not bigger than necessary (as before) - shaving 122 bytes off of that 864
bytes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 23:01:57 +00:00
Mart Raudsepp
ac131bab11 wxGTK2: No need to warn about threads being unsupported if gtk+ is lower than 1.2.4 - this is source code for gtk2
only.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 19:44:27 +00:00
Mart Raudsepp
042bcad45e Add GDK_PIXBUF_DISABLE_DEPRECATED, it should build with it now. Will keep an eye on the tinderbox at a reasonable
interval.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 19:34:38 +00:00
Mart Raudsepp
08f600190c gdk_window_get_colormap -> gdk_drawable_get_colormap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 18:56:39 +00:00
Mart Raudsepp
bc8b8220f8 gdk_cursor_destroy -> gdk_cursor_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 18:19:55 +00:00
Mart Raudsepp
2454dc8a64 GDK_ROOT_PARENT -> gdk_get_default_root_window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 17:50:58 +00:00
Mart Raudsepp
791d7ea2d6 gdk_window_get_size -> gdk_drawable_get_size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 17:19:42 +00:00
David Surovell
ee32d4354f added missing paren
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 16:40:38 +00:00
Mart Raudsepp
e6e9293af3 gdk_gc_destroy -> gdk_gc_unref -> g_object_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 15:06:55 +00:00
Mart Raudsepp
4e84399d42 gdk_image_destroy -> g_object_unref (gdk_image_destroy is deprecated in favor of gdk_image_unref, and is just a
#define to it; gdk_image_unref deprecated in favor of g_object_unref)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:57:45 +00:00
Mart Raudsepp
1a3a1b2df2 gdk_pixbuf_unref -> g_object_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:44:06 +00:00
Mart Raudsepp
5e4bf05abd gdk_gc_unref -> g_object_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:26:57 +00:00
Vadim Zeitlin
5c763f5a23 corrected mistake in the UTF-16 test on big endian machines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:25:59 +00:00
Mart Raudsepp
f5af73080a And gdk_drawable_unref is in turn deprecated in favor of g_object_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:06:00 +00:00
Mart Raudsepp
f368b5b9ab gdk_bitmap/pixmap_unref -> gdk_drawable_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:54:02 +00:00
Mart Raudsepp
15f0ad7014 gdk_draw_pixmap -> gdk_draw_drawable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:46:34 +00:00
Mart Raudsepp
62d4b5d6fe gdk_window_copy_area(drawable,gc,x,y,source_drawable,source_x,source_y,width,height) ->
gdk_draw_pixmap(drawable,gc,source_drawable,source_x,source_y,x,y,width,height)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:37:31 +00:00
Mart Raudsepp
22a3bce465 gdk_window_get_visual -> gdk_drawable_get_visual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:13:04 +00:00
Vadim Zeitlin
509da4510f MB2WC/WC2MB are not pure virtual any longer, implement them in terms of To/FromWChar()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:04:47 +00:00
Vadim Zeitlin
483b0434bf added new To/FromWChar() API with more reasonable semantics than old MB2WC/WC2MB; for now both coexist and the change is/should be backwards compatible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 12:35:21 +00:00
Vadim Zeitlin
7ef3ab50e9 renamed GetMinMBCharWidth() to GetMBNulLen(), made it public and documented it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 07:49:08 +00:00
Vadim Zeitlin
5e51fb4ca5 fixed LaTeX markup to suit tex2rtf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 22:16:22 +00:00
Václav Slavík
e7feeafa56 added ParseInnerSource() to make <pre>-like parsing easier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 19:34:21 +00:00
Włodzimierz Skiba
47eb93d02d Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 17:38:05 +00:00
Mart Raudsepp
8de699dcfa Sync wxGTK docs from WX_2_6_BRANCH to HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 05:53:39 +00:00
David Surovell
bee1995894 minor cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-03 00:21:00 +00:00
Vadim Zeitlin
0739e2eef9 Apple gcc compilation fixes: for it size_t and unsigned are not the same type for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 20:18:33 +00:00
Vadim Zeitlin
69373110a5 fixed wxMBConv_iconv to work with UTF-16/32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 20:03:42 +00:00
Vadim Zeitlin
72b2fc5c80 properly terminate UTF-32 test string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 20:02:33 +00:00
Vadim Zeitlin
39406a5d05 compilation fix for iconv call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 15:59:57 +00:00
Julian Smart
eb257f65ed Corrected index passed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 15:50:32 +00:00
Vadim Zeitlin
33366127e8 added filename comparison test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 15:02:56 +00:00
Vadim Zeitlin
c1464d9d10 replaced recently added wxMBConv::GetMBNul() with a less clever but better
working GetMinMBCharWidth(): the idea is that we can't deal with completely
arbitrary encodings anyhow using the current API as we get confused by NUL
runs in the middle of the string, so instead just deal correctly with normal
multibyte encodings, UTF-16/UCS-2 and UTF-32/UCS-4 which should cover 99.9% of
the cases


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 14:59:53 +00:00
Vadim Zeitlin
11fead7c46 added wxBuffer::reset()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 14:57:36 +00:00
Vadim Zeitlin
a7823b26b0 added UTF-32 test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 14:06:50 +00:00
Vadim Zeitlin
2877b82808 added test UTF-16 string with embedded NUL NUL which makes the current code fail
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 14:01:18 +00:00
Vadim Zeitlin
f98452a969 added test UTF-16 string with embedded NUL NUL not terminating the string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 13:45:58 +00:00
Kevin Hock
30dfb74488 Make the Connect that also takes a local bind port non-virtual. This silences some compiler warnings (Borland, Watcom). Plus, it's not likely that this method would need to be overridden anyway since it has rather limited and specific uses.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 04:56:18 +00:00
Vadim Zeitlin
89971c7710 document missing default parameters in ctor (patch 1458151)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 01:29:17 +00:00
Vadim Zeitlin
ef25e5a4c8 don't crash when loading images with verbose==false (patch 1449823)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 01:27:36 +00:00
Vadim Zeitlin
1819a5c1ac report error for GIF images without CLEAR code in the stream instead of crashing (patch 1449734)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 01:21:53 +00:00
Vadim Zeitlin
3871d4ca75 use proper dllexport declaration with _WX_LIST_HELPER_
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 01:10:41 +00:00
Vadim Zeitlin
bd35ed323f added wxTimeSpan::Millisecond[s]() for consistency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 00:58:44 +00:00
Vadim Zeitlin
9c21e80bb0 seconds and milliseconds in wxTimeSpan ctor should be long long, not long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-02 00:52:57 +00:00
Julian Smart
48a102f9e5 Reset the position when auto-sizing toolbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 18:16:17 +00:00
David Surovell
e9531db94d fix compilation problem in prior commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 16:40:08 +00:00
Vadim Zeitlin
a905bdb8a4 let the UTF7 test fail but not crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 15:53:55 +00:00
Vadim Zeitlin
356410fc88 fixed wxMBConv_iconv::GetMBNul()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 15:34:42 +00:00
Vadim Zeitlin
fb86a4bb69 regenerated to add textfiletest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 14:04:59 +00:00
Vadim Zeitlin
22886fb3c3 Unix compilation fixes after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 13:38:28 +00:00
Vadim Zeitlin
adf5d5935b added NUL command
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 12:43:52 +00:00
Vadim Zeitlin
eec47cc6c4 Described in the comments and documented the semantics of the parameters and
return values of wxMBConv methods and tried to make them more consistent. The
only (intentional) backwards incompatible change is that cMB2WC/cWC2MB now
return the length of the converted string in outLen parameter and not length+1

Added wxMBConv::GetMBNul() and use it instead of supposing that all multibyte
strings are always terminated with a single NUL which is wrong for UTF-16/32.

Using GetMBNul(), completely rewrote cMB2WC/cWC2MB() to accept a string of the
specified length, whether it is NUL-terminated or not. This means that they
don't overwrite the provided buffer any more and convert the entire string in
all cases.

Fixed bug in wxMBConvUTF16::WC2MB() which didn't NUL-terminate the string
properlyv even if there was enough space.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 12:43:03 +00:00
Vadim Zeitlin
7e0a8463eb made DoTestConversion() work with strings containing NULs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 03:24:23 +00:00
Vadim Zeitlin
6901ac371f added extend() method which realloc()s the buffer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-01 02:58:56 +00:00
Vadim Zeitlin
fedde9b906 default ctor should create an empty/uninitialized buffer, not one with a single character string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 23:33:38 +00:00
Robin Dunn
1fce4e9668 Fixed the equality and inequality operators for some of the basic
data types (wx.Point, wx.Size, wx.Colour, etc.) to no longer raise a
TypeError if the compared object is not compatible, but to just return
a boolean as expected.  For example::

	  wx.Colour(64,0,64) == 123      ==> False


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 23:29:39 +00:00
Robin Dunn
8948306f78 Fixed problem in wx.lib.splitter when used on 64-bit platforms. Used
the current length of the list for specifying an append instead of
sys.maxint.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 23:19:34 +00:00
Vadim Zeitlin
2229d9b30b added missing licence information
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 21:14:40 +00:00
Vadim Zeitlin
da12017a64 undid last (wrong) change to wxMBConvUTF16swap::MB2WC(); added comment to explain why
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 20:28:37 +00:00
Vadim Zeitlin
5975f1982d added UTF16 test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 20:25:20 +00:00
Vadim Zeitlin
bfab25d4c4 fixed fatal buffer overwrite in wxMBConvUTF16swap::MB2WC()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 20:23:33 +00:00
Vadim Zeitlin
04a378342d detect some invalid UTF7 strings when decoding them in wxMBConvUTF7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 20:04:07 +00:00
Vadim Zeitlin
b0441359ca test predefined wxConvUTF[78] too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 19:30:34 +00:00
Vadim Zeitlin
7ce0c58f8d the expected test result was wrong, corrected; also define a manifest constant only once instead of using its value everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 19:24:23 +00:00
Vadim Zeitlin
6ef5a7a370 fixed if/idef wxHAVE_U_ESCAPE mixup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 19:15:46 +00:00
David Surovell
b8c3d6306c simplify KeywordSearch; cleanup and reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 19:04:25 +00:00
Włodzimierz Skiba
d879e16fc3 Build fix for 2.6 compatibility off.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 18:26:24 +00:00
Włodzimierz Skiba
1c067fe3c1 Removed every usage of obsolete wxTLW flags. 2.6 compatibility markup for them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 18:07:22 +00:00
Vadim Zeitlin
ed177375b2 use wxHAVE_U_ESCAPE to accomodate old compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 17:43:10 +00:00
Vadim Zeitlin
8da7a00a94 enable tests using \u escapes for VC7; replaced compiler version checks for this with wxHAVE_U_ESCAPE defined once and for all in testprec.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 17:42:26 +00:00
Vadim Zeitlin
53c174fcd5 really pass the proper output buffer size in wxMBConv_win32 round trip check, at least for the encodings without NULs such as UTF7
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 17:40:17 +00:00
Vadim Zeitlin
2f96d9bb8d pass proper output buffer size in round trip conversion success check in wxMBConv_win32, otherwise conversions from UTF-7 always failed for example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 17:34:48 +00:00
Vadim Zeitlin
a65ca3e600 moved wide char conversion tests to their own file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 17:10:07 +00:00
Vadim Zeitlin
ede838eb4d removed wxTextFile test case, what was it doing here?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 17:07:25 +00:00
Roman Rolinsky
ecc19da767 version 0.1.7-3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 16:39:07 +00:00
Roman Rolinsky
9932837291 ignore wrong colour spec
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 16:38:20 +00:00
Roman Rolinsky
ebaaf8f630 fix for copy/paste to work with i18n
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 14:36:34 +00:00
Vadim Zeitlin
93a57d19fe added tests for UTF8 and UTF16 files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 14:26:59 +00:00
Vadim Zeitlin
44327ff375 don't give error when reading empty file in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 14:00:31 +00:00
Vadim Zeitlin
18230eb6b6 Unicode compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 13:58:01 +00:00
Vadim Zeitlin
dbcf443c7d rewrote Read() to slurp all the file at once to avoid problems in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 13:53:20 +00:00
Vadim Zeitlin
468c5a97ec added unit test for wxTextFile (reading only for now)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 13:46:38 +00:00
Włodzimierz Skiba
6a9e54bdff Better backward compatibility and deprecation markup for interface deprecated in comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 11:13:03 +00:00
Vadim Zeitlin
4521d1cdda also link in ODBC lib if wxUSE_ODBC (patch 1457800)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 00:05:02 +00:00
Vadim Zeitlin
dedba2a11f use wx/dynlib.h and not wx/dynload.h (patch 1448691)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 00:03:15 +00:00
Vadim Zeitlin
735dec5e62 added #if wxUSE_CONSTRAINTS around the whole file (patch 1448826)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-31 00:01:11 +00:00
Vadim Zeitlin
b3825734fc don't compile DirectDraw code when wxUSE_DIRECTDRAW==0 (patch 1461271); set wxUSE_DIRECTDRAW to 0 by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 23:49:34 +00:00
Jamie Gadd
82d492f145 Include compatibility guard for int GetItemSpacing( bool isSmall ) in implementation file also.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 23:01:55 +00:00
Robert Roebling
0fcce6b9d9 Fix previous crashes when scrolling generic version
of wxDataViewCtrl.
  Added in-place editing of strings (no user vetoing
   and such). The code uses the corrected version of
   the respective code from wxListCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 15:35:44 +00:00
Kevin Hock
3c57bda545 Fix GetTraits() check for event loop in wxSocketBase::_Wait() [ bug 1460607 ] [ patch by Angel / elkry ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 15:29:22 +00:00
Robert Roebling
3603a3895e Fix wxListCtrl in-place editing (to not crash
when editin is finished by clicking somewhere
    else and thus taking the focus away from the
    wxTextCtrl). Also, "delete this" in the middle
    of code isn't optimal.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 15:25:59 +00:00
Vadim Zeitlin
c1981a2fa4 don't process previously read characters twice in OnRead()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 14:04:46 +00:00
Włodzimierz Skiba
ca3e85cfa8 Better backward compatibility and deprecation markup for interface deprecated in comments.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 14:04:17 +00:00
Julian Smart
63fa3f89e8 Unicode correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 11:35:12 +00:00
Julian Smart
1fc1bbfc68 Generate Mac bundle for helpview
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 11:32:39 +00:00
Robert Roebling
f7570f5771 Use memcpy instead of strcpy.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 09:53:15 +00:00
Julian Smart
d4445d24d3 Reverted wxChoice size fix due to problems in W2K and below
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 09:21:11 +00:00
Robin Dunn
ccd34c944d Need to tell which object to Destroy()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 01:41:47 +00:00
Robin Dunn
faca2e452f Fixed reference leak in wx.gizmos.TreeListCtrl.GetSelections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-30 01:38:38 +00:00
David Surovell
617bfeecfe simplify OnActivate menubar install code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 20:52:36 +00:00
Stefan Csomor
3c24dad6f7 formatting and native HIView compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 19:19:06 +00:00
Stefan Csomor
8c07d8b324 clean-up and fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 19:17:07 +00:00
Václav Slavík
369e0d0575 made WX_CONFIG default configurable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 16:48:46 +00:00
Vadim Zeitlin
d195f10fe3 don't use -- inside XML comments, this is not allowed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 16:30:29 +00:00
Vadim Zeitlin
0900766967 added func parameter to wxOnAssert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 14:33:53 +00:00
Vadim Zeitlin
5d584acb88 don't return void values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 14:30:22 +00:00
Vadim Zeitlin
0cc88b4bb4 wxUSE_STL==1 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 14:22:03 +00:00
Robin Dunn
b8c4ab9cbc Added GetResourcesDir and GetLocalizedResourcesDir to
wx.StandardPaths.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-29 02:34:00 +00:00
David Surovell
30c23e741e fix null-deref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 19:55:24 +00:00
Robin Dunn
70b5f65e55 Some tweaks to build hosts and tasks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 19:25:30 +00:00
Robin Dunn
de2a042405 avoid assert in wxMac port, only change the font point size when we
are going to be using it in objects that need to draw text


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 19:20:48 +00:00
Robin Dunn
3640e087dd Updated 2.6.3.0's CHANGES
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 19:19:18 +00:00
Robin Dunn
a9d06ca68a install the analogclock package
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 19:16:49 +00:00
Vadim Zeitlin
5981cd22f3 really disable wxUSE_DISPLAY for wxMGL and wxOS2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 14:17:42 +00:00
Włodzimierz Skiba
020e385d47 Warning fix for wxOS2 night build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 14:15:10 +00:00
Włodzimierz Skiba
989ab1e5a6 Line-up deprecated interface of wxTreeCtrl between ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 13:11:20 +00:00
Włodzimierz Skiba
4033be7874 More typos.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 13:00:42 +00:00
Włodzimierz Skiba
6cfc4ddb23 Patch #1459942: typos.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 11:34:55 +00:00
Włodzimierz Skiba
e0c8d2d924 Documentation fixes for unresolved labels after changes in debbuging api.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 11:24:08 +00:00
Julian Smart
1b14e197be Removed redundant XBM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 11:14:49 +00:00
Julian Smart
91feb0d1ae Use XPM for symbols and pictures on all platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 11:12:48 +00:00
Włodzimierz Skiba
8e13c1ec4e Make wxPASSWORD and wxPROCESS_ENTER really deprecated.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 11:02:37 +00:00
Włodzimierz Skiba
39987096b3 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 10:48:55 +00:00
Julian Smart
ecf418ad77 Correct test for WORDS_BIGENDIAN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 10:32:00 +00:00
Julian Smart
f45bffb686 stdpaths.h needs filefn.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 10:30:20 +00:00
Julian Smart
0e41582e52 Added missing includes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 08:29:19 +00:00
Robert Roebling
0f0297d8f3 Remove CVS clash in RCS-ID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 08:14:50 +00:00
Robert Roebling
8b1464af32 Apply wxListCtrl patch which fixes some crashes
and let the generic wxListCtrl show context
    menus like the MSW one.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 08:13:48 +00:00
Vadim Zeitlin
b260e323ea properly NUL-terminate the buffer before converting it to Unicode: we may need more than one trailing NUL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-28 00:05:52 +00:00
Vadim Zeitlin
e11e27cf74 made wxTextFile work in Unicode (bug 1260189); also made it possible to use it with non seekable files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 23:31:23 +00:00
Vadim Zeitlin
86948c99a6 made wxTextFile work in Unicode; also made it possible to use it with non seekable files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 23:27:29 +00:00
Vadim Zeitlin
4ae776b767 really fixed iteration over wxTextbuffer using GetFirst/NextLine()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 23:01:00 +00:00
Vadim Zeitlin
ddf56b4c52 we don't need to include wx/textfile.h here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 22:48:16 +00:00
Vadim Zeitlin
3ae00f5b57 reuse Clear() instead of duplicating its code in Close()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 20:43:15 +00:00
Vadim Zeitlin
2dfa1d9e11 fix bug in Eof() which returned true even if we were only on the last line, not beyond it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 20:39:48 +00:00
Vadim Zeitlin
a85a25c7d8 use wxLaunchDefaultBrowser by default if no browser is specified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 20:23:33 +00:00
Vadim Zeitlin
2364556be3 renamed m_MapFile into m_helpDir because this is what it really is
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 20:05:07 +00:00
Włodzimierz Skiba
5536310df9 Test commit to verify cvs speed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 17:37:46 +00:00
Vadim Zeitlin
02f51f1f14 added an option to use wxExtHelpController (which means that it now depends on the adv library)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 17:32:02 +00:00
Vadim Zeitlin
249b3fe3bb rewrote wxExtHelpController loading code to use wxFileName as it was broken under Mac and it also reduces the code size; also use wxTextFile to further simplify the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 17:28:51 +00:00
Włodzimierz Skiba
06052f3f87 Source and warning cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 17:26:38 +00:00
Włodzimierz Skiba
6a64f8d41d Unconditional assert means failure.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 17:25:14 +00:00
Włodzimierz Skiba
be437778be Minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 15:52:54 +00:00
Włodzimierz Skiba
6cd6ec633c Fix for broken 'param' macro syntax.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 15:02:59 +00:00
Włodzimierz Skiba
d23ec02c6a Minor source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 14:47:39 +00:00
Włodzimierz Skiba
f554a14b89 Source and warning cleaning after enabling wxUSE_DATAVIEWCTRL in wxMSW builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 14:01:33 +00:00
Vadim Zeitlin
f3b0f8ad21 documented GetResourcesDir() and GetLocalizedResourcesDir() (somehow forgot to commit before, sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 13:48:18 +00:00
Vadim Zeitlin
8c94336825 fixed unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 13:46:50 +00:00
Włodzimierz Skiba
a8b9c34463 Coverity CID 100 fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 12:36:11 +00:00
Włodzimierz Skiba
faa94f3ec8 Final and global PRIOR/NEXT change: keep consistency using only PAGE versions, deprecate old ids, remove rest of build problems with case statemets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 12:25:17 +00:00
Jouk Jansen
aa3310b88d Committing in .
Removing obsolete compiler directives for OpenVMS

 Modified Files:
 	wxWidgets/src/generic/notebook.cpp
 	wxWidgets/src/univ/notebook.cpp
 	wxWidgets/src/unix/mimetype.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 09:35:41 +00:00
Vadim Zeitlin
321fe98cfe translate tips which appear inside _() in wxFileTipProvider
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 00:57:06 +00:00
Vadim Zeitlin
85149efad7 removed wxClassInfo::CleanUp() as it breaks wxEntry reentrancy: once the sm_classTable is destroyed it's not going to be recreated again; instead leave last wxClassInfo::Unregister() call do this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 00:54:00 +00:00
Vadim Zeitlin
4fbbe847c8 explain that the message catalogs should be installed in the default directory for them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-27 00:23:44 +00:00
Vadim Zeitlin
89611d4d5a partly undid last commit: we still need to look in . for the message catalogs to find them under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 22:57:49 +00:00
Vadim Zeitlin
f0a6989d8b look for catalogs with LC_MESSAGES subdirectory and without it under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 22:57:19 +00:00
Vadim Zeitlin
adaa49a801 discard the debug directories at the end of the executable path automatically in debug builds to allow running the programs without installing them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 18:31:44 +00:00
Vadim Zeitlin
1191c93ebc no need to add . and .. explicitely to the catalogs search path, the new catalog search code code is smart enough to find them there on its own
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 18:30:04 +00:00
Vadim Zeitlin
f830b2b1fc simplified message catalog search code using the new wxStandardPaths::GetLocalizedResourcesDir()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 18:28:29 +00:00
Vadim Zeitlin
3af9f2de59 added wxStandardPaths::GetResourcesDir() and GetLocalizedResourcesDir()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 17:00:40 +00:00
Vadim Zeitlin
cc4d990340 implemented GetPluginsDir() to behave as documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 14:50:31 +00:00
Vadim Zeitlin
d3b9c6271b use one #ifdef __VMS instead of doing it in each and every function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 14:47:44 +00:00
Vadim Zeitlin
4907027102 removed wxMac stuff from here, unless I'm missing something this file is not used under Mac at all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 14:42:05 +00:00
Vadim Zeitlin
300ff33dec don't crash in GetInstallPrefix() if wxTheApp == NULL (especially as we don't need it anyhow)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 14:34:27 +00:00
Julian Smart
5cf83b1ac0 Fixed crash in Life demo on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 12:04:37 +00:00
Włodzimierz Skiba
fbb526cced Build fix after PRIOR/NEXT removal.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 07:59:53 +00:00
Vadim Zeitlin
e633eb2f36 re-fix operator?: involving wxNodes and compatibility_iterators
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 03:14:13 +00:00
Vadim Zeitlin
aedeab233f X11 callbacks must be extern C
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 03:01:55 +00:00
Robin Dunn
9c6e3c5714 Use self.GetCanvas() instead of just self.GetCanvas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 00:14:46 +00:00
Robin Dunn
6802574779 more size_t --> unsigned int changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 00:13:33 +00:00
Robin Dunn
2c906a4907 The null byte at the end of the string should not be included in the
size of a text data object in the clipboard, otherwise we have to
subtract it when the data is requested and that results in truncating
one byte for other data formats.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-25 00:06:25 +00:00
Włodzimierz Skiba
894b93d3ba Updated changes list after int/size_t unsigned int.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 23:57:43 +00:00
Włodzimierz Skiba
027d45e8fc Back to unsigned int count in wxTreeCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 23:46:43 +00:00
Włodzimierz Skiba
7a952d4cbd More null virtuals in wxRadioBoxBase (see: 'Developers_Notebook-Incomplete-API' in wxWiki)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 22:50:51 +00:00
David Surovell
de5e599c8a minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 17:19:35 +00:00
Robin Dunn
6fa9383b57 Add a note about WXK*PRIOR and WXK*NEXT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 17:01:12 +00:00
Julian Smart
9dc1d18069 Commented out call that breaks metal style setting before Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 13:49:37 +00:00
Włodzimierz Skiba
63ccc65902 Allow easier PalmOS5 development by volounteers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 13:41:27 +00:00
Julian Smart
54ce9ebbd6 Reduced deprecation warning frequency
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 13:01:19 +00:00
Julian Smart
3ee937aad0 Hidden variable warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 12:27:45 +00:00
Włodzimierz Skiba
5f60a273bd PRIOR/NEXT build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 12:17:48 +00:00
Julian Smart
03cc5f8ec5 Added note about accelerator translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 12:13:07 +00:00
Włodzimierz Skiba
80e2cdc6e9 Keep wxPalmOS buildable in case Access would reuse some portions of PalmOS6.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 10:32:16 +00:00
Włodzimierz Skiba
3ad4e2df04 PRIOR/NEXT build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 10:27:44 +00:00
Włodzimierz Skiba
87815d3d0a PRIOR/NEXT build fixes and warning corrections.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 10:20:58 +00:00
Włodzimierz Skiba
4bcc364758 Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:44:55 +00:00
Włodzimierz Skiba
8ebb2a1d99 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:31:58 +00:00
Julian Smart
936bbdf902 Updated adding samples section.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:28:38 +00:00
Włodzimierz Skiba
277956850e Fix after removal of PRIOR/NEXT in common headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:28:08 +00:00
Julian Smart
fec647a203 Build corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:22:29 +00:00
Włodzimierz Skiba
aee12bfb80 Fix after removal of PRIOR/NEXT in common headers (duplicates change in GTK2 sources).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:22:23 +00:00
Włodzimierz Skiba
3b69b47ca6 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 08:19:35 +00:00
Włodzimierz Skiba
a5325ad672 Back to 'unsigned int' after reasearch of 'size_t' problems.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 07:51:55 +00:00
Włodzimierz Skiba
9e728732e9 Removed useless pragma after fixing code to use insigned ints.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 07:26:14 +00:00
Włodzimierz Skiba
550eb91ae2 Fixed missing usage of x during Layout.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 07:19:45 +00:00
Robin Dunn
5bd24f7242 Make WXK*PRIOR and WXK*NEXT be aliases for WXK*PAGEUP and WXK*PAGEDOWN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 04:14:29 +00:00
Robin Dunn
50f151d726 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 01:52:48 +00:00
Robin Dunn
f65bb0f8ab * wx.Panel doesn't have a SetTitle anymore. What was this used for
anyway?

* Allow  wxMenuBar to be created inside a wxFrame

* More robust clipboard handling


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 01:49:58 +00:00
Robin Dunn
a62df55f4d Need to use wizard.GetPageAreaSizer().Add(page) now to get the layout
handled correctly


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 00:13:59 +00:00
Robin Dunn
cdd7b180fe wxFileSystemHandler needs a destructor and to give ownership to wxFileSystem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 00:12:12 +00:00
Robin Dunn
2fbb702ba3 Length --> length
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 00:10:48 +00:00
Robin Dunn
3f5ec80664 Several instances of int --> unsigned int
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-24 00:08:45 +00:00
Vadim Zeitlin
aa61d35253 replaced all int/size_t indices in wxControlWithItems API with unsigned int (committing on behalf of ABX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 22:05:23 +00:00
David Surovell
5aa67d6619 minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 22:04:57 +00:00
Julian Smart
b910a8add4 Fixes/makefiles for building data view control on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 21:28:24 +00:00
Robert Roebling
4064f7deac Take into account cell's own size, not only the
space allocated to it (mostly much more).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 19:00:53 +00:00
Stefan Csomor
55f5548f78 filedata implementation streamlined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 18:18:20 +00:00
Stefan Csomor
d7b284e5c6 implementation streamlined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 18:16:02 +00:00
Stefan Csomor
3a4abf8055 setting the hacked cocoa font panel as default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 18:11:54 +00:00
Stefan Csomor
fbb7ee81b4 convenience methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 18:09:04 +00:00
Stefan Csomor
bcd9697973 better file data support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 18:06:28 +00:00
Vadim Zeitlin
f2fb22f9b9 fixed last commit which accidentally included parts of upcoming size_t/unsigned patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 17:45:00 +00:00
Julian Smart
e557031896 Added missing declarations required for e.g. VC++ 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 17:15:47 +00:00
Vadim Zeitlin
e3e78de1b8 Minor fixes after last commit:
1. don't pass -1 to base class DoSetSize(), this is documented to not work
   under Win2k
2. instead, don't do anything at all if neither size nor position changed
3. only call DoGetSize() once instead of doing it in both if branches
4. added comment about 30000 returned by CB_GETDROPPEDCONTROLRECT


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 16:56:19 +00:00
Vadim Zeitlin
27b436242e 1. fixed compilation after wxList::compatibility_iterator changes
2. removed #if wxUSE_STL tests which are not needed any longer
3. better fix for SetCurrent() virtual hiding: just rename the method


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 16:29:02 +00:00
Vadim Zeitlin
2e4b087e1c reverted return type of wxList method to nodetype * from compatibility_iterator (undoing change of rev 1.103) because this breaks very old core relying on conversion of wxList::GetFirst() to wxNode* for example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 16:19:48 +00:00
Julian Smart
b83d533aec Miscellaneous change log updates.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 16:16:49 +00:00
Julian Smart
4952771da3 Fixed home and end accelerators.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 16:16:00 +00:00
Robin Dunn
6cfc5ebfa7 no longer need reverse renamers for the *Ptr classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 15:56:22 +00:00
Julian Smart
0b652e0ef9 Added an optimization that fixes a recursive paint problem when controls
are embedded in wxHTML (or other circumstances where the parent resizes
the choice/combobox within a paint handler). This also speeds up
addition of strings considerably (see "Add many strings" in widgets sample).

Also added a check for silly values that can be returned from
CB_GETDROPPEDCONTROLRECT.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 15:28:02 +00:00
Włodzimierz Skiba
cca1624d2a Centering maximized wxTLWs on screen should do nothing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 13:00:06 +00:00
Włodzimierz Skiba
7cb32b4b74 Unconditional assert means fail.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 11:47:21 +00:00
Robert Roebling
0fdc2321bc Implement basic MVC logic (change an item in one
view and all views update themselves) and made
   wxDataViewToggleCell react to mouse clicks as a
   test for that (generic code).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 11:44:57 +00:00
Julian Smart
acd8510fd2 Don't centre the frame on WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 11:35:56 +00:00
Robert Roebling
90675b9582 Make generic wxDataViewCtrl draw its contents.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 11:02:20 +00:00
Włodzimierz Skiba
4bc6f7a06c Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 10:11:05 +00:00
Włodzimierz Skiba
bb2955b339 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 09:57:59 +00:00
Vadim Zeitlin
30a29593e8 workaround for mingw 3.2.3 DLL build with wxUSE_STL=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 02:01:25 +00:00
Vadim Zeitlin
d294c9db88 nested iterator classes must be dll-exported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 01:01:50 +00:00
Vadim Zeitlin
d14e03f5b7 removed unneeded (and provoking warnings in DLL build) DLL export declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 00:48:09 +00:00
Vadim Zeitlin
aa78d22e20 don't compare invalid iterators/node pointers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 00:47:01 +00:00
Vadim Zeitlin
b028252442 don't return true from wxRadioBox::AcceptsFocus() even when it's hidden/disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 00:43:11 +00:00
David Surovell
7ca019817d fixed compilation issue in prior checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-23 00:41:09 +00:00
David Surovell
8b4457965a cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 23:03:04 +00:00
Włodzimierz Skiba
1ea9acd9aa wxFrameNameStr was already delivered by #include one line earlier.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 20:51:07 +00:00
Włodzimierz Skiba
a9672e89d5 DMC bug workaround.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 20:39:52 +00:00
Vadim Zeitlin
986d27c395 make it possible to predefine __WXFUNCTION__ in user code to have a different behaviour (e.g. use __PRETTY_FUNCTION instead of __FUNCTION__ with gcc) if needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 19:37:58 +00:00
Vadim Zeitlin
fa3bd1aaea define __WXFUNCTION__ instead of redefining the (semi-)standard __FUNCTION__ which could result in conflicts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 19:32:28 +00:00
Vadim Zeitlin
fd05688e22 documented __WXFUNCTION__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 19:31:09 +00:00
Vadim Zeitlin
2bd3cba690 made alphabetical list of functions more alphabetical
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 19:20:28 +00:00
Vadim Zeitlin
d4d8988c72 made wxList methods return compatibility_iterator instead of Node * to further reduce differences between wxUSE_STL==0 and 1 cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 19:14:28 +00:00
Włodzimierz Skiba
80f218424f Semicolon needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 18:29:34 +00:00
Włodzimierz Skiba
045bd076c5 Test both constuctors. Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 18:07:19 +00:00
Włodzimierz Skiba
7fb0a11d3a Unconditional assert means fail.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 17:55:05 +00:00
Julian Smart
c31be54ae0 Added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 17:39:33 +00:00
Julian Smart
3a46bcdd32 Mac compile fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 16:45:38 +00:00
David Surovell
7884ab9018 fix wxMac compilation problem by hoisting simple variable declarations above all goto stmts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 16:21:55 +00:00
Włodzimierz Skiba
d17b1e7621 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 14:39:47 +00:00
Julian Smart
0cd6a2f8e6 Rearranged, added info about universal builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 14:38:06 +00:00
Vadim Zeitlin
0e0589e873 fixed handling PNG errors accidentally broken in rev 1.46 (libpng would just abort on invalid files now); fixed huge memory leak when failing to load an invalid PNG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 14:12:48 +00:00
Włodzimierz Skiba
e1204086ba Build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 13:24:23 +00:00
Robert Roebling
a0f3af5fb6 Setup notifiers from datamodel to generic
wxDataViewCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 10:27:29 +00:00
Robert Roebling
3d9d7cc4f7 In the generic version of wxDataViewCtrl, all
cells are custom cells (nothing native).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 10:01:57 +00:00
Jouk Jansen
bbc8b0ee18 Committing in .
Updates to make OpenVMS happy

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/include/wx/defs.h
 	wxWidgets/src/gtk/choice.cpp wxWidgets/src/gtk/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 07:47:22 +00:00
Vadim Zeitlin
b503b4075c fixed wxCHECK in release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-22 01:11:52 +00:00
Vadim Zeitlin
acc476c530 fixed __FUNCTION__ use in Unicode build (it's a variable, not a macro)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 17:00:16 +00:00
Vadim Zeitlin
8605eb1abe added ParseDate() tests; use CPPUNIT_ASSERT_EQUAL to see the dates in cppunit output
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 16:21:18 +00:00
Vadim Zeitlin
eca0692c77 fixed several bugs in ParseDate() (invalid dates could result in assert failure while some valid dates such as 29 Feb 2004 were not recognized)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 16:20:43 +00:00
Vadim Zeitlin
b0d8bfa6cd don't throw away the first three stack frames in the assert stack dump (fix needed after recent assert cleanup/changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 15:59:58 +00:00
Vadim Zeitlin
3ec4a23f50 show the function in which the assert failure occured if the compiler supports it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 15:47:24 +00:00
Vadim Zeitlin
20a4311e7f use new wxAPPLY_T macro instead of 3 identical __XDATE__/__XTIME__/__XFILE__ ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 15:43:46 +00:00
Vadim Zeitlin
dfa0b52f4a show the function in which the assert failure occured if the compiler supports it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 15:19:53 +00:00
Vadim Zeitlin
bc151e8486 recognize bitmap2 tag as containing a bitmap (used for disabled toolbar buttons)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 15:12:37 +00:00
Vadim Zeitlin
497a2d6d54 don't evaluate assert expression unless the condition is false (patch 1450705)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 14:17:49 +00:00
Vadim Zeitlin
637b7e4f3a added semicolons after wxCHECK()s (part of patch 1450705)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 14:16:34 +00:00
Vadim Zeitlin
0cc70962a1 Made wxList::compatibility_iterator a class in wxUSE_STL == 0 case too instead
of a simple typedef to "Node *" to be able to initialize it with NULL in ctor
which makes the behaviour of the code with and without wxUSE_STL the same.


The price to pay is that the code like

	wxList:compatibility_iterator ci;
	ci = cond ? list->GetFirst() : wxList::compatibility_iterator();

doesn't compile any more and has to be replaced with (more clear anyhow)

	wxList:compatibility_iterator ci;
	if ( cond )
		ci = list->GetFirst();


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 14:05:11 +00:00
Stefan Csomor
06840f1796 gcc 4.0 for all
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:53:47 +00:00
Vadim Zeitlin
ed97f493ab can't pass objects through ... (please don't ever ignore this gcc warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:33:08 +00:00
Vadim Zeitlin
46cb4b3f8a added wxGtkString::c_str()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:31:35 +00:00
Vadim Zeitlin
5d9ef6deec return NULL (and not invalid) iterator from compatibility_iterator::GetPrevious() when we're at the start of the list (see patch 1445506)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:17:31 +00:00
Vadim Zeitlin
b4affacc10 added assert to verify that operands are initialized in compatibility_iterator::operator==()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:14:19 +00:00
Vadim Zeitlin
e547f7a7b8 better fix for infinite loop in HandleOnNavigationKey() when wxUSE_STL==1 and start_node is NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:10:20 +00:00
Vadim Zeitlin
0b6cf20588 reuse operator bool() check in compatibility_iterator::IndexOf() instead of rewriting it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 13:00:19 +00:00
Vadim Zeitlin
edc0a395c6 fix an infinite loop in HandleOnNavigationKey() when wxUSE_STL==1 and start_node is NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 12:53:28 +00:00
Robert Roebling
4b3feaa75d Added windowing and scrolling logic to generic
implementation of wxDataViewCtrl (it runs now).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 12:30:06 +00:00
Julian Smart
40cc34ec56 Fix accelerstors with down and left
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 11:30:23 +00:00
Julian Smart
dd7230ab0b Fixed a crash when deleting the last timer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 11:25:26 +00:00
Mart Raudsepp
b976323b04 Use wxGtkString here too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-21 09:24:47 +00:00
Václav Slavík
577579933d removed Julian's hack that is no longer needed after wxBitmap stubs were added even for DIB-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 23:25:48 +00:00
Vadim Zeitlin
da75a14e72 explain why do you need wxUSE_WXDIB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 23:24:47 +00:00
Vadim Zeitlin
50a9dd77f5 provide stubs for conversion to/from image functions even when wxUSE_WXDIB==0, this allows to not test for it in other places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 23:23:00 +00:00
Vadim Zeitlin
511fb92a6c removed hard tabs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 22:57:07 +00:00
Václav Slavík
45f3249bb6 fixed GetBitmap() to respect the "param" argument if !wxUSE_FILESYSTEM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 22:26:39 +00:00
Robin Dunn
f52cbe909c reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 18:26:35 +00:00
Robin Dunn
607a3fa066 Editors, Renderers and Attrs need to have a destructor so SWIG won't
complain about it, but since they are protected in C++ we need to give
them a dummy one.  In the future these shoud be changed to use
%ref/%unref and let SWIG manage the refcount for us.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 18:02:37 +00:00
Robin Dunn
ce1522a1f2 Use the static method instead of the global alias
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 17:56:42 +00:00
Vadim Zeitlin
a6c355d270 initialize wxZipFSHandler even when wxUSE_GIF=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 17:09:03 +00:00
Robert Roebling
45778c96d4 Further compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 16:44:46 +00:00
Robert Roebling
9d14de69f4 Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 16:41:41 +00:00
Robert Roebling
4ed7af081e Added (yet unfunctional) skeleton files fir
generic implementation of wxDataViewCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 16:37:24 +00:00
Vadim Zeitlin
c1a3ff259e fixed Clear() for GTK+ 2.4+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-20 12:17:03 +00:00
Vadim Zeitlin
be27bc46ab corrected cross-reference to non existent note
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-19 13:43:58 +00:00
Stefan Csomor
ffc75ee452 rewire char events in case there is no focusable control on a tlw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-19 10:55:09 +00:00
Robin Dunn
80b6bf7c7c A bit of cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-19 02:22:08 +00:00
Robin Dunn
ac288fac82 docstrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-19 02:17:43 +00:00
Robin Dunn
6cedc146fa Add wxHelpProvider destructor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-19 02:16:08 +00:00
Robin Dunn
f70ec5b8f7 Demonstrate setting metal appearance for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 22:17:39 +00:00
Vadim Zeitlin
dd44c9e02c do not assign uniChar to wxKeyEvent::m_keyCode for EVT_CHAR events; this breaks any code handling things like arrow keys as it gets absolutely useless kDownArrowCharCode instead of WXK_DOWN for example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 17:14:55 +00:00
Vadim Zeitlin
8470c37812 removed redundant declaration (no real changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 17:04:47 +00:00
Vadim Zeitlin
2dd52041d0 fixed crash introduced in rev. 187 for all non-MSW platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 16:53:42 +00:00
Mart Raudsepp
e027bfd9cb Update copyright years. Is manual2e.tex even used anymore? Much information in it is out of date.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 13:32:23 +00:00
Mart Raudsepp
a73554d4be Test commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 12:59:09 +00:00
Mart Raudsepp
bb7a709657 Testing CVSROOT/loginfo changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 12:25:56 +00:00
Mart Raudsepp
a9c876c0b0 Test wxPython CIA announcement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 12:19:16 +00:00
Robin Dunn
1c47620268 New source dirs that need installed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 01:03:45 +00:00
Robin Dunn
0ae3258d7a SWIG 1.3.29 updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-18 01:03:08 +00:00
Robin Dunn
10ae0adb58 Add DoGetBestSize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 22:50:05 +00:00
Robin Dunn
71caeaf3c0 Add scrollbars when the plot is zoomed in, and also the ability to
grab a zoomed plot and move it around with a mouse drag.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 22:45:37 +00:00
Stefan Csomor
5cd47bd76a disabling close box
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 20:51:38 +00:00
David Surovell
e542ecc6f6 cleanup - added some error checking, reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 19:11:32 +00:00
Stefan Csomor
7358f9073d intel pict fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 18:29:14 +00:00
Stefan Csomor
db28a493dd fixing a scope error introduced in 1.41
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 17:12:40 +00:00
Stefan Csomor
27ea6757f3 fix for sf bug 1448153: Widgets sample hangs on Japanese radio label
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 14:26:59 +00:00
Robert Roebling
2b850ae1a5 Rearrange code to make adding wxMimeTypesManagerFactory
at runtim possible.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 14:13:02 +00:00
Robert Roebling
1d115baf4b Added files for GnomeVFS backend (currently useful
for strictly nothing).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 14:08:58 +00:00
Vadim Zeitlin
8c03c8bed1 don't use toupper() with non-ASCII key codes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 13:49:47 +00:00
Stefan Csomor
1cf9b41c2d intel pict fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 10:39:56 +00:00
David Surovell
611ac06b89 cleanup - fixed a warning, some typos, and made minor reformatting changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 04:09:10 +00:00
Vadim Zeitlin
f5a45ee2e9 use correct string in wxEVT_COMMAND_COMBOBOX_SELECTED events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 02:38:58 +00:00
Robin Dunn
3abaf18160 The dummy wxDisplay class is no longer needed as there is now always a
wxDisplay class available, but it has limiited functionality if
wxUSE_DISPLAY is zero.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 01:30:21 +00:00
Robin Dunn
8f146d6b11 updated comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 00:54:51 +00:00
Robin Dunn
90ab4a358c Add GetClientArea
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 00:50:33 +00:00
Vadim Zeitlin
47f43b6bb5 need wxRect definition and not just declaration here (fixes wxMotif build without PCH)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 00:15:04 +00:00
Vadim Zeitlin
b69a24bfee wxUSE_DISPLAY should be 0 for VMS port as Xinerama is apparently not available there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 00:12:17 +00:00
Vadim Zeitlin
b09a59f521 fixed incorrect XtVaXXX() function call (thanks to g++ 4 for detecting this!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 00:09:41 +00:00
Vadim Zeitlin
262a153683 don't put the window off screen when centering it (if possible); also don't centre on the parent if the parent is entirely off screen (should fix centering on the MDI parent frame under Mac)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-17 00:04:13 +00:00
Robin Dunn
1c71765a15 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 23:41:43 +00:00
Robin Dunn
75219dcb68 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 23:24:27 +00:00
Robin Dunn
3c31306c74 Docstring typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 23:22:10 +00:00
Robin Dunn
29f18b90c2 Somehow (probably in a merge) all the CVS Id: tags got deactivated...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 22:59:03 +00:00
Julian Smart
5c7a8a092a wxMotif/ANSI can't cope with UTF-8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 18:59:12 +00:00
Vadim Zeitlin
afcc11bb93 documented option enabling DirectDraw implementation of wxDisplay under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 16:10:50 +00:00
Vadim Zeitlin
6c5d62917d added wxDisplay::GetClientArea() (currently implemented for single display and MSW implementations only)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 16:07:24 +00:00
Vadim Zeitlin
480abc8fdb Albanian translation added (Besnik Bleta)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 15:41:09 +00:00
Vadim Zeitlin
fdd7a38bb2 fixed build after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 15:28:22 +00:00
Włodzimierz Skiba
9c9691ba24 Forward port from 2.6 branch to avoid wxSTD usage crashes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 13:06:39 +00:00
Włodzimierz Skiba
7487919e55 wxDisplay build fix for missing Direct Draw.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 11:06:10 +00:00
Julian Smart
c1dfa9eb8e Mobile 5 Smartphone fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 11:03:26 +00:00
Włodzimierz Skiba
3ea19afd1f Missing wxDisplay identifiers for DMC build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 10:45:11 +00:00
Włodzimierz Skiba
5d484919aa forward port from 2.6 - eVC3 fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 08:52:36 +00:00
Włodzimierz Skiba
8785360429 Rebuild build files so all night/Tinderbox/Coverity builds could sleep well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 08:19:57 +00:00
Włodzimierz Skiba
de97c9d7d9 Rebuild build files so all night/Tinderbox/Coverity builds could sleep well.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 08:06:27 +00:00
Stefan Csomor
66936c3770 universal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 07:10:24 +00:00
David Surovell
6a5cb3b79c added missing ctor implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 06:12:43 +00:00
Vadim Zeitlin
f37c35d717 initialize base class using its ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:35:22 +00:00
Vadim Zeitlin
1003169e21 added wxDisplayFactoryX11 ctor body
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:32:42 +00:00
Vadim Zeitlin
0d5b6a403e linking fixes after last checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:32:02 +00:00
Vadim Zeitlin
547308b8e6 compilation fixes after last checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:30:53 +00:00
Vadim Zeitlin
22d679f369 compile some functionality even when wxUSE_DISPLAY == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:24:29 +00:00
Vadim Zeitlin
4efdec45d7 removed obsolete display.h files; added display_impl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:24:04 +00:00
Vadim Zeitlin
ef1717a963 wxDisplay cleanup/rewrite:
- wxDisplay is now a concrete class and uses a pImpl-based design
- got rid of four duplicate but subtly different versions of trivial
  single display-only wxDisplay implementation (but 2 versions of Mac
  Classic and Mac CoreGraphics implementations each still remain...)
- assorted code simplifications and memory leaks fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 04:23:07 +00:00
Robin Dunn
8072477d51 Enable OnDrawSeparator and OnDrawBackground to be overridable in wx.HtmlListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-16 02:30:42 +00:00
Robin Dunn
d0bc88b82a Added some overview text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 23:27:11 +00:00
Robin Dunn
23a023642c Added CheckListCtrlMixin from Bruce Who
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 23:22:53 +00:00
Robin Dunn
caeac82e4d Updated the analogclock.py module to the new analogclock package from
E. A. Tacao.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 23:17:54 +00:00
Robin Dunn
5f3c9dc69c updated html-ized version of the stc.h file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 22:47:26 +00:00
Robin Dunn
5756f98678 Added wx.Window.GetScreenPosition and GetScreenRect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 22:46:55 +00:00
Robin Dunn
f8dda225b3 some int --> size_t changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 22:45:10 +00:00
Robin Dunn
329a56f7ff tweaked font sizes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 22:35:11 +00:00
Vadim Zeitlin
fd921f3560 use wxDynamicLibrary::GetSymbolAorW() instead of duplicating its functionality with macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 20:18:42 +00:00
Mart Raudsepp
aa738eb8e3 Don't return a void value here - VC6 doesn't like it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 19:49:39 +00:00
David Surovell
51d4293d68 cleanup - minor restructuring, reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 19:22:01 +00:00
Włodzimierz Skiba
05fd6a8b82 More size_t in interface.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 18:46:24 +00:00
Włodzimierz Skiba
c7094dec84 Documentation build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 18:14:36 +00:00
Włodzimierz Skiba
45abfa7137 wxOS2 night build warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 15:33:34 +00:00
Włodzimierz Skiba
5429cf2455 wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 11:52:59 +00:00
Włodzimierz Skiba
44014bcda0 wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 11:27:22 +00:00
Włodzimierz Skiba
7e3edf927b wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 10:37:24 +00:00
Julian Smart
6fdaa47727 Added documentation for compiling under Windows Mobile 5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 10:32:34 +00:00
Julian Smart
839f48f25d Fix windows.h inclusion problem on WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 10:30:08 +00:00
Julian Smart
ff759b6ad3 Fix for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 10:28:38 +00:00
Włodzimierz Skiba
266df1bf1b wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 10:10:13 +00:00
Włodzimierz Skiba
612bbde52f wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 10:03:44 +00:00
Julian Smart
625b3cf1f4 Fix for command bar not painting in Windows Mobile 5
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 09:57:00 +00:00
Julian Smart
72e7ec5b6a Add menus even if we have no menubar HMENU (Windows Mobile 5.0 can't retrieve it).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 09:55:55 +00:00
Julian Smart
19fc41a359 Corrected wrong include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 09:50:37 +00:00
Mart Raudsepp
67756da424 Use wxGtkString here to clean up code, and not leak in debug builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 09:12:52 +00:00
Mart Raudsepp
4b84311a44 Compile fix. Seems to work too, at quick glance.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 09:05:25 +00:00
Julian Smart
2c3ebf8be5 Removed use of deprecated functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 08:50:46 +00:00
Julian Smart
b1c6a00e63 Fix compile problem with VS 2005
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 08:44:28 +00:00
Włodzimierz Skiba
e95c145cc8 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 07:49:43 +00:00
Mart Raudsepp
9d655692b9 g_value_set_string duplicates the string itself, so don't do it ourselves only to leak memory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 07:41:10 +00:00
Mart Raudsepp
35a489dd90 Introduce a convenience class for g_freeing a gchar* on scope exit automatically, as suggested by VZ
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 07:25:32 +00:00
David Surovell
c18353e561 cleanup - fixed warnings, reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 06:22:36 +00:00
Mart Raudsepp
74af7bcf4f Don't return the return value of a void method in a void method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 03:42:26 +00:00
Mart Raudsepp
d394f0c93f ICCCM says that the TIMESTAMP atom is required, so provide it. This is patch 1424755 from Timothée Lecomte.
Additionally fix a memory leak from a gdk_atom_name.
(Forward port from 2.6 branch to both HEAD gtk sources)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 03:01:06 +00:00
Mart Raudsepp
cc6e44bf0b Don't leak a gchar* in wxDataFormat::GetId()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 00:38:39 +00:00
Włodzimierz Skiba
36e14c2bc8 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-15 00:01:18 +00:00
Włodzimierz Skiba
c3be59bcdb wxTinderbox build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 23:27:59 +00:00
Włodzimierz Skiba
035b6a79d0 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 23:16:13 +00:00
David Surovell
4c286ef633 cleanup - expanded wxTimerBase::Init to assign all member vars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 22:46:49 +00:00
Robin Dunn
62139e5a27 Can't use IsValidInsert from GtkAddHelper as it could cause a segfault in
GetCount if the widget is not fully created yet.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 22:00:17 +00:00
Robin Dunn
1dc9b42f4f Fix compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 20:28:07 +00:00
Włodzimierz Skiba
8228b8932a Line-up interfaces to use size_t for GetCount()s (and count related api).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 19:44:45 +00:00
Włodzimierz Skiba
afbe150a76 Line-up interfaces to use size_t for GetCount()s (and count related api).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 19:30:06 +00:00
Robin Dunn
77e79241e8 m_windowReserved was removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 18:45:31 +00:00
Vadim Zeitlin
6021b8f80b we don't need reserved virtual functions on HEAD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 16:04:33 +00:00
Vadim Zeitlin
5a63a0f10a fixed centering of a TLW on a non-TLW parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 15:59:32 +00:00
Vadim Zeitlin
3c81c9aafb added GetScreenPosition/Rect() which always return the screen coordinates of the window (for child windows and TLWs alike)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 15:45:12 +00:00
Jouk Jansen
ad332e5bf3 Committing in .
Update OpenVMS compile support

 Modified Files:
 	wxWidgets/src/x11/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 08:39:07 +00:00
Robin Dunn
1bd5559898 reSWIGed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 05:17:03 +00:00
Robin Dunn
554f62e979 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 05:06:32 +00:00
Robin Dunn
0085ce4937 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 04:18:43 +00:00
Robin Dunn
94b2c6e696 SWIG-1.3.29
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 04:15:20 +00:00
Robin Dunn
ace78e271b SWIG 1.3.29
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 04:06:46 +00:00
Robin Dunn
c099c54cba Silence some warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 01:40:05 +00:00
Robin Dunn
5be7e07a3f Keep wxSTC_LEX_ASP and _PHP available for now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 01:39:22 +00:00
Robin Dunn
a6cb8040a8 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 01:29:52 +00:00
Robin Dunn
369ac260a9 Sometimes we do need to allow recursion of callbacks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 01:28:22 +00:00
Mart Raudsepp
41e9579283 OnGetLineHeight and OnGetLinesHint are virtual, so document them as such. Closes bug #1445485
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 00:36:44 +00:00
Włodzimierz Skiba
8e25c1981b wxComboBox with SmartphoneCE has different members due to differnt wxChoice.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 00:35:05 +00:00
Mart Raudsepp
0902898a15 Docs: Escape underscores
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-14 00:24:53 +00:00
Robin Dunn
226de48a85 Dtor for wxHtmlCell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-13 23:11:35 +00:00
Julian Smart
c6b81cebf1 If we processed a command event, return true, or we could end up processing
it again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-13 15:11:14 +00:00
Włodzimierz Skiba
caf6e6dee8 TRUE/FALSE source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-13 10:04:15 +00:00
Włodzimierz Skiba
b7e37e558d Init() does not belong to public.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-13 09:37:23 +00:00
Włodzimierz Skiba
61373fa8f3 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-13 09:21:30 +00:00
Włodzimierz Skiba
cfb6676306 Make wxListCtrl changes ported from 2.6 branch complete (fix for long list of errors at wxTinderbox).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-13 09:18:22 +00:00
Vadim Zeitlin
7891b4d450 don't send weird colours for different controls, this looks really bad under some platforms (such as Mac) and makes the text unreadable under the others; there is widgets sample now for testing whether the colour setting works interactively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:58:21 +00:00
Vadim Zeitlin
361484a8db create a non readonly combobox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:55:12 +00:00
Julian Smart
107ff6689a Added context menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:54:13 +00:00
Vadim Zeitlin
7d90194ccb fixed event generation for wxComboBox to be consistent with the other platforms and also simplified the code by using the existing wxChoice logic instead of reimplementing it in a broken way
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:53:27 +00:00
Vadim Zeitlin
c11f04122f fixed event generation for wxChoice: it now sends one and exactly one wxEVT_COMMAND_CHOICE_SELECTED irrespectively of how the item was chosen and only does it after the dropdown is closed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 20:20:16 +00:00
Vadim Zeitlin
d77d8c0719 don't send EVT_CHOICE events while the dropdown is opened for consistency with the other platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 19:43:27 +00:00
Vadim Zeitlin
bc50a2ae95 log wxChoice events in the same format as wxComboBox ones to make it simpler to compare them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 19:16:35 +00:00
Vadim Zeitlin
9ae1959972 use the sizer to layout the main window/panel (this allows to give more size to the log window by resizing the main frame while before it was pretty difficult to see anything in it)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 17:04:23 +00:00
Vadim Zeitlin
985f824c2b fixed printf format warnings for all platforms (previous fix for Darwin broke it for Linux)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 16:51:43 +00:00
Vadim Zeitlin
f87ab3cca3 don't set cursor coords to (0, 0) which could be invalid coordinates (in an empty grid)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 15:44:44 +00:00
Vadim Zeitlin
937f314d3f native implementation of wxDirDialog for wxCocoa (patch 1403780)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 15:30:52 +00:00
Włodzimierz Skiba
71ac8ec3c8 IsValid() is now in base class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 15:25:58 +00:00
Włodzimierz Skiba
0360340068 Line-up interfaces to use size_t for GetCount()s (and count related api).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 15:14:12 +00:00
Vadim Zeitlin
5d0d3e6d72 use %lu and not %d print format for size_t arguments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 15:14:00 +00:00
Vadim Zeitlin
31e57091f2 non virtual dtors warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 15:10:23 +00:00
Włodzimierz Skiba
43f06cfda1 Line-up interfaces to use size_t for GetCount()s (and count related api).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 14:49:25 +00:00
Vadim Zeitlin
e5efa97ec1 regenerated after changes in configure.in in revisions 1.1116 and 1.1117
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 14:44:43 +00:00
Włodzimierz Skiba
a862f3cc19 Make wxTinderbox pass dialup sample for DOS cross-build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 14:34:31 +00:00
Vadim Zeitlin
2e1f50128a support mnemonics for wxStatic/RadioBox and made it easier to add support for more controls by virtualizing the mnemonics support logic (patch 1448178)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 14:21:19 +00:00
Vadim Zeitlin
186344760d support underlined fonts (patch 1448089)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 14:14:59 +00:00
Vadim Zeitlin
01c54165d1 don't require multimon.h any more now (patch 1446030); enable wxUSE_DISPLAY by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:49:21 +00:00
Vadim Zeitlin
b931e275f5 remove dead code from wxMatchWild (patch 1445809)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:39:41 +00:00
Vadim Zeitlin
20aa779e3e define size() in terms of length(), not vice versa, to make the code somewhat faster in non-optimized builds + some typo fixes in comments (patch 1440237)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:37:56 +00:00
Włodzimierz Skiba
9eb5cd3b1f wxCore build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:35:59 +00:00
Vadim Zeitlin
0aa7c44136 don't require at least 8 bytes of sound data (patch 1340767); do check that we have enough data before reading it (and crashing)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:29:05 +00:00
Włodzimierz Skiba
cceed0407f wxBase build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:28:55 +00:00
Włodzimierz Skiba
3b38e2a022 Line-up interfaces to use size_t for GetCount()s.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:15:53 +00:00
Włodzimierz Skiba
78fc4e5509 Line-up interfaces to use size_t for GetCount()s.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:08:24 +00:00
Włodzimierz Skiba
02e05e7e40 wxTinderbox build fix (!PCH support).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:03:40 +00:00
Włodzimierz Skiba
30d5f9f54e More wxMSW specific headers in precompiled headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 13:00:35 +00:00
Vadim Zeitlin
e894be201b GetNumberOfLines() now returns the number of physical, not logical, lines in the control in wxGTK2 as under the other platforms (patch 1438117)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 12:46:58 +00:00
Vadim Zeitlin
c01359d9d5 more accurate best size calculation logic (use the current date format)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-12 01:22:43 +00:00
Vadim Zeitlin
7fce89b944 deal with the situation when a (dynamic) event handler disconnects itself during its execution (and skips the event, too): this is used to crash but there is no reason it should
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 21:50:44 +00:00
David Surovell
2e91d506b2 minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 21:13:28 +00:00
Włodzimierz Skiba
f30f25b559 WXUNUSED is our coding standard.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 18:42:10 +00:00
Stefan Neis
6433b7f48a Removed -fno-strict-aliasing for OS/2 (not supported by all supported gcc versions).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 18:02:38 +00:00
Julian Smart
692ebda6c7 Applied patch [ 1372332 ] Support for WX_RESCOMP to allow MSYS+wx-config to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:51:45 +00:00
Julian Smart
32ceccf56f Fix crash caused by last change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:49:23 +00:00
Julian Smart
c4709ea55c Applied patch [ 1428990 ] wxUniv: patch for toolbar button remain in pressed status
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:40:41 +00:00
Julian Smart
de63b922ca Applied patch [ 1443707 ] kill "cast truncates constant value" warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:33:25 +00:00
Julian Smart
388aa6e289 Applied patch [ 1435340 ] Add support of wxToggleButton to wxGenericValidator
With precomp header fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:28:00 +00:00
Julian Smart
d8909578f7 Applied [ 1425529 ] Tooltip was not removed on deletion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:22:55 +00:00
Julian Smart
7db713aea6 Applied patch [ 1436761 ] wxGrid: Can't enable cell edit ctrl on very wide columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 14:17:50 +00:00
Julian Smart
4c43dd9078 Applied patch [ 1432449 ] wxXml API documentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 13:43:58 +00:00
Julian Smart
e8291ef43d Applied patch [ 1447184 ] Elimination of a warning about unused parameters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 13:26:16 +00:00
Julian Smart
b6e5dfeff3 Applied patch [ 1447666 ] Fix obscure GTK wxListBox construction bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 13:24:07 +00:00
Julian Smart
e7b8da226f Applied patch [ 1447732 ] Fix CVS HEAD for VC6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-11 13:13:00 +00:00
Vadim Zeitlin
ef22edc309 don't Connect() to wxEVT_RIGHT_DOWN twice (fixed problem introduced by last patch)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 21:37:20 +00:00
Vadim Zeitlin
443e2f09a5 made DoListHitTest() more efficient (patch 1446848) and also fix it under OS X 10.4 where the coodrinates returned by data browser are client and not screen ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 21:36:25 +00:00
Vadim Zeitlin
c6abf0ef4d define wxUSE_UNICODE=1 on the command line in UNICODE builds (allows to use default wx/setup.h unchanged)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 21:30:03 +00:00
Robin Dunn
06db67bcb0 Applied Patch #1424869: Implement wxListCtrl::SetItemColumnImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 21:26:59 +00:00
Vadim Zeitlin
b4deaacba3 simplification: create listbox in only one place (patch 1447019)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 21:24:29 +00:00
Stefan Csomor
6264c8e2bd patch 1444066
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 19:04:59 +00:00
Stefan Csomor
6945b5878c fixing RawBitmap access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 18:58:16 +00:00
Stefan Csomor
4b217ea039 not needed anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 18:54:11 +00:00
Robin Dunn
5a86739df2 Increase timeout in order to catch slower clicks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 18:09:22 +00:00
Julian Smart
abd61ebf9b To -> From
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 18:04:55 +00:00
Vadim Zeitlin
bc509e346e OnApply() calls TransferDataFromWindow(), not To
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 18:02:15 +00:00
Robin Dunn
b0d45269cc Applied patch #1441370: lib.plot - allow passing in wx.Colour()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 17:44:48 +00:00
Vadim Zeitlin
cc59d93963 signed/unsigned comparison warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 17:35:39 +00:00
Stefan Csomor
c06bbbff22 additional types for carbon events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 17:02:51 +00:00
Stefan Csomor
2e98aa1243 fix for non precomp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 16:44:10 +00:00
Stefan Csomor
509b4eccfe adding experimental font dialog version - hacking the font panel ...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 16:11:29 +00:00
Stefan Csomor
cdef033465 CodeWarrior fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 16:06:32 +00:00
Stefan Csomor
cd17aeff89 non mach-o fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 16:04:54 +00:00
Stefan Csomor
7ea1c91776 using new API (no visual difference)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 16:03:09 +00:00
Stefan Csomor
2a2e63652d added non mach version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 16:01:08 +00:00
Stefan Csomor
b6b59e43ca support for unicode font names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 15:59:52 +00:00
Vadim Zeitlin
71771e3525 handle directories with spaces in them better
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 13:42:10 +00:00
Włodzimierz Skiba
2e98a222ba Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 10:00:35 +00:00
Włodzimierz Skiba
9f322c6d8f Avoid unexpected negative array index (CID 41).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 09:59:38 +00:00
Włodzimierz Skiba
f402150f77 wxTinderbox build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 09:56:06 +00:00
Włodzimierz Skiba
80cac95edb wxTinderbox warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 09:54:08 +00:00
Robin Dunn
46910b0611 slight refactor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:31:25 +00:00
Robin Dunn
35c15a4d84 Test wx.ListBox.HitTest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:30:28 +00:00
Robin Dunn
78522d7351 Test wx.CommandEvent.GetClientData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:29:03 +00:00
Robin Dunn
c5633576a8 Give classes that need one a destructor wrapper, and set %disown when
another class takes ownership.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:27:37 +00:00
Robin Dunn
d344366c42 Add wx.ListBox.HitTest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:26:28 +00:00
Robin Dunn
821053dda4 Add wx.CommandEvent.GetClientData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:24:32 +00:00
Robin Dunn
f938068ed4 Compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:05:02 +00:00
David Surovell
0e859e3223 cleanup magic number usage and comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-10 00:01:28 +00:00
Włodzimierz Skiba
c45c32033d FontEnum fix: use NULL for global enumeration.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 23:36:32 +00:00
Vadim Zeitlin
8a7fc9b5a7 always return something in GetCommandForVerb() second argument, even if verb not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 19:09:22 +00:00
Vadim Zeitlin
9e2bd1354a corrected test for NUL in wxHtmlEntitiesParser::Parse() (patch 1443823)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 14:16:49 +00:00
Vadim Zeitlin
9ce754611c call SetWindowPos(SWP_FRAMECHANGED) after changing some styles (patch 1445096)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 14:12:35 +00:00
Vadim Zeitlin
0aed400874 define UDM_{SETRANGE|SETPOS|GETPOS}32 if we don't have them in the headers to allow using full 32bit range even for older compilers/SDK (patch 1439887)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 14:04:41 +00:00
Vadim Zeitlin
c039fef565 don't clear clipboard if it was changed by another application since we used it (patch 1436601)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:59:31 +00:00
Vadim Zeitlin
28354d90fc made SetFirstItem() work again (patch 1445170)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:47:25 +00:00
Vadim Zeitlin
0faa7620a5 fixed idle event generation logic (thanks to Paul Cornett for patch 1444602)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:44:02 +00:00
Vadim Zeitlin
c4fa282ce1 removed useless colMapAllocCounter (patch 1413456)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:38:22 +00:00
Vadim Zeitlin
848332140b moved wxapp_install_idle_handler and g_isIdle from many cpp files into gtk/private.h (patch 1435529)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:36:53 +00:00
Vadim Zeitlin
1d7e458f1a removed unused ifdef wxUSE_THREADS block (patch 1435521)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:33:01 +00:00
Vadim Zeitlin
a52d2b7974 uninitialized variable warning fixed (modified patch 1434065)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:23:52 +00:00
Vadim Zeitlin
315a49a10e fix gcc4 warning for wndproc casts (patch 1431939)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:18:50 +00:00
Vadim Zeitlin
7fab07efba let _T() work with macros (modified patch 1437983)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:16:02 +00:00
Vadim Zeitlin
e5e41cfecb fixed mouse (and other?) events generation broken by recent changes (patch 1446205)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:12:18 +00:00
Vadim Zeitlin
c279d9ab2d compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:08:07 +00:00
Vadim Zeitlin
57772185bc compilation fix after last commit; some extra comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 13:02:30 +00:00
Vadim Zeitlin
c00fed0ef4 added wxListBox::HitTest() from Ryan (patch 1446207)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 12:48:52 +00:00
Julian Smart
22d29469a0 Missing >
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 07:49:32 +00:00
Robin Dunn
c64371deb2 Patch #1446110: use of uninitialized variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 06:27:59 +00:00
Vadim Zeitlin
8e75dca831 don't check that the cursor is over the window calling SetCursor(), it might have captured it and so want to change the cursor even when it's outside the window boundaries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 03:03:15 +00:00
Robin Dunn
61f0bec0cd Keep the key up/down event consistency without relying on toupper()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 02:20:39 +00:00
Robin Dunn
cdff13184c Applied (a slightly refactored) Patch #1445169: wxListBox bestsize fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-09 00:32:42 +00:00
Robin Dunn
466c166f5a Fix for bug #1436503. Delay the start of the DnD oprtation in case
the user just intended to click, not drag.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 23:57:45 +00:00
Julian Smart
f75ae77cd7 Name clash correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 23:35:16 +00:00
Robin Dunn
cd2e8564d7 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 23:22:35 +00:00
Julian Smart
cfe590ae1d Added slightly better font dialog for Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 19:45:51 +00:00
Włodzimierz Skiba
d35ad26eee Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 16:34:47 +00:00
Robin Dunn
f355f03e63 workaround MacSetMetalAppearance being made protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 03:06:25 +00:00
Robin Dunn
1e9bafca0f Updated to Scintilla 1.67
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 01:48:03 +00:00
Vadim Zeitlin
728f972bce don't draw focus rect for custom drawn items when the list control doesn't have focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 01:27:59 +00:00
Vadim Zeitlin
9a3952fad8 generate wxEVT_COMMAND_TEXT_ENTER for multiline controls too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:23:36 +00:00
Vadim Zeitlin
d0c3476bd6 correct gcc print format warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:20:29 +00:00
Vadim Zeitlin
41f4eb8534 compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:19:19 +00:00
Vadim Zeitlin
c5dd5a3dac test EVT_TEXT_ENTER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:15:20 +00:00
Vadim Zeitlin
f120af9d56 use wxCHECK instead of wxASSERT to avoid crashing later (coverity checker CID 19)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:09:37 +00:00
Vadim Zeitlin
641c5f1a97 don't crash in case of unknown sizer type (coverity checker CID 17)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:05:44 +00:00
Vadim Zeitlin
1e5deeb2f1 don't crash in case of incorrectly specified parent type of MDI child frame (coverity checker CID 16)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-08 00:03:15 +00:00
Vadim Zeitlin
306608eb3c use wxCHECK instead of wxASSERT in CanonicalizePluginName() to avoid crashing in console apps (coverity checker CID 13)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:55:23 +00:00
Vadim Zeitlin
ce46daf91c test for dst!=NULL instead of bpp==1 in Rescale() as otherwise we'd crash on monochrome display (not very common any more, but still) (coverity checker CID 12)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:52:46 +00:00
Vadim Zeitlin
d6a7ca317f don't crash if one of GetAllCommands() parameters is NULL (coverity checker CID 11)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:47:15 +00:00
Vadim Zeitlin
fbf1ee1d09 removed unneeded test for pal!=NULL in ConvertToImage() (coverity checker CID 10)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:44:25 +00:00
Vadim Zeitlin
517cce713e oops, undid last commit, the extra test is unneded (but a comment explaining why it isn't probably wouldn't hurt)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:40:06 +00:00
Vadim Zeitlin
10793ebfbb make sure we don't use uninitalized output stream in OnSysWrite() (coverity checked CID 7)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:38:09 +00:00
Vadim Zeitlin
37b6a42697 fixed crash in case of not subclasses wxWizardPage in the resources (coverity checker CID 18)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:34:34 +00:00
Vadim Zeitlin
32592f4a80 fixed yet another memory leak in LoadGnomeDataFromKeyFile() (coverity checker CID 51)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:32:09 +00:00
Vadim Zeitlin
926ce9e3ac fix another memory leak in SetCommand() (coverity checker CID 52)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:30:43 +00:00
Vadim Zeitlin
cb0b7b7d81 fix memory leak (coverity checker CID 53)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:27:51 +00:00
Vadim Zeitlin
47e6466439 make it clear that m_page is not NULL in OnBackOrNext() (coverity checked CID 20)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:24:55 +00:00
Vadim Zeitlin
455f6b8d94 fixed memory leaks in case of errors during file load in wxSound::Create() (coverity checker CID 54)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:21:08 +00:00
Vadim Zeitlin
e1026179ef fixed a memory leak in case server name couldn't be resolved in MakeConnection() (coverity checker CID 56)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:16:58 +00:00
Vadim Zeitlin
c56ae04274 fixed a big memory leak in DoDrawBitmap() (coverity checker CID 57)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:14:14 +00:00
Vadim Zeitlin
0d2ef7a802 fixed a double free bug in SetBufferIO(size_t) (coverity checker CID 62)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 23:04:10 +00:00
Vadim Zeitlin
66619ee50c removed useless checks for tree==NULL in wxGenericTreeItem::DeleteChildren(), as tree==this of the calling object (coverity checker CID 6)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 22:56:11 +00:00
Vadim Zeitlin
91894db3d7 simplified the code in ProcessGridCellMouseEvent() to get rid of unreachable code (coverity checked CID 3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 22:53:10 +00:00
Vadim Zeitlin
af5c81b3fa don't compile the code used only in wxUniv build in the other ports (coverity checker CID 5)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 22:30:01 +00:00
Julian Smart
97148373b3 Tweaks for demos on MacOSX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 22:02:37 +00:00
Julian Smart
1d1a4b71e8 Zip up Windows demos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 21:04:05 +00:00
Włodzimierz Skiba
8d5ff32d33 Removed unused and outdated Watcom build files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 20:59:31 +00:00
Julian Smart
21e354f107 Applied patch [ 1445031 ] wxString passed as ellipsis argument in richtexthtml.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 20:40:31 +00:00
Włodzimierz Skiba
4aa14001d2 DMC build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 19:53:43 +00:00
Julian Smart
16c5f4ae6d Fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 19:36:11 +00:00
Włodzimierz Skiba
cececf4db5 Don't send dummy wxCommandEvent. Make members private and use wxW coding standards for them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:54:41 +00:00
Włodzimierz Skiba
0e4e783cf0 ::GetFileAttributes takes Unicode in Unicode build, don't use fn_str() (Borland Unicode build fix).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:49:17 +00:00
Włodzimierz Skiba
548b537752 Don't send dummy wxCommandEvent.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:41:27 +00:00
Václav Slavík
73de5077ce preserve window's content when changing the fonts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:31:49 +00:00
Włodzimierz Skiba
3568f700f6 Borland build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:16:24 +00:00
Vadim Zeitlin
46c48053f4 don't leave evtType uninitialized in gtk_slider_callback() (thanks coverity checker)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 18:13:11 +00:00
Julian Smart
51128f7dab Added script for building and archiving a small range of demo binaries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 16:50:07 +00:00
Julian Smart
0652567356 Reordered symbols since MinGW wasn't getting HDN_GETDISPINFOW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 16:21:37 +00:00
Włodzimierz Skiba
e0b15ca795 Don't link with media lib with USE_MEDIA==0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 15:15:59 +00:00
Włodzimierz Skiba
03575f9bd3 Don't link with media lib with USE_MEDIA==0.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 15:01:59 +00:00
Julian Smart
654056ee40 Increase precision of variant conversion to string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 14:52:33 +00:00
Julian Smart
fe4cb4f5ea Allow width to be absent but precision present
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 14:50:50 +00:00
Julian Smart
2dec67617f Added conversion to HTML, by Akin Demirtug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 14:48:17 +00:00
Włodzimierz Skiba
b28a6678e0 Replace dummy wxCommandEvent with dedicated API. Disable resizing of dialog only on subset of WinCEs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 11:41:51 +00:00
Kevin Ollivier
089bac8ed4 Fix for invalid 'invisible' chars.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 07:06:29 +00:00
Mart Raudsepp
2eb1512ac8 Apply patch #1443819 from Paul Cornett - move the GtkTreeIter to the outer scope as to not assign the address of an
auto variable to an outer scope variable (now both are in the outer (function) scope).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:55:26 +00:00
Mart Raudsepp
7e48f6d964 Remove the GetItemHeight sample from samples/checklst as it exists only on wxGTK and wxMSW. Improved patch #1443694
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:37:29 +00:00
Kevin Ollivier
da00183307 Move generation of the eVC, and DMars formats over to the release scripts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:29:02 +00:00
Kevin Ollivier
403aad7973 Adding Linux and Mac build steps, and updating some build-environ.cfg options.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:15:25 +00:00
Kevin Ollivier
c877c0c3be Documentation change, and adding an end linebreak.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:13:59 +00:00
Kevin Ollivier
65d7c84cb3 Adding documentation on the automated release system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:04:02 +00:00
Kevin Ollivier
2d09ef21fa Mac and Linux build scripts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 06:02:42 +00:00
Włodzimierz Skiba
684883e3e3 Present generic dialog on WinCE. Show using/avoiding Ok-button WinCE policy.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 01:50:45 +00:00
Vadim Zeitlin
9d3cb3f369 added a tiny class to call Freeze/Thaw in ctor/dtor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 01:50:21 +00:00
Włodzimierz Skiba
c81c9392fa Apply WinCE OK-button policy. Use standard buttons routines.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 01:45:18 +00:00
Kevin Ollivier
49089236aa Typo fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 01:18:22 +00:00
Kevin Ollivier
98da423304 Script to configure MSVC6 environment for Cygwin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 00:07:25 +00:00
Kevin Ollivier
d78c9b7e4a Finished moving this over to bash syntax.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 00:02:33 +00:00
Kevin Ollivier
615c15f981 Generate wxMSW zip even if we've turned off InnoSetup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-07 00:00:03 +00:00
Włodzimierz Skiba
8942f83aca wxWinCE build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 23:58:27 +00:00
Robin Dunn
132bcd1256 cleanup doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 21:10:04 +00:00
Robin Dunn
a65ef6fb79 Use EVT_CONTEXT_MENU
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 21:09:46 +00:00
Robin Dunn
7748c15cd8 Fix indentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 21:06:10 +00:00
Robin Dunn
c15cc56f2d Make the 'this' attribute a real attribute of the Facade, not a
viritual one.  This is needed because of some SWIG optimizations that
will skip using getattr to find the 'this'.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 20:19:25 +00:00
Robin Dunn
b0429a4019 Publisher is now able to parse a dotted notation string
into a topic tuple.  For example: subscribing to "timer.clock.seconds"
is the same as subscribing to ("timer", "clock", "seconds").


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 20:17:20 +00:00
Václav Slavík
8902898054 fixed win32 code to not use MB_ERR_INVALID_CHARS on win version where it isn't available; roundtrip check is used instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 17:36:36 +00:00
Julian Smart
818f394678 Added wxGenericFileDialog to WinCE project to give alternative to
restrictive native dialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 10:46:37 +00:00
Julian Smart
619111b9aa Fixed wxGenericFileDialog to work with WinCE, so it can be used to
replace native dialog that doesn't allow access to all folders.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 10:44:48 +00:00
Kevin Ollivier
d83959ef7c Fixed accidental removal of eVC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 04:45:43 +00:00
Kevin Ollivier
603ef9cac8 Enabling DigitalMars and eVC project formats.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 04:07:57 +00:00
Kevin Ollivier
918978c710 Needed so we can install TaskRunner to Python's site-packages dir and use it from everywhere. :)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 03:19:45 +00:00
Mart Raudsepp
a5bb4f8293 Remove semicolon after if statmce that can potentially cause harm later. Patch #1443820 from Paul Cornett
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-06 02:17:49 +00:00
Włodzimierz Skiba
51bc4da1e9 Minimal (nearly empty) wxDisplay for wxMGL (to compensate src/common/tplvcmn.cpp wxDisplay usage).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 23:42:03 +00:00
Vadim Zeitlin
2934338f05 use WXSIZEOF() instead of hardcoded number
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 20:52:34 +00:00
Vadim Zeitlin
0e5edcda8a don't Printf() a string into itself (bug indicated by patch 1443669)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 20:50:25 +00:00
Vadim Zeitlin
2353544718 fix to last custom draw fix: only leave space for the image in the first column
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 13:30:11 +00:00
Vadim Zeitlin
8a5434c1a5 corrected typo in PRC Envelope paper definition (used m instead of mm)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 12:40:46 +00:00
Vadim Zeitlin
0e31545d0c update from Ch. Buck
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 12:30:25 +00:00
Vadim Zeitlin
25e6a4a698 another custom draw fix: leave space for the image even if the current item doesn't have any but the list control has an image list (because this is what the standard drawing procedure does)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 12:12:11 +00:00
Vadim Zeitlin
13845bd57c don't trust CDIS_FOCUS flag vale in custom drawing code, it is no more correct than CDIS_SELECTED so we have to get it from the control itself directly too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 11:26:13 +00:00
Robin Dunn
5ce8a6113a GetEditControl is not wxMSW specific any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 04:01:10 +00:00
Robin Dunn
b4b426fe86 Dont' return references to wxDateTime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 04:00:35 +00:00
Robin Dunn
971e47976f Comment out wxHVScrolledWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 04:00:08 +00:00
Robin Dunn
df5f8f4e3d Add GetHandlers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 03:59:45 +00:00
Robin Dunn
7d50c11074 Add copy constructor, DateTimeFromDateTime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 03:59:06 +00:00
Vadim Zeitlin
9d0b3fc5b7 removed main() definition from wxX11
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 00:52:56 +00:00
Włodzimierz Skiba
eb4f312b05 Follow coommon changes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 00:44:04 +00:00
Włodzimierz Skiba
40319aa0ce Build fix: help OW 1.4 to apply template.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-05 00:38:59 +00:00
Vadim Zeitlin
94245f6df0 handle size==-1 or absence of size parameter in font tag as expected, i.e. by ignoring it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 22:40:16 +00:00
Vadim Zeitlin
f0756835d5 don't send mouse events to disabled windows (this really shouldn't be possible as otherwise it allows the user to modify the state of a disabled control)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 22:09:40 +00:00
Vadim Zeitlin
f124c9086b no real changes; just streamlined ifdef around compositing check and removed redundant and never executing code to relay mouse enter/leave events to tooltips
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 21:28:39 +00:00
Vadim Zeitlin
9a6a4f6d57 deselect the current selection when the user clicks outside of any item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 20:42:54 +00:00
Włodzimierz Skiba
5b7df27e4c More informative comment about previous commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 20:34:12 +00:00
Vadim Zeitlin
c1318d3fa2 don't use grey background for the control, it makes selection almost completely invisible in the default Mac colour scheme
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 20:26:14 +00:00
Vadim Zeitlin
75ae9acfa8 fixed crash due to double deletion of wxListTextCtrlWrapper intorduced in a recent change (wrong use of PopEventHandler instead of RemoveEventHandler)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 20:24:48 +00:00
Vadim Zeitlin
ebadbb76d3 centre icon and text vertically in the report view (previously the text wasn't aligned with the icon if their heights was different)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 19:52:10 +00:00
Vadim Zeitlin
d54a3e735e recognize wxBORDER_XXX as well as wxXXX_BORDER styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 18:55:38 +00:00
Julian Smart
f350d4b2ee If context menu not handled, treat as left click instead.
If handled, don't send a left click event.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 18:18:28 +00:00
Vadim Zeitlin
a02debb4c6 mention wxEventUpdateUI::Show() change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 16:12:07 +00:00
Václav Slavík
1e22bc9233 added comments clarifying the code a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 11:12:02 +00:00
Kevin Ollivier
e8e59fe61c Adding silent option for automatic builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 03:41:22 +00:00
Kevin Ollivier
ad17c279f3 Committing Mac tarball script.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-04 03:36:28 +00:00
Vadim Zeitlin
48733d4741 move the code freeing temporary argv array to wxEntry(HINSTANCE) overload to avoid doing it twice in some cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-03 23:06:54 +00:00
Włodzimierz Skiba
5ff845876f Stop invalidating size on wxTLW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-03 15:26:14 +00:00
Kevin Ollivier
8fc3a8c911 Adding Unix build script.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-03 06:17:04 +00:00
Kevin Ollivier
d9114aa6e9 Don't fetch makefiles, we'll add their creation to the pre-flight process later.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-03 02:28:53 +00:00
Kevin Ollivier
77b14ee244 Fixed a typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-03 02:00:39 +00:00
Kevin Ollivier
ec43e6824c Remove the reference to ReleaseForge now, as we don't yet use it.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-03 01:47:40 +00:00
Kevin Ollivier
03a2668fed As discussed with Julian, the new release system will use a new directory so that we are more free to make changes, and also so we can re-organize files and remove old files. This is still a work in progress!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 20:23:54 +00:00
Stefan Csomor
5eef2b35e3 fix unresolved symbol under 10.3.9
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 20:02:44 +00:00
Mart Raudsepp
304b9d52cf Docs: Escape underscores
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 13:59:27 +00:00
Julian Smart
6b775e666c On WinCE, generic font dialog didn't work because the point size wxChoice
menu went off the display. Now a wxSpinCtrl is used. Also fixed the preview
window in PDA mode (was invisible).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 12:57:30 +00:00
Julian Smart
07225d48b6 Application clipping region can be set to null without affecting
paint clipping region. This fixes severe refresh problems on WinCE
when clipping regions are used, and is experimental on desktop wxMSW
but so far works fine.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 12:54:47 +00:00
Julian Smart
3919d5306a Worked around a crash in wxHTML on WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 12:51:22 +00:00
Julian Smart
dd28209328 Use temp directory and don't prepend two backslashes, on WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 12:46:06 +00:00
Robert Roebling
3f3af7e7f8 Change wxVariant GetValue() to GetValue( wxVariant & ).
More cool sorting code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 10:46:01 +00:00
Robert Roebling
04e044c4d6 Use GTK+ function to obtain GdkWindow for wxListBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-02 09:55:07 +00:00
Robert Roebling
fe39b16a97 Apply patch which makes it possible to resize a
control in a toolbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-01 22:43:57 +00:00
Robert Roebling
dcd3c79cfa Corrected scrolling when using cursor keys.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-01 22:17:16 +00:00
Robert Roebling
65616292d0 Added GtkTreeView item helper class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-01 21:59:55 +00:00
Robert Roebling
4a46cbe8c6 Applied Ryan's native wxListBox and wxCheckListBox patch
in slightly modified form..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-01 21:51:42 +00:00
Robert Roebling
4eccd3a10f Further sorting work using the sorting data model.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-03-01 10:49:06 +00:00
Robert Roebling
abd6692ca8 Added stubs for variaous tests.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 22:27:09 +00:00
Robert Roebling
241cb04bd8 Don't delete model in views destructor as several
views can have the same model and memory doesn't
    like getting freed several times.
  Sorting actually works. Not yet editing the sorted
    data.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 21:41:13 +00:00
Robert Roebling
8f850e2831 Moved code around preparing the sorted model.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 15:04:25 +00:00
Julian Smart
53754b9293 Documented WinCE context menu change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 14:28:41 +00:00
Julian Smart
92f07cf89e Proposed syntax for telling WinCE whether a context menu is available
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 14:18:45 +00:00
Julian Smart
7d4f65e393 Added context menu support under PocketPC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 13:37:23 +00:00
Julian Smart
42b16af462 WinCE can't copy with title in menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 13:26:55 +00:00
Robert Roebling
8981608c69 Added wxDataViewSortedListModel, which doesn't work
yet, but you get the idea..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 10:47:28 +00:00
Kevin Hock
30bbf68d3a Make SetLocal actually work instead of crashing immediately; due to required longevity of the item to make it from SetLocal to Connect, we need to use a specifc address type.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 02:04:29 +00:00
Kevin Hock
fb3234e549 Make MacSetMetalAppearance private so that the extra style flags can't get out of sync with the OS X-level metal flags by calling MacSetMetalAppearance directly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-28 01:33:54 +00:00
Robert Roebling
f0bc6afbbd First release mouse, then emit event.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 21:49:48 +00:00
Kevin Ollivier
913fffd75a Adding missing wxall and wxmsw targets.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 19:30:06 +00:00
Kevin Ollivier
582241e4a4 Typo. Who puts vowels in 'makedirs'? ;-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 18:26:10 +00:00
Vadim Zeitlin
e2fb71bc85 fix for wxPathList::FindValidPath() for wxUSE_STL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 15:14:27 +00:00
Robert Roebling
3c05fe1dbc Removed superfluous code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 14:20:44 +00:00
Robert Roebling
5d605a6995 MVC works now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 14:18:24 +00:00
Robert Roebling
b5d777c78e Added generic MVC hookup code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 13:09:41 +00:00
Robert Roebling
7ea3a0de1e Most things about wxDataViewDateCell work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 09:34:50 +00:00
Robert Roebling
33c0d0ed75 Make wxTransientPopupWindow ignore button down events
which have been sent before or at the same time as
    the control creation time so that these evens don't
    make the control disappear again.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 09:16:28 +00:00
Kevin Ollivier
c8470018b8 Sorry, zapping rogue print statement. ;-/
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 05:52:56 +00:00
Kevin Ollivier
d3c518f985 Bumping the arg numbers since we now don't have a CFGFILE as first argument.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 05:06:06 +00:00
Kevin Ollivier
f1a9f3318b Adding code to load Config objects from a file, and move to modifying environment variables rather than sourcing the config file (so that every script is not required to do this).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-27 03:25:48 +00:00
Robert Roebling
a78d8dd08a Move wxDataViewCtrl to Adv (hope this has worked..).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 19:26:19 +00:00
Stefan Neis
9e87870780 Added handling of dashes (patch #1438894).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 16:53:11 +00:00
Robert Roebling
4d496ecbc4 Some restructuring, beginning of wxDataViewDateCell.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 15:48:42 +00:00
Włodzimierz Skiba
c644b82e76 Missing wxPen (dashes) members.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 10:45:38 +00:00
Włodzimierz Skiba
1914bb8e12 WinCE friendly wxCheckListBox sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 02:04:58 +00:00
Włodzimierz Skiba
c5491b21d9 Correct wxCheckListBox insertion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 02:00:46 +00:00
Robert Roebling
553f7d8f56 Makes custom cell activatable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-26 01:51:28 +00:00
Włodzimierz Skiba
1272e71b8a Revitalise SIP support in all toplevel wince windows.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 23:11:26 +00:00
Włodzimierz Skiba
555b2ce915 Make wxWinCE buildable (workaround eVC++ limitations).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 21:15:50 +00:00
Mart Raudsepp
fc2e1beec2 Revert the strict aliasing "fix". As per Michael Wetherell it isn't correct as we aren't able to make a runtime
guarantee for the cast to be correct


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 14:51:59 +00:00
Robert Roebling
1a36756471 Add scrollbars, fix crash, leak less memory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 14:07:06 +00:00
Robert Roebling
ad63bf413b Added wxDataViewProgressCell with native code
for GTK 2.6 and fallbacks otherwise.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 13:13:05 +00:00
Robert Roebling
8045736e4d Add compilation guards.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 12:07:19 +00:00
Jamie Gadd
b7e5ba8f2d Fixes for WinCE build caused by my last commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 03:36:45 +00:00
Vadim Zeitlin
fb7e87effa cleaned up and disabled by default the toolbar buttons colour remapping code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 03:28:19 +00:00
Vadim Zeitlin
5cce8340b2 DT_WORD_ELLIPSIS is not defined under CE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-25 00:22:20 +00:00
Vadim Zeitlin
b7e1957a67 we need to pass szLocale allocated by strdup() and not retloc itself to setlocale()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 23:40:18 +00:00
Vadim Zeitlin
70ad0e06f0 need to include wx/treectrl.h to use CLASSINFO(wxTextCtrl)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 23:40:01 +00:00
Robin Dunn
4f160924b3 Use correct attribution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 19:53:56 +00:00
Robert Roebling
e152afc3d4 Added wxDataViewCustomCell.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 18:19:55 +00:00
Robin Dunn
b30b49e993 Workaround the lack of a wx.EVT_FIND_CLOSE on Windows when doing a
normal search.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 18:14:24 +00:00
Mart Raudsepp
4fcf6b4849 Test commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 16:55:03 +00:00
Mart Raudsepp
1ac9fdc52e Test commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 16:41:14 +00:00
Mart Raudsepp
7f7beb1d3a Fix gtk callback return types and more in window.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 16:37:06 +00:00
Julian Smart
f7273ce09a Fixed interpretation of selection and added selection/check notification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 16:00:42 +00:00
Vadim Zeitlin
26e8da413c implemented EditLabel() with custom text controls and GetEditControl()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 15:32:29 +00:00
Jamie Gadd
3c96418b71 Make wx{List,Tree}Ctrl resize their standard font if the user changes the system font.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 14:19:12 +00:00
Robert Roebling
605c2c4ac6 added wxDataViewToggleCell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 13:19:23 +00:00
Robert Roebling
f081c944e8 Implemented user dashes for PS print.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 11:53:52 +00:00
Robert Roebling
8c419a5c4d Implemented user dashes for gnome print.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 11:41:20 +00:00
Robert Roebling
74ab0bfbb7 New implementation for printing circles and epllipses.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 09:36:35 +00:00
Robin Dunn
e773f79b19 Allow clearing the history, and saving the history on demand
Let the session tab show all of the history
Fix case-sensitive searches to actually allow case-insensitive
Make wx.WXK_NUMPAD_ENTER equivalent to wx.WXK_RETURN


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:21:26 +00:00
Robin Dunn
4251af7e75 Merge some 2.6-branch changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:15:50 +00:00
Robin Dunn
28ff70c21f Minor demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:13:55 +00:00
Robin Dunn
23ed80cb4d Add LastWrite
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:13:18 +00:00
Robin Dunn
c86fa5a1fa Add CalcRowsCols
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:12:40 +00:00
Robin Dunn
9c38390133 Docstring fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:11:56 +00:00
Robin Dunn
df75c66c35 Give attribution to Jorgen Bodde
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:08:06 +00:00
Robin Dunn
bea992c873 Docstring fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:05:19 +00:00
Robin Dunn
760b2b99f3 Use wxSystemSetitngs for the rule color
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:04:21 +00:00
Robin Dunn
1d84f787f4 Use UNICODE=0 for ansi builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-24 01:03:18 +00:00
Jamie Gadd
1d6e57680c Fix bug where labels were multicoloured if their length > box width using XP with a non-default colour.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 13:50:39 +00:00
Robert Roebling
a7f61f762d wxDataViewCtrl now with editable text and multiple
views for the same data model (in the sample).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 13:34:15 +00:00
Mart Raudsepp
a237731e1c Test the commit announcement bot some more by fixing more gtk signal callback handler signatures. Are any correct?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 11:09:28 +00:00
Mart Raudsepp
5d4c083326 Use correct return type for some of the signal callbacks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 10:57:17 +00:00
Kevin Ollivier
f814ff336e Finishing up Monolithic build support, and proper generation of more wx library names under multilib builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 06:59:40 +00:00
Robert Roebling
6090c7d328 Return variant type of a cell.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 03:09:27 +00:00
Robert Roebling
7b4fde8255 Route data from wxDataViewModel in a wxVariant
through wxDataViewCell::SetValue() to the
   GtkCellRendererText.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 03:04:15 +00:00
Robert Roebling
0313c114f5 Update sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 02:11:57 +00:00
Robert Roebling
6842a71a5b added wxDataViewCell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-23 02:04:46 +00:00
Robert Roebling
8ab9a53699 Support requesting more idle events.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 23:37:46 +00:00
Robert Roebling
38f69be155 Emit wxSetCursorEvent before mouse move and
mouse enter.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 23:36:32 +00:00
Robert Roebling
9b0d12e94f Correcteded wxComboBox::Clear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 22:37:15 +00:00
Mart Raudsepp
5b008dd712 undef GTK_DISABLE_DEPRECATED for any gtk+ version, as it turns out we use GtkList in here too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 17:15:20 +00:00
Václav Slavík
2e6a9dad08 skip the paint event instead of calling wxControl version when not doing any custom drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 12:33:02 +00:00
Kevin Hock
b74865fa61 Rearrange and simplify read and error checks, and remove use of MSG_PEEK that is unneeded and not supported on CE anyway [ Modified & Expanded Patch 1428745 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 01:55:43 +00:00
Robert Roebling
fa28826dd3 Added wxDataViewColumn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-22 00:19:04 +00:00
Mart Raudsepp
7ef2db2570 Revert inclusion of wx/dateevt.h for now, as it breaks linkage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 22:14:31 +00:00
Robert Roebling
6e2e590f2a Add notifier class.
Only use listmodel for now, treemodel later.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 20:52:05 +00:00
Robert Roebling
111f83c49e wxDataViewCtrl actually runs now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 20:25:47 +00:00
Robert Roebling
260b9be703 More compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 19:55:58 +00:00
Włodzimierz Skiba
0f30d8e39e Fixed using list of wildcards in filter of wxDocTemplate.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 19:53:31 +00:00
Robert Roebling
1557c77b9f Compiles now..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 18:44:13 +00:00
Robert Roebling
64ffb88849 Compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 18:12:44 +00:00
Robert Roebling
bc3448951d Added wxDataViewtrl files to bakefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 17:57:26 +00:00
Robert Roebling
239eaa4154 wxDataViewCtrl WIP.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 17:35:19 +00:00
Robert Roebling
362d7fb988 Updated wxDataViewCtrl sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 17:31:36 +00:00
Roman Rolinsky
0159bfd008 corrected positioning of internal panels, as the default value -1
was used as a real coordinate causing extra pixels in the right margin


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-21 14:23:48 +00:00
Mart Raudsepp
6ebf3215ff wxGTK2: Declare GTK_DISABLE_DEPRECATED in defs.h. I will be monitoring the tinderbox, and think on how to rearrange
the declarations and inclusions related to this.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 21:34:42 +00:00
Mart Raudsepp
1efb5db896 Make everything compile with GTK_DISABLE_DEPRECATED declared.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 21:28:53 +00:00
Robert Roebling
cc7e9e2083 Added test for wxComboBox::SetString
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 17:12:07 +00:00
Robert Roebling
590f50d6cc Make use of GTK 2.4 GtkComboBox if it is available,
fall back to old GtkCombo one if not (run-time check).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 17:10:49 +00:00
Jouk Jansen
088af5898e Committing in .
Update of OpenVMS compile support

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/gtk/descrip.mms wxWidgets/src/unix/descrip.mms
 	wxWidgets/src/unix/displayx11.cpp
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 13:47:08 +00:00
Robert Roebling
1fb33bdb46 Rename gtk_ callbacls to gtkcombo_ callbacks
to make room for gtkcombobox_


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 11:35:31 +00:00
Julian Smart
e934052eb0 Include dateevt.h from datectrl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-20 09:14:45 +00:00
Vadim Zeitlin
2d0bea2c37 fix MT-unsafe accesses to wxConditionInternal::m_numWaiters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-19 14:38:20 +00:00
Mart Raudsepp
b0c43acc87 wxGTK2: gtk_signal_disconnect_by_func isn't used anywhere anymore. Nuke prototype from gtk/private.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 23:44:40 +00:00
Robin Dunn
49102d7bd0 Added the wx.HVScrolledWindow class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 21:43:28 +00:00
Robin Dunn
1ad0de842d Treat Ctrl-Shift-Backspace the same as ESC in the shell.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 21:41:10 +00:00
Robin Dunn
c32253089b Prevent using a bad tree item.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 21:40:57 +00:00
Robin Dunn
4424b2a116 Added the wx.HVScrolledWindow class.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 21:37:24 +00:00
Vadim Zeitlin
f3a69d1df1 gcc initializer order fix warning (patch 1432835)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 18:16:57 +00:00
Mart Raudsepp
0c83d5ef4b wx_gtk_vmsjackets.c seems to not be used by anything these days. Delete on both wxGTK ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-18 13:49:53 +00:00
Vadim Zeitlin
bcc1153a9e compilation fix for old SDK headers (such as shipped with VC6)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-17 21:25:05 +00:00
Roman Rolinsky
6165053b84 Fixed Cut command, added support for MenuBar inside Frame/Dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 17:19:39 +00:00
Vadim Zeitlin
eb3efe0d4b compilation fix after removing wxImage(wxImage *) ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 14:12:02 +00:00
Robert Roebling
5985c07ce0 Allow tabbing in wxRadioBox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 11:26:03 +00:00
Robert Roebling
4c20ee63f0 Use g_signal_connect_after for GTK+ native controls
and wxTopLevelWindow focus events and the normal
    _connect for custom controls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 09:00:45 +00:00
Julian Smart
f01bca89fd Applied patch [ 1431955 ] Fixes wxSocket* _Wait/Select
From Angel Vidal Veiga


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 08:53:35 +00:00
David Surovell
3025abca05 cleanup - reformatting (pt 2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 06:16:56 +00:00
Robin Dunn
06336f51bb Added GetToolsCount
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 03:07:20 +00:00
Robin Dunn
a3e9caa2b5 Fix for Bug #1432054: ToolBar controls not removed by ClearTools
Use DeleteTool in ClearTools instead of just destroying the internal
list, so the toolbar is kept fully in sync with the removal of all
tool types.  Also fix wxMSW version to actually Destroy() the controls
when they are deleted from the toolbar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 03:03:43 +00:00
David Surovell
3b6a117962 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-16 01:03:29 +00:00
Michael Wetherell
b26ed94e4f The cyrillic characters used in the CaseChanges() test have different values
on different platforms depending on the cyrillic character set used. So try
generating these from the Unicode instead of using fixed values.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 21:16:45 +00:00
Michael Wetherell
0c09451870 Warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 21:16:10 +00:00
Mart Raudsepp
f1e57cb96f Revert. Crashes single-line wxTextCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 20:14:12 +00:00
Mart Raudsepp
4adf7c2be5 Connect focus_out_event handler before the default handler, as to suppress queue_draw when appropriate, that the
default one does.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 20:09:10 +00:00
David Surovell
cc374a2f29 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 19:59:27 +00:00
David Surovell
1089fc00cd cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 16:31:05 +00:00
Mart Raudsepp
f7108f16cc Use correct type for storing return value. gboolean instead of bool.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 15:49:09 +00:00
Vadim Zeitlin
ed5bc8f1bf return non-numpad key codes from wxCharCodeMSWToWX() if it is called with lParam==0 (this happens only when it's not called from WM_KEYDOWN/UP/CHAR handler and so we don't have information about which key was really pressed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 15:04:04 +00:00
Vadim Zeitlin
b1ac62dda7 fixed USE_QA_DEFAULT usage (bug 1431952)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 14:57:41 +00:00
Mart Raudsepp
aaf53059fe Wrap the warning suppress of SetSize around #ifndef WX_WARN_ILLEGAL_SETSIZE.
configure with CFLAGS="-DWX_WARN_ILLEGAL_SETSIZE" when wanting to deal with the problem and therefore see the
warnings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 14:26:53 +00:00
Mart Raudsepp
f3a5f83a66 The return types for enter/leave-notify-event and focus-in/out-event handlers are gboolean, not gint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 14:01:20 +00:00
Robert Roebling
0050e023dc The focus handling change in wxTopLevelWindows broke
a few things.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 13:26:28 +00:00
Michael Wetherell
1d805c1468 Fix for 64-bit systems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 12:59:37 +00:00
Michael Wetherell
fec7aeabc1 Check encoding names case insensitively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 12:58:50 +00:00
Robert Roebling
628bad7560 Alter focus handling to disable GTK+ standard
behaviour for custom controls (non native
    controls) so that window is not invalidated
    after focus in and out. Leave native control
    alone.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 12:10:47 +00:00
Robert Roebling
d77836e48c Applied wxVScrolledWindow patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 09:59:39 +00:00
Jouk Jansen
93d3dbd4b3 Committing in .
first version of wxGTK2 for OpenVMS. At present for debugging only.

 Modified Files:
 	wxWidgets/descrip.mms wxWidgets/setup.h_vms
 	wxWidgets/contrib/src/deprecated/descrip.mms
 	wxWidgets/samples/minimal/descrip.mms
 	wxWidgets/src/common/descrip.mms
 	wxWidgets/src/generic/descrip.mms
 	wxWidgets/src/gtk/descrip.mms wxWidgets/src/html/descrip.mms
 	wxWidgets/src/unix/descrip.mms wxWidgets/src/xml/descrip.mms
 	wxWidgets/src/xrc/descrip.mms
 Added Files:
 	wxWidgets/lib/VMS_GTK2.OPT
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 09:33:40 +00:00
Robert Roebling
cbab6fe5ff Reenable wxFULL_REPAINT_ON_RESIZE line.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-15 09:02:58 +00:00
Roman Rolinsky
57c48fc465 OnReplace not yet undoable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 23:06:34 +00:00
Robin Dunn
1225122523 make the stay-on-top mode controlled by a command-line parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 22:15:24 +00:00
Robin Dunn
b1fcee843e reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 22:13:50 +00:00
Robin Dunn
e17b4db3f8 Applied patch #1431193: work around for recent fileuri change in mediactrl + fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 22:04:49 +00:00
Roman Rolinsky
126080e46c update of Paste command, new revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 21:08:02 +00:00
Roman Rolinsky
1893848ef7 fix for memory leak in paste
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 20:58:11 +00:00
Robert Roebling
67cbdfc150 More experimenting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 13:54:51 +00:00
Mart Raudsepp
9a71e770e1 Cast to void* before casting to Node** to make the compiler do no strict-aliasing assumptions, and suppress a warning
if -fstrict-aliasing (enabled with -O2, -O3 and -Os unless forced off as is planned for the time being) is used.
See http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/70262 for details.
Also return NULL instead of 0 in the same GetNodePtr, as the return type is a pointer, not integer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 09:21:37 +00:00
David Surovell
f2b8291a28 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 06:54:06 +00:00
David Surovell
0ce0b76b50 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 04:41:07 +00:00
Kevin Hock
8dc6614e60 Fix wxComboBox constructors after keyboard access commit, not all constructors were setting the parent container pointer. Added Init method and put all the constructors together in the header (rather than being split between h and cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 04:00:39 +00:00
Vadim Zeitlin
e6b1317b79 modified custom draw code to fully draw the items using a font with encoding different from the system one as the native list control ignores the font encoding; seems to finally work somehow but there is still horrible flicker as the items seem to be redrawn on every mouse move over them, no idea how to avoid this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-14 03:49:20 +00:00
Michael Wetherell
4077791b7f Fix for reversed masks on displays with 8-bit depth, reported in patch 1219989.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 22:12:33 +00:00
David Surovell
51c4d2a5a0 cleanup - refomatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 21:44:48 +00:00
Vadim Zeitlin
8f14114792 declare lists as exported, seems to be necessary in VC5 DLL builds and shouldn't hurt elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 21:20:26 +00:00
Robin Dunn
ec646e6384 New APIs, Events, etc. for MediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:20:46 +00:00
Robin Dunn
a067618812 a little tweak to the debug code (commented out)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:20:24 +00:00
Robin Dunn
ddba849c38 don't hide the log messages, and be sure to stop the timer when done
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:19:39 +00:00
Robin Dunn
aa5644aee0 Show some GradientFill usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:18:29 +00:00
Robin Dunn
14b37d975b change doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:17:28 +00:00
Robin Dunn
1f168cbd49 New APIs, Events, etc. for MediaCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:15:16 +00:00
Robin Dunn
3edb17decf new GetShown, Show, and etc. for wx.UpdateUIEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:13:38 +00:00
Robin Dunn
b702ab768f a little reorg and cleanup from the last two revisions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 19:12:31 +00:00
Robert Roebling
790b137ee9 Starting wxDataView..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 16:34:56 +00:00
Vadim Zeitlin
2884838a3c fixed transparency handling broken by the last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 15:30:28 +00:00
Vadim Zeitlin
4e43c81518 minor docs corrections and improvements from Andreas Mohr (patch 1430551)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 15:18:35 +00:00
Vadim Zeitlin
fccb65a23c fixed SetAddress() for self-assignment (patch 1430703)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 15:16:37 +00:00
Vadim Zeitlin
a64bba4eb5 use C cast instead of reinterpret_cast which doesn't work for casting pointers to functions to pointers to objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 14:58:21 +00:00
David Surovell
7af14d7187 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 09:10:34 +00:00
David Surovell
cc224d6e79 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 08:03:37 +00:00
Vadim Zeitlin
e493ecef80 fixed several crashes in XPM parsing code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 03:04:40 +00:00
Jamie Gadd
36eadb4ff3 Rearrange build order so it successfully builds dll versions.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 02:39:03 +00:00
Vadim Zeitlin
7447bdd7b7 fix client to screen (and vice versa) conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 00:49:24 +00:00
Vadim Zeitlin
38b2e0de18 blind compilation fix for 64 bit systems after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 00:26:33 +00:00
Kevin Ollivier
e069db2d65 Easy fix for automated uploads (I thought I tried this and it failed, but fortunately I was wrong there) and leave a note about rebaking until it's implemented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-13 00:19:05 +00:00
Vadim Zeitlin
8235976431 fixed wxFontMapper behaviour under wxGTK2: it now just maps all encodings to UTF-8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 23:39:55 +00:00
David Surovell
0ec80ebe6f cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 23:37:07 +00:00
Vadim Zeitlin
6b71411ac9 get (temporarily) rid of GTK+ debugging messages about negative width and size as this makes programs built with wxGTK2 unusable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 23:21:55 +00:00
David Surovell
3e822cd8d0 clean - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 23:17:35 +00:00
Włodzimierz Skiba
b1a1a83c92 wxPalmOS build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 18:47:53 +00:00
Włodzimierz Skiba
0e2d298670 !WX_PRECOMP (wxPalm) build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 17:51:44 +00:00
Vadim Zeitlin
a3a4105df6 it is not possible to show/hide the window from the UpdateUI event handler; refactored the code by moving control-specific parts into the derived classes (patch 1338350)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 16:32:50 +00:00
Vadim Zeitlin
27237c3708 don't use #error as some compilers ignore it; provoke a real compile error instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:55:19 +00:00
Vadim Zeitlin
0a9ed8f14e trick the sizer code into thinking that the wizard pages are shown so that it takes them into account for the layout, even if they're not really shown
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:48:49 +00:00
Vadim Zeitlin
88517d9008 no changes; just added some comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:37:45 +00:00
Włodzimierz Skiba
b9a958e66f wxWinCE warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:16:52 +00:00
Vadim Zeitlin
e35d07b9d0 compilation fix for VC8 (see patch 1429985)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:08:37 +00:00
Włodzimierz Skiba
bc8793f4d2 wxUSE_UXTHEME=0 (WinCE) build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:06:54 +00:00
Vadim Zeitlin
f74fd79b8e removed extra semicolons added by previous patch (patch 1429906)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 13:01:07 +00:00
Vadim Zeitlin
9002a61c32 fixed memory leak in the sample and simplified wxCheckListBox creation code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:54:19 +00:00
Vadim Zeitlin
3ff260ae2c typo in comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:40:18 +00:00
Michael Wetherell
8d7eaf9140 Warning fixes for VC5 (Igor Korot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:16:56 +00:00
Michael Wetherell
51d0522672 Some compilers don't define SIZE_T (e.g. dmc) so use size_t instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 11:00:45 +00:00
Julian Smart
2baea9e267 Script tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 10:28:33 +00:00
Stefan Csomor
7e81aa035c intel fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 09:00:44 +00:00
Jamie Gadd
5483756fdc Replace deprecated wxNB_* flags with wxBK_* used in last commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 08:43:01 +00:00
Robin Dunn
a2c53287f8 Forward decalre wxPyFindSwigType
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 08:17:29 +00:00
Robin Dunn
ddbb966daa Added the wx.DC.GradientFillConcentric and wx.DC.GradientFillLinear
methods.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 08:16:10 +00:00
Kevin Hock
29c731cae9 Add missing include for non-PCH builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 03:43:53 +00:00
Kevin Hock
36287f1a97 Add missing include for non-PCH builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 03:11:37 +00:00
Vadim Zeitlin
f154b9fa94 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 02:21:13 +00:00
Vadim Zeitlin
213ad8e72c added linear and concentric gradient fill functions (modified/fixed patch from Ryan Norton)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 01:57:31 +00:00
Michael Wetherell
d6bf7254f4 Add -fno-strict-aliasing to the optimisation flags for gcc as discussed on wx-dev
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 01:55:41 +00:00
Kevin Hock
24f4fc23ac Note wxSOCKET_REUSEADDR and SetLocal/Connection changes [ Result of extended patch 1415505 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 00:46:14 +00:00
Kevin Hock
2ccd904b01 Document new SetLocal method, new capabilities for wxSOCKET_REUSEADDR, and new overloaded Connect method [ Documentation changes for extended patch 1415505 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 00:44:54 +00:00
Kevin Hock
716a5baa6e Respect the REUSEADDR flag to allow rebinding; bind to local port prior to connecting if a local port is specified [ Extension of patch 1415505 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 23:44:26 +00:00
Kevin Hock
c232b3cdc6 Respect the REUSEADDR flag to allow rebinding; bind to local port prior to connecting if a local port is specified; add SO_REUSEPORT wherever SO_REUSEADDR is used if SO_REUSEPORT is defined, otherwise reuse fails on BSD systems (e.g. Mac OS X) [ Extension of patch 1415505 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 23:43:17 +00:00
Kevin Hock
33d925b0d9 Add SetLocal method; overload Connect to accept a local address and move common Connect code into DoConnect; DoConnect handles wxSOCKET_REUSEADDR flag and setting local address [ Heavily modified and expanded patch 1415505 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 23:39:25 +00:00
Robin Dunn
080b9cbc7f Rearrainge things so the SWIG_VERSION values doesn't need to be
written to the C++ wrapper file.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 19:46:49 +00:00
Robin Dunn
12e7f72a35 Docstring update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 19:45:38 +00:00
Robin Dunn
7c30eb5a42 No longer need the SWIG_VERSION to be output to the C++ file, so
remove that change from the patch.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 19:45:17 +00:00
Kevin Ollivier
b41b09e285 Documenting WX_MONOLITHIC build option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 18:41:11 +00:00
Vadim Zeitlin
a4d2944e64 added assignment operators from int for disambiguation of expressions such as ll=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 17:30:26 +00:00
Vadim Zeitlin
bb60e16c8f removed stray #endif added in previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 17:17:08 +00:00
Vadim Zeitlin
33f81fc7d0 use wxClockMillis_t to fix wxUSE_LONGLONG=0 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:56:40 +00:00
Vadim Zeitlin
216a72f3b9 added support for 64 bit ints in wx stream classes (patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:51:34 +00:00
Vadim Zeitlin
87152bb53d wxUSE_DATETIME==0 compilation fix (part of patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:40:10 +00:00
Vadim Zeitlin
608f8a111b provide wxGetLocalTimeMillis() (returning double) even if wxUSE_LONGLONG==0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:38:28 +00:00
Vadim Zeitlin
7ba7c4e62f use wxDiskspaceSize_t which is long and not wxLongLong if wxUSE_LONGLONG==0 (part of patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:21:14 +00:00
Vadim Zeitlin
34af0de434 compilation fixes for wxUSE_DATETIME==0 (another part of patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 16:20:28 +00:00
Vadim Zeitlin
5ac31f6f8d wxODBC depends on wxDateTime (part of patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 15:44:21 +00:00
Vadim Zeitlin
5d36ad180e wxArchive depends on wxDateTime (part of patch 1203970)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 15:42:01 +00:00
Julian Smart
7cc1ad299f Applied patch [ 1412216 ] non-themed fallback support for other wxNotebook orientation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 15:41:40 +00:00
Julian Smart
4496eadc93 Applied [ 1394785 ] wxListCtrl::EndEditLabel implementation
By troelsk


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 15:16:35 +00:00
Julian Smart
d5ea3919a3 Applied patch [ 1417709 ] wxFSVolume produces error messagebox
(following Vadim's suggestion to do this globally)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 14:57:25 +00:00
Julian Smart
0a0e6932cd Applied part 2 of [ 1415183 ] a couple of wxAutomation object/ole fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 14:51:16 +00:00
Julian Smart
2ae226ddc3 Applied patch [ 1424247 ] Have wxGenericListCtrl not size a window with a negative val
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 14:39:23 +00:00
Julian Smart
095e0f9148 Doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 12:05:53 +00:00
Mart Raudsepp
27ef4b9b29 I like if things compile with --enable-unicode + --enable-mediactrl. Code shamelessly stolen from src/gtk/app.cpp.
gst backend of wxMediaCtrl doesn't seem to be able to load files (at least in unicode) though...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 11:47:12 +00:00
Mart Raudsepp
939197fe47 Do not reintroduce #pragma interface/implementation for html/helpdlg and mediactrl. These pragmas are an abomination
from hell.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 04:53:56 +00:00
Mart Raudsepp
9ef33d86f6 * wxFrameLayout should compile in unicode builds for ports other than wxMSW or wxGTK too - fix missing _().
* wxMac has Reparent, so use it in wxFL instead of the, now unicode-compilable, warning messagebox.
* Code cleanup.
- Probably some more ports have Reparent too, so could add into the CPP check. And it might be a good idea to do for
the non-supported ports what wxGTK1 does (just return, not spew a messagebox). If Reparent already does nothing for
unsupported ports, then could get rid of the CPP logic completely.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 02:03:25 +00:00
David Surovell
e28985499b fixed wx_media linkage/export problems - from RN patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 00:30:20 +00:00
Vadim Zeitlin
24f904f41f note that SetAutoLayout() doesn't work for all windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 00:19:34 +00:00
Vadim Zeitlin
b0d969e854 clarified wxUSE_STD_IOSTREAM and wxUSE_STREAMS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-11 00:12:06 +00:00
David Surovell
4ac483ebb2 fixed compilation problem in pror commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 23:57:36 +00:00
Jamie Gadd
deb0d191ca Toplevel windows don't have sibling static boxes. Fixes crash in AdjustStaticBoxZOrder.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 21:44:54 +00:00
David Surovell
9419b0d649 cleanup - reformatting (reapplied after RN-VZ mega-update)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 21:38:24 +00:00
Vadim Zeitlin
ad6f7122f6 support monolithic build using wxpresets (patch 1360289)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 21:13:41 +00:00
Vadim Zeitlin
c4edb7acdf added generation of wxEVT_SCROLL_XXX (patch 1424698)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 21:03:35 +00:00
Vadim Zeitlin
3782aa47f4 document GetInsertionPoint() bug under MSW (see patch 1262125)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:36:16 +00:00
Vadim Zeitlin
9849a94455 added test for GetInsertyionPoint() (patch 1262125)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:24:48 +00:00
Vadim Zeitlin
f10e38c48a regenerated with bakefile 0.2.0 m4 files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:22:27 +00:00
Vadim Zeitlin
bd73e1842a updated to 0.2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:15:08 +00:00
Vadim Zeitlin
6505ca85df fixed deprecation warnings; removed #if 0'd code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:14:48 +00:00
Vadim Zeitlin
0604740afd regenerated make/project files after applying mediactrl patch (1427775)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 20:02:55 +00:00
Vadim Zeitlin
77a7dfc1a1 regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:51:08 +00:00
Vadim Zeitlin
4ff53d1b7a compilation fix for gcc4 (patch 1428840)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:43:14 +00:00
Vadim Zeitlin
557002cf81 Ryan's cumulative wxActiveX and media control patch (1427775)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:37:40 +00:00
David Surovell
dcae64c221 cleanup - reformatting; simplified OnPaint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:37:04 +00:00
Vadim Zeitlin
cf9b63b38a regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl as it's now defined by bakefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:27:51 +00:00
David Surovell
5cf1cb1006 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:16:20 +00:00
Robin Dunn
51941b4877 Oops, CenteronScreen wasn't really removed, just moved to wxTopLevelWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 19:07:36 +00:00
Robin Dunn
f0879a0a8f use wxRTTI to construct the right class of wxHtmlCell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:38:43 +00:00
Robin Dunn
b15ce82158 Add missing constants
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:36:50 +00:00
Robin Dunn
99fbb25ba4 Add wx.Dialog.Get/SetAffirmativeId and Get/SetEscapeId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:36:03 +00:00
Robin Dunn
1d0ac8f576 wx.Window.CenterOnScreen has been removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:34:02 +00:00
Robin Dunn
096e3ea1c5 Add wx.Rect.CenterIn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:33:26 +00:00
Robin Dunn
488867abe8 Add wx.KeyEvent.GetModifiers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:32:41 +00:00
Robin Dunn
eb3d14161d GetFromWindow is available everywhere now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:32:10 +00:00
Robin Dunn
f2e29d5438 Add Get/SetBitmapHover
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 18:31:47 +00:00
David Surovell
592a247ddd cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 17:53:02 +00:00
Stefan Csomor
f288c87b3d intel endian fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 17:40:25 +00:00
Vadim Zeitlin
8628b7d413 GTK1 fixes after wxObject-derived classes copy ctors/assignment operators simplifications (patch 1428863)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 15:41:06 +00:00
Włodzimierz Skiba
f4ec6bd20a Use 'wx/' for contrib samples and make wxTinderbox properly rebuilded after commits in core headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 11:59:52 +00:00
Włodzimierz Skiba
e77138c0e2 wxTinderbox build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 11:33:22 +00:00
Vadim Zeitlin
9d4e821b97 GetFromWindow() is not MSW-only any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 02:30:38 +00:00
Vadim Zeitlin
dae6a419ae generic GetFromWindow() implementation for non-MSW platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 02:29:30 +00:00
Vadim Zeitlin
1f464296de fixed centering of top level windows on secondary displays (replaces patch 1267173)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 00:02:06 +00:00
Vadim Zeitlin
1bfb73b877 added wxRect::CentreIn()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-10 00:01:19 +00:00
Vadim Zeitlin
cae50e6bbd added tests for centering dialogs on screen/parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 23:17:35 +00:00
Vadim Zeitlin
b40bb73e7c put property sheets in their own submenu; resolve accelerators conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 23:09:15 +00:00
Michael Wetherell
8193978003 Fix link errors from advdll_taskbar.o on cygwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 22:19:14 +00:00
Julian Smart
99e60663fb Added wxUSE_INKEDIT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 22:00:45 +00:00
Robin Dunn
22e717582a Mention BeginDrawing and EndDrawing deprecation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 16:09:57 +00:00
Robin Dunn
951090428f Docstring fix, and a bit of cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 16:09:16 +00:00
Stefan Csomor
7f10ed6e65 full keyboard access support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:45:46 +00:00
Robin Dunn
98717dd512 Use Bind()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:43:23 +00:00
Robin Dunn
1e19321bfb Patch #1428290: STCStyleEditor updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:41:19 +00:00
Robin Dunn
7153b2cb86 Patch #1428181: Sample wxProject.py updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:37:39 +00:00
Julian Smart
b18f44e244 Applied doc patch [ 1426505 ] Failure to call wxWizard.Destroy() causes hang on exit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:35:48 +00:00
Stefan Csomor
90b4f7b5f5 full keyboard access support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:30:21 +00:00
Julian Smart
88c139da46 Applied patch [ 1427626 ] Fix wxFileConfig so that it still works after DeleteAll()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:28:42 +00:00
Vadim Zeitlin
c86fd3a793 undeprecated wxSizerItem::IsShown() undoing last change to wx/sizer.h: turns out we do need this logic in a few places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:25:22 +00:00
Stefan Csomor
cabb99da6d support themed foreground brushes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:20:39 +00:00
Stefan Csomor
54a6974c51 guard against empty ref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:16:21 +00:00
Stefan Csomor
a395a6243e bring XBM in line with MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:09:59 +00:00
Stefan Csomor
1de4364516 correct tabbing for full keyboard access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 15:03:51 +00:00
Vadim Zeitlin
e4277538a5 set m_encoding in wxCSConv ctor from name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 14:58:08 +00:00
Jamie Gadd
006b8dff84 Fix drag and drop inside static boxes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 12:42:25 +00:00
Vadim Zeitlin
0c131a5ad2 implemented ScrollLines/Pages() for all classes in wxGTK, not just wxTextCtrl (patch 1281503)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 03:53:34 +00:00
Vadim Zeitlin
a8e24848f6 don't put the size of the data with the data itself by default (but allow it for compatibility with previous versions) (modified patch 1288868)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 03:45:14 +00:00
Vadim Zeitlin
69e72fda93 documented GetMenus(); corrected GetMaxFiles() return type (patch 1371483)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 03:14:28 +00:00
Vadim Zeitlin
97ad053bff more standard (although less RFC-conformant) treatment of file: URIs (patch 1415189)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 03:09:36 +00:00
Vadim Zeitlin
f8855e4725 great copy ctor/assignment operators cleanup by Paul Cornett (patch 1307665)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 00:51:23 +00:00
Vadim Zeitlin
1906f9df59 fix for wrong debugging message (replaces patch 1424028)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 00:37:56 +00:00
Vadim Zeitlin
db6d391891 fixed wxUSE_TABDIALOG/TAB_DIALOG confusion and other fixes to prevent wxTabCtrl from being built into the library unnecessarily (patch 1416049)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-09 00:28:34 +00:00
Vadim Zeitlin
5489227348 avoid warnings C4311/4312 when building with MSVC >= 7 (patch 1414052)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 22:32:42 +00:00
Vadim Zeitlin
3cf545c76c don't always find the file if it's in the current directory (even if it's not in the search path) (patch 1411994 closing bug 1214987)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 22:24:29 +00:00
Vadim Zeitlin
f303d69f93 deprecated wxSizerItem::IsShown() because it doesn't really make sense for the sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 22:22:51 +00:00
Vadim Zeitlin
e64658ed99 don't lose the alignment flags when setting the column image (replaces patch 1411870; closes bug 1155504)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 22:15:34 +00:00
Vadim Zeitlin
9eaba69276 fix for artefacts when dragging a column divider in wxListCtrl with wxLC_VRULES style (patch 1411857 closing bug 673394)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 22:03:53 +00:00
Vadim Zeitlin
9f01395e41 don't update m_iconized in IsIconized(), this can break wxFrame::HandleSize() logic (bug 1407848)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 21:55:02 +00:00
Vadim Zeitlin
6f02a879ed make access specifiers for the virtual functions match their access in the base class (patch 1400131)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 21:47:09 +00:00
Vadim Zeitlin
e4ccedf7b2 removed duplicate entries for UTF-16/32 (which are aliases for either LE or BE variants) from the encodings data arrays (patch 1382350)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 21:32:24 +00:00
David Surovell
0f85d5e799 cleanup - reformatting (again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 17:46:09 +00:00
Vadim Zeitlin
59abfcf813 removed code refreshing toolbar on every MDI child move -- no idea why was it there (since rev 1.1) but it results in horrible flicker and removing it doesn't seem to do any harm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 15:41:45 +00:00
Vadim Zeitlin
5bee6b2be4 set the same background colour for wxMDIParentFrame as for wxFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 15:38:20 +00:00
Vadim Zeitlin
3d412f80e9 account for DrawThemeParentBackground() returning S_FALSE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 15:23:42 +00:00
Vadim Zeitlin
053889ad4b don't set colours for the toolbar manually, this prevents default redrawing from taking place; draw themed background if the parent is themed (based on patch 1358919)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 14:42:48 +00:00
Vadim Zeitlin
848c37c35b no changes; just code cleanup in OnEraseBackground()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 14:01:50 +00:00
Vadim Zeitlin
566b7f7bbf added wxCHANGE_HDC_MAP_MODE to avoid #ifdef __WXWINCE__ everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 14:00:34 +00:00
Vadim Zeitlin
0699a648f6 documented wxToolBar dontattachtoframe tag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 13:33:55 +00:00
Vadim Zeitlin
6a62debb2c added a page showing wxToolBars (part of patch 1358919)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 13:29:49 +00:00
Vadim Zeitlin
700dbceb37 added support for <bg> tag for toolbars in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 13:22:56 +00:00
Vadim Zeitlin
114807c0b2 added support disabled tag for toolbar elements in XRC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 13:20:18 +00:00
Vadim Zeitlin
e786a78b1c removed a few more extra semicolons (patch 1425785)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 13:04:14 +00:00
Vadim Zeitlin
268b0725a2 corrected description of font parameter of GetTextExtent()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-08 13:02:20 +00:00
David Surovell
9b26622dc1 fixed DoDrawRoundedRect to use corner rounding radius arguments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 21:54:48 +00:00
Robin Dunn
830f23c593 Remove calls to dc.BeginDrawing and dc.EndDrawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 17:28:12 +00:00
David Surovell
63811cf00a removed deprecated wxDC.[Begin,End]Drawing calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 09:32:05 +00:00
Robin Dunn
7f7aa1664c reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 04:42:55 +00:00
Robin Dunn
b06b3e70d1 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 04:36:54 +00:00
Robin Dunn
2ea1b3733b some cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 04:17:53 +00:00
Robin Dunn
c26d9ab4b5 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 04:16:22 +00:00
Robin Dunn
f4cc01acd1 Oops, DoLog and DoLogString are protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 04:14:37 +00:00
Robin Dunn
38dc15374b Added feature flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 04:04:02 +00:00
Robin Dunn
a7a0141800 Changes to how overridable C++ methods are virtualized for Python.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 03:56:44 +00:00
Vadim Zeitlin
e4c37d10dd removed old Win16 files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 00:42:25 +00:00
Vadim Zeitlin
93489fc8f1 always send TB_AUTOSIZE in UpdateSize(), even if we're not attached to a frame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-07 00:39:17 +00:00
David Surovell
d141b21808 tweaks and comments to previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 22:53:31 +00:00
Vadim Zeitlin
33c0ca829f declare rich text control event types with correct dll export qualifiers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 22:48:25 +00:00
David Surovell
bf26e9e078 fix gcc v3.3.3 compiler crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 22:34:32 +00:00
David Surovell
57a67daf9a fix compilation problem, pass 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 22:09:19 +00:00
Robin Dunn
122d1d563a Fix compilation error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 21:58:56 +00:00
9543 changed files with 2943533 additions and 1467190 deletions

12
.cvsignore Normal file
View File

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

262
BuildCVS.txt Normal file
View File

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

27760
Makefile.in Normal file

File diff suppressed because it is too large Load Diff

729
acinclude.m4 Normal file
View File

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

23
aclocal.m4 vendored Normal file
View File

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

24
art/addbookm.xpm Normal file
View File

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

21
art/back.xpm Normal file
View File

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

57
art/cdrom.xpm Normal file
View File

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

44
art/copy.xpm Normal file
View File

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

17
art/cross.xpm Normal file
View File

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

46
art/cut.xpm Normal file
View File

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

54
art/deffile.xpm Normal file
View File

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

24
art/delbookm.xpm Normal file
View File

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

42
art/delete.xpm Normal file
View File

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

52
art/dir_up.xpm Normal file
View File

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

21
art/down.xpm Normal file
View File

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

73
art/exefile.xpm Normal file
View File

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

57
art/fileopen.xpm Normal file
View File

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

42
art/filesave.xpm Normal file
View File

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

44
art/filesaveas.xpm Normal file
View File

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

62
art/find.xpm Normal file
View File

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

63
art/findrepl.xpm Normal file
View File

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

39
art/floppy.xpm Normal file
View File

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

43
art/folder.xpm Normal file
View File

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

52
art/folder_open.xpm Normal file
View File

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

21
art/forward.xpm Normal file
View File

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

58
art/gtk/error.xpm Normal file
View File

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

63
art/gtk/info.xpm Normal file
View File

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

75
art/gtk/question.xpm Normal file
View File

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

63
art/gtk/warning.xpm Normal file
View File

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

60
art/harddisk.xpm Normal file
View File

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

44
art/helpicon.xpm Normal file
View File

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

24
art/home.xpm Normal file
View File

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

25
art/htmbook.xpm Normal file
View File

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

25
art/htmfoldr.xpm Normal file
View File

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

20
art/htmoptns.xpm Normal file
View File

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

23
art/htmpage.xpm Normal file
View File

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

27
art/htmsidep.xpm Normal file
View File

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

25
art/listview.xpm Normal file
View File

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

43
art/missimg.xpm Normal file
View File

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

58
art/motif/error.xpm Normal file
View File

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

63
art/motif/info.xpm Normal file
View File

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

75
art/motif/question.xpm Normal file
View File

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

63
art/motif/warning.xpm Normal file
View File

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

50
art/new.xpm Normal file
View File

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

43
art/new_dir.xpm Normal file
View File

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

46
art/paste.xpm Normal file
View File

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

60
art/print.xpm Normal file
View File

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

90
art/quit.xpm Normal file
View File

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

58
art/redo.xpm Normal file
View File

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

44
art/removable.xpm Normal file
View File

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

24
art/repview.xpm Normal file
View File

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

17
art/tick.xpm Normal file
View File

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

47
art/tipicon.xpm Normal file
View File

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

21
art/toparent.xpm Normal file
View File

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

58
art/undo.xpm Normal file
View File

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

21
art/up.xpm Normal file
View File

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

BIN
art/wxwin.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
art/wxwin16x16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

25
art/wxwin16x16.xpm Normal file
View File

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

BIN
art/wxwin32x32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

41
art/wxwin32x32.xpm Normal file
View File

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

898
autoconf_inc.m4 Normal file

File diff suppressed because one or more lines are too long

2
autogen.sh Executable file
View File

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

1
build/.cvsignore Normal file
View File

@@ -0,0 +1 @@
wince

27
build/README.txt Normal file
View File

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

View File

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

View File

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

View File

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

1552
build/aclocal/bakefile.m4 Normal file

File diff suppressed because it is too large Load Diff

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

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

196
build/aclocal/gtk-2.0.m4 Normal file
View File

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

194
build/aclocal/gtk.m4 Normal file
View File

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

57
build/aclocal/pkg.m4 Normal file
View File

@@ -0,0 +1,57 @@
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])

180
build/aclocal/sdl.m4 Normal file
View File

@@ -0,0 +1,180 @@
# Configure paths for SDL
# Sam Lantinga 9/21/99
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
AC_DEFUN([AM_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
sdl_prefix="$withval", sdl_prefix="")
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
, enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
fi
fi
if test x$sdl_prefix != x ; then
sdl_args="$sdl_args --prefix=$sdl_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
AC_REQUIRE([AC_CANONICAL_TARGET])
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
else
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_sdltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
dnl
dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent
dnl
rm -f conf.sdltest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "SDL.h"
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int main (int argc, char *argv[])
{
int major, minor, micro;
char *tmp_version;
/* This hangs on some systems (?)
system ("touch conf.sdltest");
*/
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_sdl_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_sdl_version");
exit(1);
}
if (($sdl_major_version > major) ||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the SDL_CONFIG environment variable to the"
echo "*** full path to sdl-config."
else
if test -f conf.sdltest ; then
:
else
echo "*** Could not run SDL test program, checking why..."
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include "SDL.h"
int main(int argc, char *argv[])
{ return 0; }
#undef main
#define main K_and_R_C_main
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
SDL_CFLAGS=""
SDL_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
rm -f conf.sdltest
])

66
build/autogen.mk Normal file
View File

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

View File

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

View File

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

43
build/bakefiles/README Normal file
View File

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

View File

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

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

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

View File

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

View File

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

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

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

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

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

3238
build/bakefiles/files.bkl Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

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

View File

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

1289
build/bakefiles/make_dist.mk Normal file

File diff suppressed because it is too large Load Diff

View File

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

View File

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

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