Compare commits

..

885 Commits

Author SHA1 Message Date
Bryan Petty
12c8593175 This commit was manufactured by cvs2svn to create tag 'wxPy_2_3_2b1'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_3_2b1@11557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-04 06:35:05 +00:00
Robin Dunn
1edab6e3d8 more little tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-04 06:35:05 +00:00
Robin Dunn
3ae53c3153 little tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-04 06:00:45 +00:00
Robin Dunn
6d8b4f8d2b Added wxNativeFontInfo and wxFontMapper.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-04 05:00:15 +00:00
Robin Dunn
53fe40bac2 Added more contribs from Lorne White, and updated some of the existing ones.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-04 04:17:38 +00:00
Robin Dunn
ddcb3d8378 Added wxGenBitmapTextButton contrib from Lorne White.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-03 23:23:47 +00:00
Václav Slavík
93cd80d63c forgot to commit some XRC files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-03 23:07:23 +00:00
Robin Dunn
4309759886 Updated wxColumnSorterMixin to also be able to place sort icons on the
column headers, and updated the wxListCtrl demo to show it off by
using wxColumnSorterMixin.

Other odds and ends...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-03 22:47:34 +00:00
Robin Dunn
6d19860fe8 Updated wxColumnSorterMixin to also be able to place sort icons on the
column headers, and updated the wxListCtrl demo to show it off by
using wxColumnSorterMixin.

Other odds and ends...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-03 22:41:18 +00:00
Vadim Zeitlin
0188c70233 added Set/ClearColumnImage() helpers to wxListView
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-03 16:57:16 +00:00
Vadim Zeitlin
0a816d9581 implemented column images for the generic version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-03 15:09:56 +00:00
Vadim Zeitlin
6f806543a4 added support for column images under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 23:47:42 +00:00
Václav Slavík
5707316c9c applied utf-8 fix patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 22:44:00 +00:00
Václav Slavík
f3d6a60294 added id handling to html cells
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 20:07:45 +00:00
Václav Slavík
50da928bbd added id handling to image cells
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11543 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 20:07:35 +00:00
Václav Slavík
8938133dbc added wxHtmlCell::Get/SetId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 20:07:25 +00:00
Václav Slavík
d168485fcf comment clarification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 20:07:13 +00:00
Robin Dunn
949853a49c Added AssignImageList to wxNotebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-02 00:55:17 +00:00
Václav Slavík
dafa49256d fix for wxStatusBar wrongly reporting field rects inside EVT_SIZE handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 21:47:49 +00:00
Václav Slavík
0b52d3cf4d mingw compilation fix, added some defines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 21:47:29 +00:00
Václav Slavík
dcbd7ce2d7 compilation fix for mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 21:47:13 +00:00
Václav Slavík
0beefa20dc fixed memory leaks when parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 12:59:41 +00:00
Václav Slavík
06069dda0d helpbest.patch - makefiles regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 12:59:33 +00:00
Václav Slavík
3d285623a7 finally applied the helpbest patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 12:59:08 +00:00
Robin Dunn
65ec6247df Upgraded to version 1.39 of Scintilla, and upated wxStyledTextCtrl
accordingly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 03:06:33 +00:00
Robin Dunn
b8fbf1a035 Added classinfo macros for wxTreeEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 03:00:17 +00:00
Robin Dunn
55c020cf64 Cleaned up some and started using path joins and normalization instead
of string concatenation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 02:35:31 +00:00
Vadim Zeitlin
11358d3976 added a bunch of new wxListCtrl messages: column right click and
start/continue/end dragging column divider


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-09-01 01:01:51 +00:00
Robin Dunn
aa2a5b8696 Added XRCed to the wxPython Tools directory, contributed by Roman
Rolinsky.

Added wrappers for the default ctor and the Create methods for most
window classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-31 21:51:07 +00:00
Robin Dunn
09f3d4e679 Added XRCed to the wxPython Tools directory, contributed by Roman
Rolinsky.

Added wrappers for the default ctor and the Create methods for most
window classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-31 21:38:03 +00:00
Vadim Zeitlin
f6010d8fad implemented and documented wxHtmlWindow::OnCellMouseHover() and OnCellClick()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-31 21:19:23 +00:00
Vadim Zeitlin
e2f9212c00 applied a patch to remove spurious constrains unsatisifed warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-31 19:07:59 +00:00
Julian Smart
7900c71c73 Remove _all_ borders if that's what we specify to ShowFullScreen.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-31 10:29:40 +00:00
Václav Slavík
2049d9b54b helpbest docs update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-30 23:26:28 +00:00
Václav Slavík
8c5b1f0faf minor fix that was part of helpbest.patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-30 23:25:56 +00:00
Julian Smart
619e52bf45 Fixed cache-related bug in DoBlit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-30 10:57:36 +00:00
Václav Slavík
a9a8c02ff3 oops, forgot to check in a wxMGL define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 21:14:01 +00:00
Gilles Depeyrot
4d5a0f67c6 commented help references to OnXXX functions that are not documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 19:39:14 +00:00
Gilles Depeyrot
619e0d43b1 conditional compilation corrections for Apple Developer Tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 18:49:19 +00:00
Gilles Depeyrot
49e95e1d80 added missing include for compilation with Apple Developer Tools
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 18:47:47 +00:00
Gilles Depeyrot
ae13baff25 added common and generic files implementing wxFindReplaceDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 18:46:56 +00:00
Václav Slavík
2f0bac123b non-recursive destructors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 18:31:51 +00:00
Václav Slavík
d7b1d73c92 fixed my favorite bug (delete foo; call foo->Something())
and non-recursive destructors as an add-on :)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 18:31:40 +00:00
Julian Smart
c556f19843 Isolated the 'error' case which I ignore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 12:20:36 +00:00
Vadim Zeitlin
cf30ae1309 fixed refreshing listctrl on focus change when it only has one item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 11:35:14 +00:00
Julian Smart
09d68ec1c3 Removed wxLogSysError call in wxHandleProcessTermination, and ensured
the cleanup always happens. I hope this is right... but if processes
are killed elsewhere, we don't want this function to generate an error
and not do the correct cleanup.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 11:24:50 +00:00
Stefan Csomor
e126b44d22 added error message in case older apple header files are used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 07:26:43 +00:00
Stefan Csomor
fb606749b3 corrected shutdown proc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-29 07:25:39 +00:00
Václav Slavík
135ace6d7b make it possible to open files from XRC in wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 22:12:44 +00:00
Václav Slavík
150e58d8ae compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 22:11:54 +00:00
Václav Slavík
abe4a4f120 fixed a bug in wxListCtrl: SetColumnWidth didn't set wxListHeaderWindow::m_dirty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 22:11:11 +00:00
Gilles Depeyrot
c6d1e23287 replaced CPPFLAGS with CXXFLAGS following corrections in auto-configuration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 19:48:55 +00:00
Gilles Depeyrot
e33ef6614e generalized fix for clipboard code compilation configuration check
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 19:45:52 +00:00
Robin Dunn
00b6c4e33b Added a new sample app that is a style editor for wxSTC.
Some other tweaks and fixes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 19:21:45 +00:00
Gilles Depeyrot
555d502faf removed leftover testing code in patch for wxComboBox and wxListBox that
only compiles with configured with --enable-debug


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 18:50:12 +00:00
Vadim Zeitlin
f20f656963 another compilation fix for whitespace-averse compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 15:43:06 +00:00
Vadim Zeitlin
277d672a9d compilation fix: ifdef instead of if
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 14:41:31 +00:00
Vadim Zeitlin
1357a7dd5c implemented wxDir::HasSubDirs() optimization for Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11498 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-28 13:48:53 +00:00
Robert Roebling
7e410431f3 Probably fixed wxBeginBusyCursor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 19:35:05 +00:00
Vadim Zeitlin
b0d3640289 attempt to optimize wxDirData::Read() - made absolutely no difference
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 18:27:42 +00:00
Vadim Zeitlin
2a4dbd8197 fixed bug with directory expansion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 17:41:39 +00:00
Vadim Zeitlin
82008c2601 fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 15:29:02 +00:00
Vadim Zeitlin
5549e9f76f added support for polygons to wxRegion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 14:56:55 +00:00
Vadim Zeitlin
673f4220ba fix for wxGTK clipboard code compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 14:29:34 +00:00
Vadim Zeitlin
0cb9cfb22f send right click events for the URLs too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 13:51:20 +00:00
Vadim Zeitlin
b3dc8a3e61 fixed y position of the drop point in HandleDropFiles() (patch 455658)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11490 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-27 12:20:04 +00:00
Václav Slavík
026d1fac66 tables code fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-26 14:50:20 +00:00
Václav Slavík
af035b26c4 fixed HTML parsing in regard to spaces between tags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-26 14:49:09 +00:00
Václav Slavík
79d6c01818 beginnings of HTML4 tables layouter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11487 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 23:14:21 +00:00
Vadim Zeitlin
bb0e27ee5a compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:51:58 +00:00
Stefan Csomor
46cdeb741e added quantize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:15:04 +00:00
Stefan Csomor
518af45bee added disk space
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:13:57 +00:00
Vadim Zeitlin
2b9bdf7146 don't try compile wxClipboard without OLE support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:13:45 +00:00
Vadim Zeitlin
44d5b352ae warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:13:14 +00:00
Vadim Zeitlin
ebb0781f91 are there still versions of gcc around which require casting WndProc to long? I don't think so...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:12:58 +00:00
Vadim Zeitlin
b94e73ae6a no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 20:08:48 +00:00
Václav Slavík
a42aa5d7be fixed a canonical example of Stupid Bug(tm)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 19:51:55 +00:00
Vadim Zeitlin
519dc37faf fixed return value of HandleEndSession to return true only if the message was really processed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 17:56:34 +00:00
Vadim Zeitlin
52e8b69060 statfs() detection for wxGetDiskSpace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 16:55:06 +00:00
Vadim Zeitlin
eadd7bd2cb added wxGetDiskSpace for Win/Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 16:54:14 +00:00
Vadim Zeitlin
3a994742ab added wxLongLong::ToString()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 16:42:11 +00:00
Vadim Zeitlin
6dc34ebbd8 added test for HitTest(m_dragPoint) bug to the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 15:41:46 +00:00
Vadim Zeitlin
8d1d22845a use raw (physical) coords in LIST_(R)DRAG events (patch 444912)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 15:41:17 +00:00
Stefan Csomor
0baac61e4f corrected OWNER_DRAWN Remove to RemoveAt in Delete
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 15:40:52 +00:00
Vadim Zeitlin
fc4f1d5f6b fixed crash in HitTest() with y position below the last line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 15:37:17 +00:00
Vadim Zeitlin
1971d23c57 applied patch 432814: saving BMP in 1, 4 and 8 bpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 15:30:49 +00:00
Vadim Zeitlin
6e711d5c09 applied patch 446836: removed qt headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11469 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 14:52:26 +00:00
Vadim Zeitlin
27b92ca4e2 added \#if wxUSE_GRID around the whole file (patch 455225)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 14:43:43 +00:00
Vadim Zeitlin
0800a4ba40 typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 12:07:45 +00:00
Vadim Zeitlin
7009f411aa refresh the tree ctrl when its back/foreground colour changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-25 12:06:53 +00:00
Vadim Zeitlin
de7f086027 fix for calling GetWindowLong(NULL hwnd)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 22:16:42 +00:00
Stefan Csomor
c638c3cd12 added new calling conventions for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 20:44:02 +00:00
Robert Roebling
6464f4cbe0 Patch (partially back) so that images work in wxHTML.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 20:12:18 +00:00
Stefan Csomor
62e83765c2 decremented timeout, we have to find a better algorithm for knowing when we don't have to wait further for data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 19:55:57 +00:00
Robert Roebling
51a229c65f Fixed apparent typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 19:55:38 +00:00
Stefan Csomor
ad8b849872 added connect sequence for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 19:42:13 +00:00
Stefan Csomor
79da309276 added late init and setup timeout
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 19:27:17 +00:00
Vadim Zeitlin
70426fba08 fix for the short locale name construction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 18:19:54 +00:00
Vadim Zeitlin
a329180411 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 18:14:06 +00:00
Vadim Zeitlin
66dfed9b9d generate wxEVT_ACTIVATE_APP events for wxMSW too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 16:12:40 +00:00
Vadim Zeitlin
00b4a13e0c declared private wxString::operator=(int) to prevent code like "str = 17;" from compiling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 14:37:30 +00:00
David Webster
bcd3d8d9e2 New module definition file for the ever chaning treectrl class interface.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 14:18:00 +00:00
Vadim Zeitlin
adac097759 removed extra wxSTD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 12:21:50 +00:00
Vadim Zeitlin
2b004197c8 added missing wxSTDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 12:21:27 +00:00
Vadim Zeitlin
a90ec4ab31 added missing wxSTD
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 12:20:07 +00:00
Julian Smart
7a4f484f1d Small correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-24 08:58:11 +00:00
Vadim Zeitlin
ad4297f34e always pass WM_DESTROY to DefWindowProc() - this fixes memory/resource leak for wxListBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 23:27:06 +00:00
Vadim Zeitlin
4770df95a0 fixes for rotated text drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 22:08:58 +00:00
Vadim Zeitlin
56c4a88b3b added possibility to filter out some messages - there are too many of them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 21:55:43 +00:00
Václav Slavík
77b2f9b185 ProcessPlatformProperty should not be a member of wxXmlResource
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 18:57:19 +00:00
Václav Slavík
2978621101 wxHtmlEasyPrinting indentation changes + CreatePrintout,DoPrint and DoPreview virtual and protected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 18:56:41 +00:00
Stefan Csomor
b838cfc915 added conversion to mac native filenames from local filesystem handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-23 13:38:05 +00:00
Václav Slavík
ba0b7b3238 fixed yet another bug in wxStream classes
(This time, the braindead wannabe coder who wrote the original code created
wxStreamBase instance and then casted it to wxInputStream and hapilly used the stream,
which could of course never work. Anybody knows a cheap hitman?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-22 22:13:22 +00:00
Václav Slavík
a3e377a31f compilation fix for genericTreeCtrl-only stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-22 22:13:06 +00:00
Vadim Zeitlin
eacb91fc20 added wxDynamicSashWindow (patch 441518)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-22 15:02:40 +00:00
Vadim Zeitlin
9787a4b6ad added UnregisterWindowClasses() (patch 447443)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-22 14:42:54 +00:00
Vadim Zeitlin
b6e5eaa597 minor clean up
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-22 14:24:23 +00:00
Vadim Zeitlin
ebb987b77b double click handling is finally correct in the treectrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-21 15:17:48 +00:00
Vadim Zeitlin
15248e43a9 removed assert from wxColour::InitFromName() as there is no way to bypass it (see comment there)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-21 11:55:38 +00:00
Robert Roebling
c9c4b3a009 Fixed focus event problems with control derived
from wxScrolledWindow.
  If wxTreeCtrl has no +/. button, toggle branch,
    otherwise send activate event upon double-click.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-21 11:12:42 +00:00
Julian Smart
decb3a6a16 Added Net library to contrib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-21 09:11:20 +00:00
Vadim Zeitlin
c48926e149 fixes for Raise() to work correctly with both top level and child windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 23:02:27 +00:00
Vadim Zeitlin
5d987909a8 moved button handler into the modeless dialog itself - at least like this it works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 23:01:17 +00:00
Vadim Zeitlin
68eb5f6337 allow user code to override key handling in wxTreeCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 19:25:00 +00:00
Stefan Csomor
a0f8388258 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 18:56:11 +00:00
Vadim Zeitlin
ba7bd90150 fixed refresh problem after adding some items and calling Ensurevisible()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 16:08:11 +00:00
Vadim Zeitlin
49ecb02984 fix for refreshing the current item in the list ctrl when the focus is gained/lost
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 15:46:50 +00:00
Vadim Zeitlin
de57703a0c fixed text fg colour for selected but unfocused items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 15:22:15 +00:00
Vadim Zeitlin
dbcbe22962 made GetColourFromGTKWidget() more general, it is now used for all colours
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 15:19:37 +00:00
Vadim Zeitlin
3523b9cf8d fix for wxSYS_COLOUR_LISTBOX colour detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 14:46:09 +00:00
Vadim Zeitlin
b771aa29dd draw the selected items in another colour when the control doesn't have focus, a bit like MSW does
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 14:13:34 +00:00
Vadim Zeitlin
643ccf6203 extracted 4 copies of identical code into a function
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 14:13:04 +00:00
Vadim Zeitlin
783d4c8931 fixed the wrong examples of CalcScrolled/UnscrolledPosition() usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11419 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 13:18:52 +00:00
Vadim Zeitlin
677a9f0c61 fixed bug with calling Destroy() on the NULL wxSocket
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 13:10:17 +00:00
Vadim Zeitlin
06b781c7c6 fixed clipping of items with icons text in report mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 13:09:18 +00:00
Julian Smart
bcbe86e592 Fixed GetLongPath bug -- should use GetFullName and not GetName
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-20 09:04:54 +00:00
Václav Slavík
7af284fda7 nicer version compilation fix for wxUSE_WCHAR_T=0 (why should we duplicate definitions in all #ifdef branches???)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 22:22:59 +00:00
Robert Roebling
76fcf0f239 Various changes for simplification of focus event
code in wxGTK. It will also work for wxComboBox
    now, but not for GTK's other composite controls
    such as wxListBox and wxChoice.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11414 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 21:36:25 +00:00
Stefan Neis
73a89308a4 Fix for wxUSE_WCHAR_T == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 18:31:10 +00:00
Stefan Csomor
9cf99fc093 added carbonaccessors.o
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 17:18:03 +00:00
Robert Roebling
f72124dbe5 We use native paths now in wxWindows. On the Mac, too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 16:39:14 +00:00
Václav Slavík
c48792de4a fix for bug in wxEditableListBox in connection with new wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 12:54:37 +00:00
Václav Slavík
80372768e4 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 12:54:26 +00:00
Stefan Csomor
3d2791f12c added a few encoding convenience methods for pc-mac encoding and string handling, put message box buttons under translation, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-19 08:38:14 +00:00
Václav Slavík
211cc8dc90 better focus handling (blind fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-18 23:13:03 +00:00
Robert Roebling
eeca3a4697 The Scale() code in the 2.3 tree turned out to
be wrong.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-18 18:17:23 +00:00
Robert Roebling
08a092f9f4 Compile fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-18 17:17:13 +00:00
Robert Roebling
618a5e382a Applied Greg's patch to tree control and related.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-18 13:09:26 +00:00
Vadim Zeitlin
a8973b121d warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-17 17:52:02 +00:00
David Webster
bcb7cc7693 New module definition file to keep .dll build compilable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-17 14:26:45 +00:00
Julian Smart
213ba43b70 Added doc for 2-step initialisation and wxWIZARD_EX_HELPBUTTON style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-17 09:38:53 +00:00
Julian Smart
77436c4cba Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.
Also added & to Cancel button.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-17 09:38:19 +00:00
Vadim Zeitlin
444ad3a719 added wxURLDataObject which unfortunately doesn't seem to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 23:46:56 +00:00
Václav Slavík
2b260bc3e2 finished wxWindow for MGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 22:53:43 +00:00
Robin Dunn
5e08014381 new version of PyCrust
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 17:48:52 +00:00
Vadim Zeitlin
6ea1323aa0 fixed bug/assert failure when refreshing items in non report mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 14:29:34 +00:00
Vadim Zeitlin
5949fba636 documented SetMaxLength(0)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 13:58:56 +00:00
Vadim Zeitlin
f2616db567 added new text event macros description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 13:35:38 +00:00
Vadim Zeitlin
ce2f50e34a added sending of EVT_TEXT_MAXLEN to wxGTK, suppressed sending of dummy
EVT_TEXT_UPDATED events when the text doesn't really change


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 13:18:51 +00:00
Vadim Zeitlin
d5f005cc93 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-16 11:30:13 +00:00
Václav Slavík
ef344ff862 bugfixes, bugfixes, bugfixes...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 23:48:31 +00:00
Vadim Zeitlin
9b588fe10c compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 15:37:05 +00:00
Vadim Zeitlin
5716a1abb1 compilation fixes for VC++ in release mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 15:26:27 +00:00
Vadim Zeitlin
9cb9fdb372 fixed bug with loading standard icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 14:54:56 +00:00
Vadim Zeitlin
c5639a8767 traces of my debugging session, no real changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 14:27:22 +00:00
Vadim Zeitlin
d7eee191c5 implemented, tested and documented wxTextCtrl::SetMaxLength()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 12:45:53 +00:00
Vadim Zeitlin
2cefcb34d2 compilation warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-15 11:47:39 +00:00
Robin Dunn
cd09615235 updates for swig generated code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 23:03:59 +00:00
Robin Dunn
c7e7022c2c Deprecated PyShell and PyShellWindow, added a snapshot of PyCrust.
Added the new virtual list capabilities to wxListCtrl.

Other odds and ends.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 19:19:48 +00:00
Robin Dunn
6443de0263 Fixed the drawing of the HRules so they don't try to iterate over all
the zillions of items in a large (or virtual) list control


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 18:48:37 +00:00
Robin Dunn
625cb8c0b1 Fixed a bug so wxLC_VRULES works by itself.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 18:34:18 +00:00
Vadim Zeitlin
b0ee47ff76 1. reset default item in ~wxWindow (better to be safe)
2. blind fix for Motif compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 14:59:44 +00:00
Vadim Zeitlin
75c9da2562 unsuccessful attempts to fix wxMenuBar positioning under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 12:57:32 +00:00
Vadim Zeitlin
70541533c8 reduce flicker in header window when deleting items and let space select items even in single selection mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 11:51:24 +00:00
Vadim Zeitlin
c40ce5ce77 removed redundant InitDialog methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 11:24:03 +00:00
Robin Dunn
7946d7deaa A fix for attribrute sorting, but it's still broken if there are
duplicate sort keys...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 09:02:37 +00:00
Robin Dunn
19230604c4 Moved fix from 2.2 branch that allows the attributes in MSW wxListCtrl
to move with their items when the list is sorted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 05:35:09 +00:00
Robin Dunn
abb69c6c82 fixed the last of the off-by-one errors (some are refixed, again...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-14 03:09:59 +00:00
Stefan Csomor
0e32fdb872 added translation of mac system into language, adaption of search paths
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-13 19:13:08 +00:00
Vadim Zeitlin
349efbaa89 implemented (untested) work around for wxScrolledWindow painting bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-13 15:42:29 +00:00
Vadim Zeitlin
88b792af94 added missing refresh when changing focus in wxListCtrl, added test for it in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-13 15:41:18 +00:00
Vadim Zeitlin
2387541fc3 moved wxNO_FULL_REPAINT_ON_RESIZE to wxControl from wxWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-13 15:01:25 +00:00
Vadim Zeitlin
4087064a38 don't try to refresh the menu bar before showing it, fixes crash on startup with wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-13 14:59:08 +00:00
George Tasker
8f974c520a Replaced /'s with \'s as BCC requires \'s for path names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-13 00:59:40 +00:00
George Tasker
52b51c2791 Replaced 'erase' with $(RM) so that the default file deletion program can be overriden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 23:56:07 +00:00
George Tasker
b9f6a1abbf Makefile submitted by Markus G. for G95
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 23:50:40 +00:00
George Tasker
3b50432abf Added regex to WXINC line (patch from Markus G)
Added definition of RM for use in makefiles so that 'erase' can be overridden with a different file deletion program (like 'rm')


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 23:49:18 +00:00
Václav Slavík
b9f246f7d9 added wxEventLoop::GetActive()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 22:10:20 +00:00
George Tasker
e8e4fa12f2 Removed semi-colons off the end of two macro statement lines so that compilation would be possible for BCC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 21:45:41 +00:00
Gilles Depeyrot
5e998a336a corrections for Mac OS compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 15:45:42 +00:00
Gilles Depeyrot
d062e17fca added missing methods/removed duplicated base methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 15:43:02 +00:00
Gilles Depeyrot
a99c96b0ff bitmap mask corrections for Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 15:39:20 +00:00
Gilles Depeyrot
94e2ed3b8d corrected CodeWarrior project target names and generated application names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 15:29:21 +00:00
Gilles Depeyrot
60149370ac applied SourceForge patch #440594 which corrects ListBox related errors
in Carbon applications under Mac OS X
the LDEF resource is no longer used in Carbon applications


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 15:15:03 +00:00
Gilles Depeyrot
050f7ffbd1 added CodeWarrior 5.3 projects for working demos
corrected CodeWarrior project target names and generated application names


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 15:07:12 +00:00
Gilles Depeyrot
125c389e1b added missing return value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 10:39:26 +00:00
Gilles Depeyrot
6c41903ced added container class files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 10:38:50 +00:00
Václav Slavík
fd495ab3ea wxMGL bugfixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 00:13:37 +00:00
Václav Slavík
2d2c394b59 fixed fl makefiles that Julian didn't fix correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 00:11:55 +00:00
Václav Slavík
40091824f1 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 00:11:45 +00:00
Václav Slavík
5984c7f71b fixed wxUniv compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-12 00:11:31 +00:00
Gilles Depeyrot
6a54cc2a11 added container class source
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-11 11:04:21 +00:00
Stefan Csomor
2af9ef13a7 corrected a bug in the masking code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-11 09:43:26 +00:00
Robert Roebling
d45fb985c4 Message dialog crashes when calling ::Move() etc. Better
do nothing than crash. MacOS 9.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-10 18:31:15 +00:00
Julian Smart
e9799102dd Fixed project files for regex.lib, taking the regex C files out of the main wxvc.dsp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-10 17:03:02 +00:00
Václav Slavík
f9a3f576cc wxMGL support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-09 22:43:32 +00:00
Václav Slavík
4fcf2d94aa added evtlooop.cpp for mgl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-09 22:42:38 +00:00
Václav Slavík
7bdc18790e wxMGL wxWindow and wxApp mostly complete, now hunting bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-09 22:40:39 +00:00
Václav Slavík
2cb980c58d added std icons to wxMGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-09 22:39:08 +00:00
Vadim Zeitlin
b48da8024d Define _GNU_SOURCE instead of _XOPEN_SOURCE (which breaks libtiff compilation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-09 01:20:12 +00:00
Vadim Zeitlin
ea8628fb74 changed CPPFLAGS to CXXFLAGS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-09 00:26:53 +00:00
Vadim Zeitlin
06dda230f6 fixed wxINSTALL_PREFIX setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:59:41 +00:00
Vadim Zeitlin
7e67ed0df4 moved wxINSTALL_PREFIX from CPPFLAGS to setup.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:46:39 +00:00
Vadim Zeitlin
776862b497 1. fixed test in configure for gettimeofday() argument
2. portability fixes in wxSingleInstanceChecer (use S_IRUSR, not S_IREAD)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:35:17 +00:00
Václav Slavík
f23e92e72a fix for nbsp problem and minor parsing flow change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:19:02 +00:00
Václav Slavík
61b50a43aa made some wxHtmlEntitiesParser's methods public -- turned out they are useful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:18:39 +00:00
Václav Slavík
455df0f450 updated wxTextFile docs; some typo corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:18:24 +00:00
Václav Slavík
dce5c1dbe1 wxEraseEvent docs corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 23:18:01 +00:00
Vadim Zeitlin
a3cb1afc37 1. next attempt to fix RH 7.1 build
2. CPPFLAGS are the flags for cpp, not for c++ compiler!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 22:52:53 +00:00
Robert Roebling
53bad206de Probably fixed listbox crashes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 20:08:07 +00:00
Vadim Zeitlin
2389f33bb4 fixed errors in glibc test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 16:44:05 +00:00
Vadim Zeitlin
c39c53e9fc oops, last check in undone - there is a problem somewhere there...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 16:41:57 +00:00
Vadim Zeitlin
ab252f7b29 attempts to fix recursive mutex initialized detection under RedHat 7.1 (new glibc)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 16:38:37 +00:00
Julian Smart
81177b12cd Corrected my typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 10:59:46 +00:00
Julian Smart
d1110a74ea Added container class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 06:43:28 +00:00
Vadim Zeitlin
d0debf520a drastically reduced flicker in RefreshItems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-08 00:10:01 +00:00
Václav Slavík
3ca2209e61 merged wxMGL cursors from wxUniversal branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 23:22:41 +00:00
Václav Slavík
ed88f3ab34 native theme for wxMGL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 23:16:11 +00:00
Vadim Zeitlin
38bcbd474c removed Robert's message box
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 19:03:06 +00:00
Vadim Zeitlin
c1c4c5516c fixed unwanted owner data accesses in virtual list ctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 18:18:17 +00:00
Vadim Zeitlin
93488eee91 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 15:12:33 +00:00
Stefan Csomor
71789654c7 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 06:54:30 +00:00
Vadim Zeitlin
91a62137b1 don't process enter as tab, there are many controls which want to process it themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-07 00:14:45 +00:00
Vadim Zeitlin
9948d31f4e changed wxControlContainer to avoid triggering tons of warnings from VC++ at
warning level 4 ("'this' : used in base member initializer list" is really
the stupidiest warning I've ever seen)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 22:50:28 +00:00
Václav Slavík
adfed1ca92 Unicodification of wxTextFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 22:40:57 +00:00
Václav Slavík
1facd32a75 Unicodification of wxTempFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 22:40:09 +00:00
Václav Slavík
6dabdbb43a why was generic wxNativeFontInfo code disabled for wxMGL?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 22:39:11 +00:00
Václav Slavík
fc1f212528 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 22:38:53 +00:00
Robert Roebling
159b66c02a Applied patch for wxComboBox and wxListBox to
prevent "hanging" in single selection mode.
    Also removed call to AddPendingEvent and
    changed wxLB_EXTENDED mode so that no changes
    to the listbox go unnoticed.
  I do wonder what the difference between multiple
    and extended list boxes actually are.
  Not suer what I changed in the other files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 21:06:13 +00:00
David Webster
1bcfc0e1b9 Some Updates for latest CVS.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 20:40:31 +00:00
Vadim Zeitlin
cdebf9851e use item colour when drawing the focused item if we don't highlight it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:49:37 +00:00
Vadim Zeitlin
837f2b6872 don't draw the focused item rect around the image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:29:47 +00:00
Vadim Zeitlin
c25f61f16a don't draw the selected item background if we don't have the focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:27:08 +00:00
Vadim Zeitlin
cdb3cffe0e don't draw the selected item background if we don't have the focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 19:12:13 +00:00
Vadim Zeitlin
42f96a884e don't allow TABbing to wxHtmlWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 18:59:57 +00:00
Vadim Zeitlin
0013a77bd1 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 18:53:55 +00:00
Stefan Csomor
c1fb8167e9 corrected mac src due to new api changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 15:57:14 +00:00
Vadim Zeitlin
6b55490abd 1. slightly changed how wxControlContainer is used
2. use it now for wxSplitterWindow too
3. don't compile wxIdleEvent in !wxUSE_GUI mode (why was it done?)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 12:55:04 +00:00
Vadim Zeitlin
a86253375b added another small test for wxTimeSpan::Format
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 12:24:29 +00:00
Vadim Zeitlin
cbca994306 added wxUSE_SPLASH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 12:19:35 +00:00
Vadim Zeitlin
dd0705221e wxBase compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 12:18:03 +00:00
Vadim Zeitlin
47606d3612 added wxUSE_SPLASH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 12:13:48 +00:00
Vadim Zeitlin
24a7a1980f fixed infinite recursion in SetFocus()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 12:12:32 +00:00
Vadim Zeitlin
003d347f8d regenerated to include src/common/containr.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 11:58:42 +00:00
Vadim Zeitlin
1f8b8785bf bug in SetLastFocus corrected
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 11:58:05 +00:00
Vadim Zeitlin
6285be7223 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 11:57:23 +00:00
Vadim Zeitlin
5314ac16c5 compilation fix (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 11:48:00 +00:00
Vadim Zeitlin
dad5f99acb pragma fix for gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 11:43:04 +00:00
David Webster
8d7ddd0264 Updates to fix statusbar and menu errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 02:37:13 +00:00
Vadim Zeitlin
456bc6d9b8 moved knd handling logic from wxPanel to wxControlContainer (sorry for
the dull name Julian ;-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-06 00:49:59 +00:00
Vadim Zeitlin
ec4f95c40f added empty and unused wxTLW - to be used later
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 22:40:41 +00:00
Robert Roebling
cf19b0bd25 Patch that should prevent problem with interference
between dragging the scrollbat thumb and normal
    mouse events. Also, thumb-release event are now
    sent from wxScrollWindow. Neither has been tested,
    but the same code works in wxWindow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 21:40:30 +00:00
Gilles Depeyrot
fbb24934df removed useless include (already in glcanvas.h)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 16:39:03 +00:00
Gilles Depeyrot
b3c406a529 added include for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 16:37:32 +00:00
Gilles Depeyrot
c107c21e73 corrected includes for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 16:34:37 +00:00
Gilles Depeyrot
581acb9180 corrected conditional compilation for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 16:32:48 +00:00
Vadim Zeitlin
a37d422a66 fixed processing of the implicit wxTextCtrl accelerators (Ctrl-C/V/X)
without breaking all the others by using a new MSWShouldPreProcessMessage()
function


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 15:07:28 +00:00
Vadim Zeitlin
2a3caeb594 fixed kbd handling in wxFindReplaceDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-05 14:13:28 +00:00
Václav Slavík
fe6b43a36e reverted my Set/getTitle change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-04 22:36:19 +00:00
Václav Slavík
b496583bb1 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 20:26:24 +00:00
Václav Slavík
9d59f1fc2e once again forgot about this OS/2 strangeness
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 20:26:04 +00:00
Vadim Zeitlin
572aeb7789 fix for infinite recursion in UpdateFontIfNeeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 17:19:55 +00:00
Vadim Zeitlin
46c87a9a8a compilation error fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 16:26:05 +00:00
Stefan Csomor
5291a2bc63 added gaugecmn
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 16:02:09 +00:00
Julian Smart
72c094d9d3 Added missing Makefile names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 15:20:35 +00:00
Vadim Zeitlin
0ebdf9fa8b no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 14:50:41 +00:00
Vadim Zeitlin
9f39393d9e failed attempt to change the default action for GTK dnd (nothing changed finally)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-03 13:24:23 +00:00
Václav Slavík
a467ac36a5 Set/GetTitle out of wxWindowBase, forked and put to gtk/window.h and mgl/window.h (and no, we can't get rid of them completely unless Vadim stops using them in wxUniv)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 23:46:38 +00:00
Václav Slavík
a264ece2c5 Set/GetTitle out of wxWindowBase, forked and put to gtk/window.h and mgl/window.h (and no, we can't get rid of them completely unless Vadim stops using them in wxUniv)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 23:32:27 +00:00
Václav Slavík
a643192e96 fixed docs to accomodate more strict wxHTML Help controller
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 23:31:49 +00:00
Robert Roebling
4f5fffcc74 Fix tree control invalid pointer after drag bug.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 21:37:15 +00:00
Vadim Zeitlin
208c51418f compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 20:15:33 +00:00
Vadim Zeitlin
3e7fb236ea remember unknown charsets in the config too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 19:20:47 +00:00
Vadim Zeitlin
bf9b6266fa applied patch 446014 (misc mingw fixes from Mattia)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 19:02:17 +00:00
Vadim Zeitlin
4acb6ca672 applied patch 446010 (unicode compilation fixes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 18:59:50 +00:00
Vadim Zeitlin
18dbb1f630 applied patch 446009 (DLL cross compilation using mingw32)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 18:58:52 +00:00
Vadim Zeitlin
f1c03ec955 removed wxYield call from wxBusyCursorSuspender
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 18:26:06 +00:00
Julian Smart
aaab8586fe Corrections to the VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 17:20:38 +00:00
Julian Smart
5648c0ad51 Removed memory leak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 17:16:56 +00:00
Vadim Zeitlin
733e8cf36e compilation fix for cygwin/old mingw32 (patch 446700)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 14:57:02 +00:00
Robin Dunn
7ba5a665ac Don't send a focus event if the window is a wxTextCtrl, since it sends
it's own focus event later on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 03:06:24 +00:00
Robin Dunn
ab93a576f4 Don't send a focus event if the window is a wxTextCtrl, since it sends
it's own focus event later on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 03:01:14 +00:00
Robin Dunn
c0ce1b0339 compilation fix for VC++
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 02:48:01 +00:00
Robin Dunn
ddab9f80c8 changed Replace and Remove to always use EM_REPLACESEL instead of
going through the clipboard


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-02 02:34:44 +00:00
Václav Slavík
3034199797 documented changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 23:07:08 +00:00
Václav Slavík
6b076b4034 SHARED_LD must be CXX, not CC, otherwise we get unresolved
externals (at least with gcc3) if app binary wasn't linked with CXX. This may
happen for instance when dynamically loading wxPython module.
(Let's change it for all platforms, not only Linux, and see what happens.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 23:06:46 +00:00
Václav Slavík
ff292c7b5b fixed MGL files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 23:06:01 +00:00
Václav Slavík
a4bbc9f720 wxMGL update (no, it still doesn't work, I'm backuping it just in case my disk burns)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:57:11 +00:00
Václav Slavík
57d677d15e more tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:56:40 +00:00
Václav Slavík
27523ad052 added tracing of strconv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:56:24 +00:00
Václav Slavík
3a0d76bc6f hopefully fixed bytesex issues in strconv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:56:12 +00:00
Václav Slavík
83c9da455a fixed <pre> handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:56:02 +00:00
Václav Slavík
7a0166faad fixed mgl.t to not include paletteg.o (hey, reading these templates is better than Cryptonomicon...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:55:02 +00:00
Václav Slavík
04d34b6782 fixed MGL files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:54:54 +00:00
Václav Slavík
5620d8de24 added mgl.t to makeall.sh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:54:43 +00:00
Václav Slavík
a04eec8792 added bmpbase.cpp (forgotten during merge?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:54:24 +00:00
Václav Slavík
2119e28084 fixed overrestrictive test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:50:49 +00:00
Václav Slavík
2b92b572ac compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:50:31 +00:00
Václav Slavík
94fa33a0ed compilation fix (Vadim, is this correct?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 22:50:20 +00:00
Julian Smart
ed45cddc9a This time, changed the correct release script.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 16:59:09 +00:00
Julian Smart
99ed18be8a Added progress dialog to project files; changed version in release script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 16:58:20 +00:00
Vadim Zeitlin
e09bdfbea6 applied patch 432202 (allow installing in already existing directories)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 15:29:30 +00:00
Vadim Zeitlin
d84d25dd93 applied patch 441270 (fix cygwin wxSplashScreen compilation)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 15:03:04 +00:00
Vadim Zeitlin
6788ecb8a9 applied patch 444915 (warning fixes for gcc 2.95.4)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 15:00:33 +00:00
Vadim Zeitlin
baff4ae246 added wxUSE_FINDREPLDLG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 14:57:32 +00:00
Vadim Zeitlin
8db37e0699 added generic implementation and documentation for wxFindReplaceDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 14:55:03 +00:00
Vadim Zeitlin
22670da422 added tests for ScrollLines/Pages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 14:53:59 +00:00
Vadim Zeitlin
d71c52c471 removed KLB mods - but I'm doing this for the last time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 11:45:20 +00:00
Vadim Zeitlin
9ac1d38b32 removed duplicate typedef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 11:24:30 +00:00
Vadim Zeitlin
761989ffb5 Vain attempts to make kbd navigation work inside find/replace dialog - it
still doesn't. But at least the dialog itself does work now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-08-01 02:29:35 +00:00
Václav Slavík
711c76db49 wxWindowBase remembers title/label now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 22:44:30 +00:00
Václav Slavík
b2a19d941d wxMGL compilation fix that I forgot to chekc in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 22:36:29 +00:00
Václav Slavík
3d474bbc2a friend class fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 22:36:00 +00:00
Václav Slavík
c7e9e7584f fixed friend class declaration (why the hell did somebody fix it only for his compiler?!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 22:34:52 +00:00
Robin Dunn
8215f84b5c Fixed "Failed to set clipboard data. (error 1418: thread does not have
a clipboard open.)" error when using wxTextCtrl::Replace


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 21:30:30 +00:00
Vadim Zeitlin
c41b00c9f5 started applying patch 410826
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 21:29:36 +00:00
David Webster
834999c248 Added regex to the build. New .def file for .dll builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 20:57:01 +00:00
David Webster
03d32695dd TRUE instead of true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 20:56:17 +00:00
Vadim Zeitlin
817ec43a71 fixed compilation [warning]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 17:58:21 +00:00
Vadim Zeitlin
ad0bae85d8 declare and define wxEVT_COMMAND_TEXT_UPDATED even if wxUSE_TEXTCTRL == 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 17:56:45 +00:00
Kendall Bennett
d699f48ba3 Latest updates from SciTech code tree including numerous warning fixes for
the Watcom and other compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-31 17:50:16 +00:00
Robin Dunn
ac6f6ffccf Applied patch #445873
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-30 21:37:56 +00:00
Vadim Zeitlin
9cd6d737d5 1. made ScrollLines/Pages return bool indicating if we scrolled till the
end or not
2. implemented them for wxGTK text ctrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-30 15:22:38 +00:00
Vadim Zeitlin
68a9ef0ef0 eliminated flicker when selecting items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-30 13:47:22 +00:00
Vadim Zeitlin
78bcfcfcb6 compilation fixes for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-30 11:18:12 +00:00
Vadim Zeitlin
c0cdd6ccd0 implemented ScrollLines/Pages; fixed bug in Thaw()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 23:00:27 +00:00
Vadim Zeitlin
70e8189368 documented ScrollLines/Pages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 22:51:06 +00:00
Vadim Zeitlin
b9b3393e48 added ScrollLines/Pages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 22:47:40 +00:00
Vadim Zeitlin
c57e33394c 1. added wxTE_AUTO_URL style and support for it under Win32 (and brief
mention in docs and tests in the sample)
2. moved wxTextCtrl-specific stuff from defs.h/event.h to textctrl.h


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 22:40:21 +00:00
Vadim Zeitlin
94589c3f4f compilation fix for recent commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 22:20:50 +00:00
Vadim Zeitlin
a0e449ff41 added Freeze/Thaw implementation for Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 21:22:12 +00:00
Robin Dunn
4f3449b432 Added context help stuff to wxPython
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-29 03:06:02 +00:00
Václav Slavík
d32cad2cce wxMGL compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 22:40:02 +00:00
Václav Slavík
386c70583a wxMGL compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 22:39:51 +00:00
Robin Dunn
10be44acb0 Various tweaks, fixes, and additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 03:29:34 +00:00
Robin Dunn
3a0958b165 Various tweaks, fixes, and additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 03:12:32 +00:00
Robin Dunn
5597b61e54 Fixed resource leak for wxListItem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 03:10:39 +00:00
Robin Dunn
30cd05ed0e The installer should also check HKCU for the python install dir, since
ActivePython will use that key.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 03:07:18 +00:00
Robin Dunn
2f9be7879e A couple fixes for the demo, and some code to show a bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 03:06:02 +00:00
Robin Dunn
afc2b641d3 A couple off-by-one fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-28 02:57:53 +00:00
Vadim Zeitlin
82dfea7723 mingw32/cygwin compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-27 20:05:07 +00:00
Vadim Zeitlin
71ec83d2fd don't crash when invalid colour is set as fg/bg colour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-27 13:30:16 +00:00
Julian Smart
b6b85bdccb Added fix to send scroll messages from mouse wheel instead of scrolling directly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-27 10:07:46 +00:00
Robin Dunn
f35719ef1d Added some WXDLLEXPORTs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-27 02:54:19 +00:00
Vadim Zeitlin
6d477bb459 (bad) fix for asserts and OnIdle events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 18:40:25 +00:00
Vadim Zeitlin
c0f8674c79 forgotten method declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 18:39:36 +00:00
Vadim Zeitlin
0b165ed6b2 made the log dialog resizeable (again?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 16:45:41 +00:00
Vadim Zeitlin
0e980f9109 highlight the focused item in non report mode too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 16:33:19 +00:00
Vadim Zeitlin
a95cdab85c fix for (re)positioning the main window when the style changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 16:19:27 +00:00
Vadim Zeitlin
69c916e921 avoid nested modal log dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 15:26:02 +00:00
Vadim Zeitlin
9fe52545f5 test for wxLog interaction with wxYield better
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 15:09:35 +00:00
Vadim Zeitlin
406a6f6b65 *really* suppress log messages from inside wxYield
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 13:21:34 +00:00
Robert Roebling
ec7482df8b Fixed problem with missing refresh in wxScrolledWindow::
SetScrollbars().


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 11:32:03 +00:00
Vadim Zeitlin
1ff4714de0 respect SetFont/SetXXXColour in wxTextCtrl even when using styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 09:58:19 +00:00
Vadim Zeitlin
1f4774338e don't do anything in SetBackgroundColour() if colour is invalid
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 09:24:36 +00:00
Vadim Zeitlin
3a57b93d37 timestampt trace/debug messages under Unix too, this is useful for debugging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 09:06:35 +00:00
Vadim Zeitlin
eff005236d added demo of the difference Freeze/Thaw makes in wxTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 08:59:00 +00:00
Vadim Zeitlin
0cc7251efe added wxWindow::Freeze/Thaw(), implemented them for wxGTK::wxTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-26 08:33:53 +00:00
Vadim Zeitlin
d6ddcd574b fix for focus handling when deleting the items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-25 16:13:32 +00:00
Julian Smart
37dd872003 Tweaks to fl project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-25 13:17:35 +00:00
Vadim Zeitlin
2b96d0fb4b compilation warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-24 19:33:55 +00:00
Vadim Zeitlin
6853365e97 reverted my previous change to WINVER - it is already defined elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-24 17:08:28 +00:00
Vadim Zeitlin
974e72ccbb fixed compilation problem with multiple Update()s
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-24 16:19:46 +00:00
Julian Smart
8e08b761b0 Added fl (frame layout) to wxWindows, from source tidied by Hans Van Leemputten <Hansvl@softhome.net>.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-24 15:27:12 +00:00
Gilles Depeyrot
3c85ada9db renamed Number method (should be GetCount)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 20:11:12 +00:00
Vadim Zeitlin
cc4a1ce1f5 fixed bug with wxPathExists('c:\') yet again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 18:17:28 +00:00
Vadim Zeitlin
f925f24de8 don't process VK_OEM_XXX key presses
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 18:13:36 +00:00
Vadim Zeitlin
2dace059ee use Windows standard icons instead of our own (patch 443856)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 18:06:13 +00:00
Vadim Zeitlin
aba4387c4c added test for writing empty value to the config
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 17:46:15 +00:00
Vadim Zeitlin
0516e0e8ec 1. fixed bug with empty value not being written to the file
2. moved ConfigEntry/Group into .cpp from .h and renamed them to wxXXX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 17:45:56 +00:00
Vadim Zeitlin
34bbbc276d don't call wxYield() from EnsureVisible(), this is too dangerous - and unnecessary as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 15:54:41 +00:00
Vadim Zeitlin
91c6cc0e71 fixed bug with deletion of several last items in wxListCtrl, added tests for it in the sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 14:57:01 +00:00
Vadim Zeitlin
d9ff0f91fb added and documented wxDir::HasFiles/SubDirs(), use the latter in wxDirDialog - it is several orders of magniture faster than wxFindFirstFile!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-23 13:28:39 +00:00
Gilles Depeyrot
8f99a08fc0 correction for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 20:26:08 +00:00
Gilles Depeyrot
e177af73aa corrected pragma interface/implementation (clash with wxWindows library)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 20:25:27 +00:00
Gilles Depeyrot
d7d38ea412 fixed wxListBox inheritance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 20:05:15 +00:00
Gilles Depeyrot
24176f2c11 added property sheet option
corrected tree layout option
corrected samples list configuration


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 19:36:05 +00:00
Gilles Depeyrot
bfde68e43f added tree layout define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 18:07:19 +00:00
Gilles Depeyrot
d8eccedebe corrected conditional compilation tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 18:06:09 +00:00
Gilles Depeyrot
f2828b3910 post wxUniv merge fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 17:21:59 +00:00
Gilles Depeyrot
249af79837 post wxUniv merge fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 17:15:14 +00:00
Gilles Depeyrot
8073eb4044 post wxUniv merge fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 17:09:23 +00:00
Gilles Depeyrot
b142515e79 corrected pragma interface/implementation for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 17:03:06 +00:00
Gilles Depeyrot
5af4b77ff3 added missing conditional compilation test for MSW specific events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 17:00:57 +00:00
Gilles Depeyrot
721a4a08bc added dependency handling to Makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 15:05:53 +00:00
Gilles Depeyrot
cb71207424 corrections for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:57:47 +00:00
Gilles Depeyrot
73486557c0 ignore files produced by CodeWarrior
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:50:50 +00:00
Gilles Depeyrot
e195c8c95f correction for Mac OS compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:23:55 +00:00
Gilles Depeyrot
1197380cfa added dependency handling to Makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:19:42 +00:00
Gilles Depeyrot
a132a1c810 correction for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:10:45 +00:00
Gilles Depeyrot
0147a7c140 post wxUniv merge fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:09:23 +00:00
Gilles Depeyrot
685aded8fd corrections for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:08:55 +00:00
Gilles Depeyrot
8b2a4e0c1a added dependency handling to Makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:06:10 +00:00
Gilles Depeyrot
1297ecfe31 removed inexistant header files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 13:52:52 +00:00
Vadim Zeitlin
7ba166dd9e compilation fix for old broken Borland compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 12:06:46 +00:00
Vadim Zeitlin
d7926e0b76 backported fix for proper tree ctrl refershing after changing item colour/font from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 01:28:18 +00:00
Gilles Depeyrot
39e808c3a1 replaced hardcoded wxgtk_gl library with appropriate configure macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 06:51:11 +00:00
Gilles Depeyrot
a46ccc25b4 added WX_TARGET_LIBRARY_GL to recursive configure substitutions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 06:48:40 +00:00
Gilles Depeyrot
9df06f5b69 added wxWindows shared library to link of OpenGL wxWindows shared library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 06:47:48 +00:00
Gilles Depeyrot
7b6058cd87 corrected bad Darwin related configure test
implemented OpenGL configuration for Mac OS X
added WX_TARGET_LIBRARY_GL to config cache


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 06:45:33 +00:00
Gilles Depeyrot
689471fc3a added DEP_INFO_FLAGS to compilation options
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 06:42:20 +00:00
Gilles Depeyrot
1d8729431c corrections for wxGtk compilation under Darwin/Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 05:32:09 +00:00
Gilles Depeyrot
057d323c63 added missing conditional compilation test for wxUSE_PROPSHEET
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 05:23:06 +00:00
Gilles Depeyrot
4b6480c8eb minor changes to correct compilation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-21 05:19:25 +00:00
Vadim Zeitlin
5fe143dfdf fix for rather mysterious problem when deleting the list ctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 20:54:17 +00:00
Gilles Depeyrot
2350e91520 post wxUniv merge fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 18:46:55 +00:00
Gilles Depeyrot
a6c1aa9027 post wxUniv merge fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 18:44:10 +00:00
Vadim Zeitlin
32a87ae7b5 applied numpad keys patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 14:35:39 +00:00
Václav Slavík
eaf1a1d902 fixed entities parsing under win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 12:33:32 +00:00
Václav Slavík
0d58bb6578 oops, forgot to fix wxHtmlTag dtor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 12:32:50 +00:00
Vadim Zeitlin
0510b4bbee test for __WIN95__ in the main header, not platform-sepcific one for consistency with the other classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 11:59:46 +00:00
Vadim Zeitlin
3f0f016135 define WINVER for mingw32 cross compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 11:58:54 +00:00
Vadim Zeitlin
ff3d11a0ab implemented EVT_LIST_CACHE_HINT support: send this message from OnPaint() now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 11:12:34 +00:00
Vadim Zeitlin
e3c7fd79d0 fixed three new warnings after the last warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 08:56:27 +00:00
Vadim Zeitlin
3c8c8da2aa fixed a warning and detabified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 08:55:08 +00:00
Vadim Zeitlin
f7ba097de4 made 2 column list wider to accomodate all entries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 08:48:41 +00:00
Vadim Zeitlin
6465d4013d replaced literal backslashes with backslash TeX macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 08:47:48 +00:00
Vadim Zeitlin
8a5b9745fb fixed crash in XPM decoder when reading non XPM files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 01:18:08 +00:00
Vadim Zeitlin
e623926d63 filter out garbage Windows sends us via LVN_ODCACHEHINT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 01:00:21 +00:00
Vadim Zeitlin
614391dc08 added EVT_LIST_COMMAND_CACHE_HINT, implemented it for MSW and test in the sample; briefly documented virtual list control fucntionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-20 00:25:09 +00:00
Vadim Zeitlin
481c879b8e VC++ warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 23:43:40 +00:00
Václav Slavík
211dfeddfc new wxHtmlParser core and changes implied by it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 22:31:00 +00:00
Václav Slavík
6c62a62bf7 new wxHtmlParser core
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 22:30:22 +00:00
Vadim Zeitlin
0f2ecc913b FreeBSD compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:54:49 +00:00
Vadim Zeitlin
cd0401c85e fixed some warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:52:26 +00:00
Vadim Zeitlin
850ed6e7b0 1. don't delete item attributes in the virtual list control (=> crash)
2. refresh the window after deleting all items


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:50:40 +00:00
Vadim Zeitlin
2131b89d2c added test for THREADS if JOYSTICK is set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:49:55 +00:00
Vadim Zeitlin
dc38e51504 don't remove lib/wx when making clean
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:48:59 +00:00
Vadim Zeitlin
7737c485f3 made SetPriority docs more clear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:47:12 +00:00
Vadim Zeitlin
6ff77d3395 fix for missing wxUSE_DARWIN definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 20:44:34 +00:00
Vadim Zeitlin
2f919f9988 fixes to version string
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 13:51:29 +00:00
Vadim Zeitlin
a7adaedae8 1. compilation fixes
2. don't quote special characters inside verbatim environment


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 13:44:57 +00:00
Vadim Zeitlin
dee5b92f9c fix for custom bitmap setting for the first page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 12:29:02 +00:00
Vadim Zeitlin
5ef298b3c7 minor fixes, added an example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 01:07:56 +00:00
Vadim Zeitlin
2d290a9237 fixed compilation problem inwith ^
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-19 00:44:11 +00:00
Václav Slavík
6bedf83dec removed debug printfs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:01:54 +00:00
Václav Slavík
9eeca6dfe8 fixed ugly stupid piece of code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:01:43 +00:00
Václav Slavík
00393283ff Unicode complation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:01:31 +00:00
Václav Slavík
cd99221a57 - fixes warnings with mingw crosscompilation
- fixes for missing _t functions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:00:30 +00:00
Václav Slavík
8079468d4d Mingw Unicode fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:00:17 +00:00
Václav Slavík
a5940c66c7 Mingw Unicode fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 23:00:02 +00:00
Václav Slavík
55b2b0d80a Unicode fixes to wxCmdLineParser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 22:59:51 +00:00
Václav Slavík
031d8228bb (1) removed -lcrtdll from Mingw build
(it was plainly wrong thing, gcc is supposed to link against C library
automatically... and it broke binaries produced with MSVCRT version of Mingw)
(2) fixed typo in MS_HTML_HELP check
(3) added (back?) WXHTML_HELP checks to configure


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 22:58:33 +00:00
George Tasker
a43e748a70 Fixed some "\_"s in verbatim blocks so they are no longer quoted with backslashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 22:00:03 +00:00
George Tasker
e4941e3d12 Fixed closing of program to work properly if PASS #1 failed for some reason. Before this fix, you could not exit the GUI version of the program under windows without using CTRL-ALT-DEL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 21:04:36 +00:00
George Tasker
1156efc1c4 Fixed mismatched curley brace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-18 20:47:23 +00:00
Vadim Zeitlin
63617fb55d initialize gs_pFrame to NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 22:21:01 +00:00
Vadim Zeitlin
2feed0044e blind fix for wxScrolledWindow problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 22:01:00 +00:00
Vadim Zeitlin
32a2fbc868 fixed regex bug in ProcessFamiliesFromFontList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 18:14:04 +00:00
Julian Smart
b642d4570d Correction to icon index code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 16:27:36 +00:00
Julian Smart
ff9aab3c75 Added support for extracting icon using specified index
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 15:49:43 +00:00
Vadim Zeitlin
b121fa31ec added wxOPEN/SAVE flags to wxDefaultFileSelector
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 09:03:30 +00:00
Vadim Zeitlin
8d75348894 don't use static box as a parent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 08:27:42 +00:00
Vadim Zeitlin
f763782968 renamed wxDynamicThisCast to wxDynamicCastThis, removed 1st parameter, and documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 08:25:43 +00:00
Robin Dunn
8e673075f6 Added rules to build the regex library from the main makefile, if
needed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-17 00:18:51 +00:00
Vadim Zeitlin
11ec1f16f8 wxRegEx docs I forgot to add before (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 22:54:14 +00:00
Robin Dunn
2c8a649d7a Some tweaks and generated core sources for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 22:52:01 +00:00
Vadim Zeitlin
1255525b5a compilation fix I had forgot to commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 18:07:30 +00:00
Robin Dunn
6fea4a7a22 fixed compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 17:48:14 +00:00
Vadim Zeitlin
f1d7cbac43 speed up font list processing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 15:23:04 +00:00
Vadim Zeitlin
53997bc265 removed assert which could be provoked by correct code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 15:17:09 +00:00
Robert Roebling
f0d53ebfb2 Added missing methods. Now tested.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 14:27:16 +00:00
Robert Roebling
c4c1fab955 Added missing methods. Not yet tested.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 09:42:37 +00:00
Robert Roebling
1348e1a5d9 Added symptomatic fix to wrong height in wxStaticText.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 08:20:13 +00:00
Robert Roebling
23d416bfc4 Tried to make button events interceptable in generic wxSpinCtrl. No luck.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 07:58:15 +00:00
Robert Roebling
0d9e47578e Fixed small prob with wxSpinButton orientation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-16 07:38:44 +00:00
Gilles Depeyrot
f5c6eb5c17 modified configure to allow configuration of wxMotif under Darwin/Mac OS X
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 21:12:31 +00:00
Gilles Depeyrot
0cbb929795 modified configure to allow configuration of wxMotif under Darwin/Mac OS X
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 21:07:34 +00:00
Gilles Depeyrot
6e040042ba modified configure to allow configuration of wxMotif under Darwin/Mac OS X
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 21:04:44 +00:00
Robert Roebling
2cc7838931 Up-ported code to make tree item visible when programmatically
selected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 19:36:25 +00:00
Gilles Depeyrot
f11bdd03b9 modified configure to allow configuration of wxMotif under Darwin/Mac OS X
wxWindows can be configured as wxMac or wxMotif under Mac OS X
replaced __WXMAC_X__ define by __DARWIN__ (general Darwin related issues)
moved dlopen/dlerror code to dynlib.cpp to make it available for wxMotif


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 18:47:13 +00:00
Gilles Depeyrot
ee65598f95 added common regex
added missing dependency files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 10:45:31 +00:00
Stefan Csomor
626094e251 committed - just to be sure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 10:11:49 +00:00
Stefan Csomor
954fc50b6e no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 10:06:50 +00:00
Stefan Csomor
acc0ebd7a8 added new project file having the new files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-15 10:02:38 +00:00
Vadim Zeitlin
dccde0c023 bug fix to the recent wxConvertFromMSW change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 21:18:23 +00:00
Vadim Zeitlin
8dff2b5cf8 use LVM_SETITEMSTATE instead of LVM_SETITEM for virtual controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 21:01:43 +00:00
Vadim Zeitlin
784164e176 blind fix for clearing font attributes in SetStyle()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 20:39:26 +00:00
Vadim Zeitlin
bb6e7c1833 removed obsolete comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 20:38:56 +00:00
Robert Roebling
9aad97fdcc Minor beautification of wxToolBar under Mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 18:49:06 +00:00
Robert Roebling
c10f20703e Corrected wxScrolledWindow's OnSize behaviour.
Formated code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 18:12:40 +00:00
Robert Roebling
9a26801874 Corrected wxScrolledWindow's OnSize behaviour.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11050 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 18:11:52 +00:00
Vadim Zeitlin
11eff56a7a merged NULL wxFrame parent HWND fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 17:41:40 +00:00
Vadim Zeitlin
84c5b38d57 merged MapBitmap() from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 17:37:55 +00:00
Vadim Zeitlin
706c2ac9da use wxRegEx if available in wxString::Matches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 16:41:55 +00:00
Vadim Zeitlin
8fb2999a85 added wxRegEx docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 16:41:18 +00:00
Vadim Zeitlin
765624f735 rewrote wxRegEx::Replace() to do something useful
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 16:13:32 +00:00
Robert Roebling
dcf0fce44b Restored wxFileName::GetFullPath()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 14:29:09 +00:00
Robert Roebling
2985ad5dee wxIsAbsolutePath was correct.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 14:28:28 +00:00
Robert Roebling
ef70f0ecdb Mac-ify wxTreeCtrl further.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 14:27:25 +00:00
Robert Roebling
53e46b61bb Fix HTML help on Mac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 14:26:27 +00:00
Robert Roebling
057b55b016 AddBook ignores wxMac paths (still won't work)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 11:29:26 +00:00
Robert Roebling
678c48b37d wxIsAbsolutePath is strange under wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 11:28:26 +00:00
Julian Smart
b6eefb739d Reverted my bad <> -> "" fix, sorry; updated project files.
Probably regex should have it's own .dsp file :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 09:02:42 +00:00
Robin Dunn
0adbc1660e Number() to GetCount() and other changes needed for wxPython to
compile with current CVS.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 03:37:47 +00:00
Robin Dunn
257ed895d5 Made a couple Number() to GetCount() changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 03:27:03 +00:00
Robin Dunn
ea37d8580d Added wxUSE_WAVE to setup0.h and checked for it in wave.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 03:25:40 +00:00
Robin Dunn
b342f8f0a6 Added RTTI macros to wxToolTip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 03:23:30 +00:00
Vadim Zeitlin
d935f23cef fixed VC++ warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 02:03:40 +00:00
Vadim Zeitlin
a7f560a2cb implemented RefreshItem(s) under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 02:03:23 +00:00
Vadim Zeitlin
f008af1635 fixed setting/attaching menubar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 02:02:58 +00:00
Vadim Zeitlin
491c9920d0 fixed crash in ~wxHtmlCell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-14 02:02:09 +00:00
Vadim Zeitlin
4d01e58361 documented wxInitialize and wxUnitialize
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 23:43:49 +00:00
Robin Dunn
edd03296af fixed missing package dir
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 23:29:13 +00:00
Vadim Zeitlin
2bb1aac768 added regex to all the templates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 23:16:12 +00:00
Vadim Zeitlin
d2be31386c added popupcmn.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 21:09:20 +00:00
Stefan Csomor
9f92f6fbab corrected check string handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 20:58:14 +00:00
Vadim Zeitlin
6fe8b15355 popupcmn is needed by wxGTK too, why was it excluded?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 20:54:06 +00:00
Vadim Zeitlin
ec2182c646 corrected object file extension in the makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 20:40:31 +00:00
Vadim Zeitlin
1a6cb56fb5 added RefreshItem(s) methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 20:09:44 +00:00
Julian Smart
770dba7a7b Changed <> to "" to help inclusion; added regex files to VC++ project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 19:34:06 +00:00
Vadim Zeitlin
491b5be830 added wxListView class: this is going to be a wxListCtrl with human (inter)face
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 19:26:44 +00:00
Vadim Zeitlin
6a6fd3e2b7 removed forgotten debugging printf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 19:14:28 +00:00
Vadim Zeitlin
02595b2825 renamed main.c to re_main.c to avoid clashes with main.cpp in VPATH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 19:08:59 +00:00
Vadim Zeitlin
208750a561 added wxUSE_REGEX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 18:59:12 +00:00
Vadim Zeitlin
2bda9cc854 regenerated the makefiles to include regex.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 18:56:33 +00:00
David Webster
893758d507 OS/2 fixes for this week.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:42:49 +00:00
David Webster
2e57a9efc5 true vs TRUE again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:42:16 +00:00
David Webster
6835592c5c OS/2 Updates for this week.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:41:54 +00:00
Vadim Zeitlin
08e0d1cc8b changes for building wxRegEx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:35:05 +00:00
Vadim Zeitlin
c88597ef26 added some makefiles (untested)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:30:55 +00:00
Vadim Zeitlin
a553cb8bc6 added notes about wxRegEx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:15:10 +00:00
Vadim Zeitlin
07a56e452b added tests for wxRegEx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:12:23 +00:00
Vadim Zeitlin
f94d2a3718 added regex.h/.cpp files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:11:50 +00:00
Vadim Zeitlin
0b2effe954 fixes for wxBase build with configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:10:54 +00:00
Vadim Zeitlin
c540684f0f fixed yet another typo, now it finally works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:10:20 +00:00
Vadim Zeitlin
00e6c2bd41 added wxRegEx::GetMatch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 17:10:00 +00:00
Vadim Zeitlin
e7208277c1 wxRegEx class added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 16:17:43 +00:00
Vadim Zeitlin
96969ad7e5 incorrect warning fix fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 14:35:30 +00:00
Julian Smart
4624defaf9 Fixed typo in cache management code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 14:21:42 +00:00
Vadim Zeitlin
f7ba889914 fixed back compilation with REDEBUG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 14:17:15 +00:00
Vadim Zeitlin
f8fea431d2 more warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 14:13:20 +00:00
Vadim Zeitlin
1f0db2d994 a couple of warnings removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 14:02:05 +00:00
Vadim Zeitlin
8b70ca2666 added headers needed for wxBase compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 13:52:19 +00:00
Vadim Zeitlin
8ca28fb797 fix for wxBase compilation (misplaced #if wxUSE_GUI)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 13:51:57 +00:00
Vadim Zeitlin
831b3152e8 fixed wxBase makefile generation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 13:51:32 +00:00
Vadim Zeitlin
5a41989248 Initial revision
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 13:31:22 +00:00
Vadim Zeitlin
3e44f09d77 added detection of regex support to configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 13:13:59 +00:00
Vadim Zeitlin
4d24ece719 removed incorrect 'static' keyword from var declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 12:32:48 +00:00
Julian Smart
c7b3692e2b Updated BC++ patch URL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-13 10:09:20 +00:00
George Tasker
e262868d43 ::Catalog() function was failing against several databases as the PRECISION and LENGTH values returned were larger (more bytes) than the variable that was bound for holding the returned value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 19:22:49 +00:00
Vadim Zeitlin
2c40e41c4e fixed crash in wxRegion::Empty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 16:23:58 +00:00
Jouk Jansen
0f02d3d0ec Committing in .
Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/appcmn.cpp
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/propform.cpp
 	wxWindows/src/gtk/descrip.mms
 	wxWindows/utils/dialoged/src/winstyle.cpp

  -Fixed VMS compile support
  -added some include's
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 15:02:40 +00:00
Julian Smart
f0a6b1cd6c Corrected DoBlit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 10:37:27 +00:00
Vadim Zeitlin
93d4c1d03b fixed VC++ warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 00:08:53 +00:00
Vadim Zeitlin
63166611fb implemented attributes support for native virtual list control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 00:06:48 +00:00
Vadim Zeitlin
6beb85c0d3 menu bar wasn't set properly internally after my previous change - fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-12 00:06:07 +00:00
Vadim Zeitlin
7d29741468 don't refresh the scrollbars unnecessarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 23:21:10 +00:00
Václav Slavík
29fd3c0cc1 fixed windows.h check and added checks for MS HTML Help
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 22:30:12 +00:00
Václav Slavík
0aa366f726 fixes for broken records
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 22:28:59 +00:00
Julian Smart
30b25d4e65 Compilo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 21:25:46 +00:00
Stefan Csomor
9453cf2bd7 several mac fixes (Mark Newsams patches)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 20:33:12 +00:00
Julian Smart
aef94d6860 Made DC cacheing less obstrusive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 20:22:44 +00:00
Julian Smart
2774804745 Removed cacheing option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 17:27:23 +00:00
Vadim Zeitlin
6c02c32922 added support for item attributes in virtual list control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 16:22:12 +00:00
Vadim Zeitlin
a5f1fd3e33 added and documented wxApp::OnAssert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 15:19:32 +00:00
Vadim Zeitlin
1e4d446b99 oops, restored the postpone-redraw-if-dirty test which was somehow left out
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 13:40:32 +00:00
Vadim Zeitlin
b84839aea9 (much) more efficient report mode redrawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 13:35:07 +00:00
Vadim Zeitlin
4a20e7568e documented wxLogChain and wxLogPassThrough classes and wxLog::DoLog/DoLogString methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 13:34:42 +00:00
Vadim Zeitlin
6c0e8b4ea5 moved some headers inside #ifndef WX_PRECOMP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 12:35:33 +00:00
Václav Slavík
0cd7d9b235 mingw compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 12:28:39 +00:00
Vadim Zeitlin
4e3ace6595 fixed hit testing for non report modes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 12:10:49 +00:00
Julian Smart
0cbff1201a Added wxUSE_DC_CACHEING and associated code to wxMSW
Added EnableCache, CacheEnabled to wxDCBase
Added mask source args to DoBlit, Blit
Added cache testing code to dragimag sample
Added wxSystemOptions, regenerated makefiles


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 10:07:06 +00:00
Vadim Zeitlin
03147cd08e added wxLogChain and wxLogPassThrough classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 09:43:40 +00:00
Vadim Zeitlin
86313763ba compilation fix for MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-11 07:37:06 +00:00
Václav Slavík
8f0db49cd2 compilation fix for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 22:48:27 +00:00
Václav Slavík
c9cdd31d81 #ifdefed wxPopupComboWindow to be used only in wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 22:46:27 +00:00
Václav Slavík
a8132cd4b1 1. #ifdefed wxPopupComboWindow to be used only in wxUniv
2. compilation fix for wxPopupWindowHandler::OnLeftDown (somehow I doubt this will work w/o wxUniv...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 22:46:18 +00:00
Václav Slavík
d4158b5d93 added check for w32api.h to configure (so that libjpeg works when cross-compiling)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 22:39:58 +00:00
Václav Slavík
b0bdbbfe11 fixes for tables renderer: now recognizes missing border property correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 22:38:21 +00:00
Robin Dunn
e83991bf89 little tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 18:12:27 +00:00
Vadim Zeitlin
fd7718b28c made wxLog::Set/GetVerbose() static back again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 17:33:53 +00:00
Vadim Zeitlin
bf188f1add added cmd line parsing support to wxApp and --theme option to wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 17:28:19 +00:00
Vadim Zeitlin
a5bb60ce35 added wxUSE_CMDLINE_PARSER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 16:46:54 +00:00
Vadim Zeitlin
2407b388de added #if wxUSE_CMDLINE_PARSER around the header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 16:44:15 +00:00
Vadim Zeitlin
89e7a223c2 more combobox appearance fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 15:42:51 +00:00
Vadim Zeitlin
085a1f3cd9 oops, missing semi colon added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 15:18:47 +00:00
Vadim Zeitlin
cc7343106d fix for crash when clicking below the items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 15:16:55 +00:00
Vadim Zeitlin
24e78d272a moved WX_USE_THEME macros inside IMPLEMENT_APP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 15:14:57 +00:00
Vadim Zeitlin
e4606ed9d0 wxComboBox appearance fixes, looks fine now but doesn't really work under GTK
yet


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 15:07:52 +00:00
Vadim Zeitlin
1b4651028a respect wxBU_EXACTFIT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 14:03:49 +00:00
Vadim Zeitlin
1b488c0eeb don't set min width for the buttons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 14:00:26 +00:00
Vadim Zeitlin
7ef8bfc4c7 added wxBU_EXACTFIT style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 13:44:04 +00:00
Vadim Zeitlin
2b0ba7ee71 made the button of correct size again (Robert, why did you comment this out??)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:59:48 +00:00
Vadim Zeitlin
16bdba2cd2 use system colours under Windows (patch 439286)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:58:11 +00:00
Vadim Zeitlin
bcc0da5ce3 argh, another for GetVisibleLinesRange
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:50:40 +00:00
Vadim Zeitlin
ae167d2ffb fix for incorrect assert in GetVisibleLinesRange
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:47:38 +00:00
Vadim Zeitlin
152c57f206 fix for visible lines calculation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:45:47 +00:00
Vadim Zeitlin
8000ae7f7c added untested implementation of wxEvtLoop for GTK+
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:27:10 +00:00
Vadim Zeitlin
6522713c75 wxUniv compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 12:25:46 +00:00
Vadim Zeitlin
7c36b6a2a1 added missing menu.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 11:55:47 +00:00
Vadim Zeitlin
6b4a8d9387 fixes for crashes after DeleteItem and DeleteAllItems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 11:32:31 +00:00
Vadim Zeitlin
23a46cb4f9 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 00:50:37 +00:00
Vadim Zeitlin
a85c155217 fixed scrollbar refresh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 00:48:54 +00:00
Vadim Zeitlin
fba82cc079 wxFrameNative is now defined in wx/frame.h itself
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-10 00:47:41 +00:00
Vadim Zeitlin
cd4453e588 detabified some more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 23:35:24 +00:00
Vadim Zeitlin
d0a3d10946 detabified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 23:31:00 +00:00
Vadim Zeitlin
938b652b11 wxListCtrl in report/virtual modes seems to work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 23:26:32 +00:00
Vadim Zeitlin
8a73bf3d98 more scrolling tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 22:54:26 +00:00
Vadim Zeitlin
3febfc6bd7 fix for backwards selection in text ctrl (patch 439730)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 22:47:32 +00:00
Vadim Zeitlin
e18e17f9ed fixes to my previous errors in stack/vector (patch 439378)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 22:44:26 +00:00
Vadim Zeitlin
7db91489d6 set m_itemIndex in the list events for key down event too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 22:03:55 +00:00
Vadim Zeitlin
b016a65b3e simplified RTTI chain: wxFrame base class is now directly wxWindow, not wxFrameMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 21:45:59 +00:00
Vadim Zeitlin
af8964c4c3 simplified RTTI chain: wxFrame base class is now directly wxWindow, not wxFrameMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 21:41:19 +00:00
Vadim Zeitlin
8d813b20f7 more wxListCtrl drawing fixes - scrolling still doesn't work under wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 18:37:34 +00:00
Vadim Zeitlin
e26be42b5c added wxDCClipper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 18:37:03 +00:00
Vadim Zeitlin
6c975af106 documented wxDCClipper
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 18:31:53 +00:00
Robin Dunn
0c7dcb7fd2 fixed off by one error in GetText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 18:28:47 +00:00
Václav Slavík
5dab6765c0 added all data files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 18:24:18 +00:00
Václav Slavík
f3ecfad192 added wxUSE_POPUPWIN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 18:24:08 +00:00
Vadim Zeitlin
5cd891743e more wxListCtrl fixes: inserting/deleting items now works again (tested in the sample) but I somehow broke the scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 15:58:24 +00:00
Vadim Zeitlin
371684d3f7 Mattia's temp fix for cross-compiling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 13:26:19 +00:00
Julian Smart
9806a47c30 Various wxMotif fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 13:14:28 +00:00
Julian Smart
43bb528818 Removed helpxlp.cpp. I really don't think we need that any more.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 12:25:41 +00:00
Vadim Zeitlin
39c869a6cd scrolling with kbd generates scroll events too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 12:23:53 +00:00
Vadim Zeitlin
05dcbb8e9e one more check: for wxUSE_HTML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 12:23:19 +00:00
Vadim Zeitlin
e9d9f136ee compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 12:21:43 +00:00
Robert Roebling
1629fb3b72 Removed wxPopupWindow from normal (non-wxUniv) build
as it expects a non-native combobox (which is a bug,
  of course).
  Minor compile thing for wxUniv branch.
  The library currently does not build due to problems
  in wxListCtrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 12:20:04 +00:00
Julian Smart
45f22d48cd Various fixes for wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-09 11:07:10 +00:00
Václav Slavík
bf7d7ee706 Trying to hide evidence of my negative programming skills...
(Why the hell did I write wxHTML in so strange way -- it used recursion a la Lisp
instead of normal loop when it needed to iterate over cells...)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 22:54:33 +00:00
Václav Slavík
5f4cd605aa wxHTML fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 22:54:22 +00:00
Václav Slavík
9165395fd1 added wxUSE_OLE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 22:54:13 +00:00
Václav Slavík
4f11a3437b 1. configure now checks first for timezone, then _timezone and
then __timezone, so that we don't use glibc's internal variable whenever possible
2. added wxUSE_OLE so that MSW compiles with Mingw32


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 22:52:59 +00:00
Gilles Depeyrot
f6045f99ba added missing includes after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 19:03:21 +00:00
Gilles Depeyrot
6abe4b6540 configure without popup windows under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 18:58:53 +00:00
Gilles Depeyrot
5051902e56 added missing destructor for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 15:36:31 +00:00
Gilles Depeyrot
3ef585df0c use RemoveAt instead of Remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 13:47:31 +00:00
Gilles Depeyrot
31523f511c copied wxMac and wxMotif faq from wxWebSite
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-08 13:23:59 +00:00
Vadim Zeitlin
51f5cff35c applied patch 428750 (abs paths in vc makefile)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:29:26 +00:00
Vadim Zeitlin
83ac6a4ea3 oops, I didn't mean to commit this testing code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:22:43 +00:00
Vadim Zeitlin
733b8ed3f9 use wxTextFile::Eol() in wxEndL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:20:05 +00:00
Vadim Zeitlin
3c648a82a5 added vector and stack classes (UNTESTED)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:16:38 +00:00
Vadim Zeitlin
5438a5665e applied patch 439186 (mingw and VC5 fixes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 23:02:09 +00:00
Vadim Zeitlin
7bf1474ab6 applied some minor patches from chuckm to wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 22:55:49 +00:00
Vadim Zeitlin
e2c271239b applied patch 436908 (warning fix in serialization code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 22:46:53 +00:00
Vadim Zeitlin
b54e41c529 1. fixed typo ('&' instead of '|') in wxNotebook
2. changed wxTC_MULTILINE to be equal to wxNB_MULTILINE and != 0
3. much more efficient selection handling in virtual wxListCtrl,
   we can now select 1000000 items without problems
4. kbd/mouse selection (ctrl/shift handling) fixed in wxListCtrl
5. added wxSortedArray::IndexForInsert() and AddAt(), remove Remove(size_t),
   use RemoveAt() instead


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 22:42:35 +00:00
Václav Slavík
dfdd617b4b safe macro expansion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 22:42:06 +00:00
Robert Roebling
9f41d60156 Added wxPopupWindow to GTK port, wxComboBox had to
be adapted a little but basically works not under
  GTK/Univ.
  I am pretty sure I forgot some file...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 21:42:30 +00:00
Vadim Zeitlin
776a33cfd3 made switching from/to multiple selection mode work better (doesn't require recreating the control any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 16:52:27 +00:00
Stefan Csomor
4d4d8bbfad mac filter routine for nav services
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 15:33:38 +00:00
Stefan Csomor
012409e9ef mac fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 14:48:50 +00:00
Stefan Csomor
fc0daf8400 corrected log error after initialize when in release mode, window inheritance (generated incorrect classinfo trees)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 14:43:10 +00:00
Gilles Depeyrot
d030b2aaca corrections after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 13:31:38 +00:00
Gilles Depeyrot
8bc3617742 corrected wxGauge to inherit from wxGaugeBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 13:20:12 +00:00
Gilles Depeyrot
ad08ef4478 corrected friend declaration for CodeWarrior compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 13:16:34 +00:00
Stefan Csomor
4176fb7d0f added mac l&f for rules and headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 13:16:03 +00:00
Gilles Depeyrot
1d79bd3eaf corrected WXWIN_COMPATIBILITY conditional tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 11:23:24 +00:00
Gilles Depeyrot
4c41981b8e corrected file list for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 11:04:16 +00:00
Vadim Zeitlin
30a72e6297 check for LVS_OWNERDATA availability at compile and run-time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-07 00:39:05 +00:00
David Webster
0367c1c0e8 Fixes for OS/2 wxUniv merge.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 21:47:52 +00:00
David Webster
537760597b Missing LINKAGEMODE on static declaration (for OS/2).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 21:47:21 +00:00
David Webster
210a651b4f OS/2 update for wxUniv merge.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 21:45:11 +00:00
Vadim Zeitlin
cf1dfa6b8f virtual wxListCtrl support (UNTESTED)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 21:18:15 +00:00
Gilles Depeyrot
ba7499ef2f added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 20:21:10 +00:00
Robin Dunn
462622b27f make sure all the files are removed when uninstalled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 20:15:35 +00:00
Robin Dunn
b659a82889 updated email address
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 20:02:55 +00:00
Vadim Zeitlin
328bfc2224 compilation fix for broken OS/2 compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 18:09:08 +00:00
Robin Dunn
7e3a5de30f some minor tweaks for the VTK demo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 17:35:48 +00:00
Robin Dunn
749e08b9d1 changed the base class to wxWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 17:31:06 +00:00
Robin Dunn
cb74f8d703 a bit of simplification
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 17:25:53 +00:00
Julian Smart
46d0e4b2e6 ReadMe updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 16:25:30 +00:00
Václav Slavík
5fe8354960 fixed a design flaw in wxFontMapper that prevented automatic creation of wxConfig instance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 16:23:37 +00:00
Stefan Csomor
ffc93a32d8 first impl (needs extending)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 16:10:17 +00:00
Julian Smart
98363307d3 Implemented input disabling for disabled windows since MicroWindows doesn't do it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 13:18:11 +00:00
Julian Smart
9aa80360d1 Added WS_POPUP for MicroWindows dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 11:18:23 +00:00
Julian Smart
a9c04289c8 Added missing file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 10:25:30 +00:00
Julian Smart
4638d697a3 Added animation classes to contrib hierarchy
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 10:24:54 +00:00
Robin Dunn
286e2db69c Fixed img2py to work correctly with Python 2.1.
Added enhanced wxVTKRenderWindow by Prabhu Ramachandran


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-06 04:11:34 +00:00
Julian Smart
68cb30154e Added a file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 20:55:55 +00:00
Julian Smart
a6a193a08d #ifdefed out some redundant base classes so DLL version compiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 20:55:06 +00:00
Robin Dunn
7326dbf8ab Checked in temporarily munged copy before...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 19:32:19 +00:00
Robin Dunn
cfe766c352 Some tweaks for building the RPMs for multiple different versions of Python
all with a single command.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 18:54:09 +00:00
Vadim Zeitlin
04dbb6467b removed/replaced include 'wx/wx.h'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 18:48:48 +00:00
Robin Dunn
2734d68772 added new files to be included in the installer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 17:46:57 +00:00
Robin Dunn
b166c70307 Fixing some demos to look and act better
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 17:27:59 +00:00
Julian Smart
8cd3898690 Updated MicroWindows patch file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 16:34:33 +00:00
Julian Smart
1f752a2282 Released menubar capture before menu popup was captured.
Process menu command AFTER menu is dismissed (or it stays there).
Still some problems but menus and message box beginning to work in MicroWindows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 15:49:18 +00:00
Vadim Zeitlin
1370703e03 more steps toward virtual listctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 13:40:52 +00:00
Julian Smart
54800df8d8 Misc fixes, now menus are almost working on MicroWindows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 13:35:53 +00:00
Vadim Zeitlin
24b9f05515 use type safe list instead of wxList for m_columns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 13:14:41 +00:00
Vadim Zeitlin
2c1f73eecf added virtual list control functions (but not implemented them yet) to the native wxListCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 13:08:37 +00:00
Julian Smart
018d679e79 Corrected cleanwx target
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 10:57:27 +00:00
Vadim Zeitlin
b11a23f38f check that we don't try to compile in GUI mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 10:52:10 +00:00
Robin Dunn
9a08cd12bd odds and ends
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 03:15:08 +00:00
Robin Dunn
edf2f43ead odds and ends...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 02:16:20 +00:00
Vadim Zeitlin
98ec9dbebc added virtual listctrl support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 01:27:38 +00:00
Vadim Zeitlin
3abf2c720b fixed ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 01:27:19 +00:00
Vadim Zeitlin
7cdb542c4d added wxUSE_COLOURDLG to the header too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-05 01:26:15 +00:00
Robin Dunn
8577c05a58 updated version number
fixed a sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 23:34:51 +00:00
Vadim Zeitlin
a2c0a9c5ca added wxUSE_COLOURDLG setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 23:34:44 +00:00
Stefan Csomor
e766c8a9ad wxMac: wxUniversal integration steps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 20:11:26 +00:00
Vadim Zeitlin
db73732184 removed obsolete comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:28:50 +00:00
Vadim Zeitlin
dcb99cd3ac added wxUSE_LOG_DIALOG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:28:21 +00:00
Vadim Zeitlin
8ca01ec651 fixed another pragma
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:27:58 +00:00
Vadim Zeitlin
4234ea8be0 use fontdlgg.cpp under wxUniv/GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:27:43 +00:00
Vadim Zeitlin
7aa5864467 make it possible to use wxToolBarSimple as wxToolBar with wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:21:47 +00:00
Vadim Zeitlin
a3870b2ff5 reverted Julians changes to the pragmas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:07:15 +00:00
Vadim Zeitlin
196cc38b26 reverted Julians changes to the pragmas
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 18:02:05 +00:00
Vadim Zeitlin
879df07384 fix to include correct files.lst for wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 17:25:04 +00:00
Julian Smart
7190821305 Changed the pragmas to allow debugging under Linux
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 17:12:37 +00:00
Vadim Zeitlin
70f3fad609 corrected progress dialog appearance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 16:45:14 +00:00
Vadim Zeitlin
801bb685b0 testing tree ctrl with wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 16:17:14 +00:00
Vadim Zeitlin
b9cc8004c0 made filelist.txt more readable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 16:07:51 +00:00
Julian Smart
21b6ad64da Corrected imaglist addition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 13:37:56 +00:00
Julian Smart
6d6a67a70a Added UnivDebug, UnivRelease configurations to project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 13:18:28 +00:00
Julian Smart
c338426040 Added correct imaglist.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 12:59:36 +00:00
Vadim Zeitlin
0d59e20372 marked MSW imaglist.cpp as low level so that it is used for wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 12:51:10 +00:00
Julian Smart
5adad46628 Don't complain under MicroWindows if a wxDC's HDC is NULL - it happens
during dragging. Small mod to makefile.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 12:40:17 +00:00
Jouk Jansen
1a0d517ea4 Committing in .
Modified Files:
 	wxWindows/setup.h_vms wxWindows/include/wx/caret.h
 	wxWindows/include/wx/dynlib.h wxWindows/include/wx/hash.h
 	wxWindows/include/wx/gtk/window.h
 	wxWindows/src/common/descrip.mms
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/unix/dialup.cpp

 -Removed some redundant ;'s from the .h files
 -Updated wxGTK for OpenVMS
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 12:23:32 +00:00
Julian Smart
8a46f9b187 Getting wxMicroWindows compiled again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 11:59:35 +00:00
George Tasker
d4af841d3b Added some #includes that were needed in not using precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 11:01:52 +00:00
Julian Smart
3e6e2754a6 Added some missing tests; replaced scrolwin.cpp with scrlwng.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 10:08:44 +00:00
Julian Smart
7ecf5ac7cd Fixed HRGN leak in DoSetClippingRegion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-04 06:37:57 +00:00
Gilles Depeyrot
f9bcc6d152 corrected according to file name change for generic scrolled window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 20:06:57 +00:00
Václav Slavík
ee19c32471 more intelligent behaviour of wxHtmlWindow history: does not remember same page several times anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 19:44:56 +00:00
Vadim Zeitlin
3379ed3789 tons of fixes for wxGTK/Univ - seems to work, more or less, now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 19:38:19 +00:00
Julian Smart
67d95e11cf Updated project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 19:18:02 +00:00
Gilles Depeyrot
6326010ca0 replaced obsolete Number() calls with GetCount() calls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 18:59:43 +00:00
Vadim Zeitlin
3a8c693aea renamed scrolwin file - no other way to make wxGTK/Univ compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 18:14:22 +00:00
Stefan Csomor
7756141b6e added nbkbase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 18:10:04 +00:00
Julian Smart
fa494c4010 Added nbkbase.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 14:02:43 +00:00
Julian Smart
bd52bee106 MSW fixes; added wxUSE_XPM to wxUniv's setup.h so now widgets sample works
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-03 10:03:13 +00:00
Stefan Csomor
748fbf95a8 changed Refresh to take Rect as client coordinates not window coordinates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 20:52:06 +00:00
Gilles Depeyrot
8facbb759c removed useless PM_USE_SESSION_APIS define (it must be defined in MacHeaders
to be of any use)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 19:58:48 +00:00
Gilles Depeyrot
09e48f0b19 added common notebookbase source file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 19:55:50 +00:00
Vadim Zeitlin
442b35b53b changed copyright to SciTech one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 19:42:27 +00:00
Vadim Zeitlin
10199e27d5 fixed deleting pages from the notebook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 19:37:51 +00:00
Vadim Zeitlin
07b8d7ecc3 1. fixed wxGTK notebook which was completely broken by the merge
2. added a new file for commno notebook code (nbkbase.cpp)
3. removed 'include "wx/wx.h"' from html files as I got tired of
   recompiling them


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 18:34:13 +00:00
Vadim Zeitlin
d1a8d972ea define WXGTK12 for GTK+ 1.2.7+ as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 18:01:24 +00:00
Vadim Zeitlin
48ff57aed8 backported crash fix for wxFrame::Iconize() from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 16:07:32 +00:00
Vadim Zeitlin
6c01ec02a8 incremented version to 2.3.2 in configure as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 15:42:14 +00:00
Vadim Zeitlin
a45a98fbb9 fix (?) for error in wxCSConv::LoadNow()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 15:38:33 +00:00
Vadim Zeitlin
dee9ba58f5 regenerated with tmake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 15:26:40 +00:00
Vadim Zeitlin
f33f19dd2e set wxUSE_WIZARDDLG by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 15:26:32 +00:00
Vadim Zeitlin
403aced8ed missing WXDLLEXPORT_DATA added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 15:19:03 +00:00
Julian Smart
fac3b4232c More wxMicroWindows fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 14:20:32 +00:00
Vadim Zeitlin
d1c8069261 process WM_ACTIVATEAPP in wxMSW too, not only wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 13:45:53 +00:00
Vadim Zeitlin
ae0eb25f8d added russian language to the list of choices
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 13:44:26 +00:00
George Tasker
2f8f7c77d3 Changes required after wxUniv merge wxListBox::Number() changed to wxListBox::GetCount()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 13:28:14 +00:00
Julian Smart
8cb172b4f1 Various wxUniversal/wxMicroWindows fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 13:22:19 +00:00
Václav Slavík
367c84b903 oops, fixed fatal bug in new HTML parsing code (I wonder why it didn't crash when I played with it yesterday...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 13:01:30 +00:00
Vadim Zeitlin
b1f5d087c7 respect wxUSE_WIZARDDLG setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 12:57:56 +00:00
Vadim Zeitlin
4ba4821431 regenerated with tmake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 12:53:36 +00:00
Vadim Zeitlin
9a4232dcb7 fixed bug in wxString::Matches() - backtrack now if \* mismatched
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 12:42:46 +00:00
Julian Smart
0fd734af37 Added microwin doc directory, readme and patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 12:10:47 +00:00
Julian Smart
f0b22b4a03 Updated MicroWindows makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 12:06:19 +00:00
Vadim Zeitlin
6e169cf31a crash in wxAppBase::SetActive fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 11:00:01 +00:00
Vadim Zeitlin
c6dda38fee create directory for russian files, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:49:12 +00:00
Vadim Zeitlin
fa8dca8dd1 changed wxUSE_DRAGIMAG to wxUSE_DRAGIMAGE and use it everywhere now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:45:16 +00:00
Vadim Zeitlin
9e39ee2f89 updated makefile to include russian translations and not refer to obsolete wxstd.po files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:44:21 +00:00
Vadim Zeitlin
6ef022bdff compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:43:08 +00:00
Vadim Zeitlin
4f9db74e98 added default values for SetSizeHints() arguments, as in wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:41:39 +00:00
Vadim Zeitlin
0c39421228 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:40:34 +00:00
Vadim Zeitlin
24fd6d87e9 changed wxUSE_DRAGIMAG to wxUSE_DRAGIMAGE and use it everywhere now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:39:00 +00:00
Vadim Zeitlin
d73be7149f define wxUSE_LOGGUI/WINDOW by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:35:58 +00:00
Vadim Zeitlin
ee993c7410 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:30:40 +00:00
Vadim Zeitlin
6ba68e8852 minor doc fixes (bug 433229)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:27:07 +00:00
Vadim Zeitlin
4c05b807a5 compilation fixes for wxUSE_WAVE=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:12:40 +00:00
George Tasker
d373d379ae Fixed doc issue not showing correct header definition (const function)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:08:23 +00:00
Julian Smart
809e8e443f Fix to minimal sample project file; changed protected -> public in wxGIFDecoder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:06:51 +00:00
Vadim Zeitlin
11dfaa5f1d typo in GTK version caching code fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 10:00:17 +00:00
Vadim Zeitlin
c4c928018d fix for compilation without WXWIN_COMPATIBILITY_2_2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:53:59 +00:00
Vadim Zeitlin
32d50c82ec fix for compilation with wxUSE_MENU_CALLBACK=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:51:19 +00:00
Vadim Zeitlin
138be25346 fix for GTK+ version check caching (now it actually works)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:49:34 +00:00
Vadim Zeitlin
62e2654261 minor WXWIN_COMPATIBILITY_2_2 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:38:35 +00:00
Vadim Zeitlin
463abc6470 fixed --with-libjpeg=sys
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:38:06 +00:00
Vadim Zeitlin
54276ccf5b added WXWIN_COMPATIBILITY_2_2 option (disabled by default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:23:59 +00:00
Vadim Zeitlin
8168de4c79 1. added --enable-gtk2 option, check for GTK+ 2.0 disabled by default
2. added caching of gtk-config checks


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-02 09:10:37 +00:00
Václav Slavík
5704d2504b added generic/accel.h to filelist.txt so that wxGTK installs it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 23:17:26 +00:00
Václav Slavík
e143745693 (hopefully) fixed wxGTK wxScrolledWindow::GetClientSize bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 23:17:04 +00:00
Stefan Csomor
ef7c5bd22a refresh during window delete (if root window deleted) removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 20:57:09 +00:00
Stefan Csomor
49a91764b5 added generic color dialog to setup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 20:56:01 +00:00
Václav Slavík
8bd72d9065 added convenience accessors to wxHtmlTag and modified wxHTML code to use them; improved colours parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 18:07:33 +00:00
Václav Slavík
fef8557d30 post-merge fix: added chkconf.h to filelist.txt so that make install will install it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 18:06:56 +00:00
Julian Smart
e6ba3fd4b7 Removed arbitrary window-shrinking code; corrected log message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 17:24:42 +00:00
Václav Slavík
daa616fca0 new HTML tags parser and entities substitution code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:09:35 +00:00
Václav Slavík
ec7c3e898a fixed AC_MSG_RESULT output of toolkit name to work with both autoconf 2.50 and older
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:09:07 +00:00
Václav Slavík
9731a5fe6c added #ifdef wxUSE_XPM around XPM handler initialization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:08:46 +00:00
Václav Slavík
cccc045f61 fixed charset names in message catalogs to be in iso-8859-x form, not iso8859 (gettext 0.10.37+ complains about non-portable encodings)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:08:36 +00:00
Václav Slavík
d361bbff17 fixed handling of HTML tables with empty row(s)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:07:26 +00:00
Václav Slavík
942285dcfa 1) fixed handling of 48bit colors in XPMs
2) re-added #if wxUSE_IMAGE && wxUSE_XPM


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:07:14 +00:00
Václav Slavík
cc6e1950f5 docs updates and typos and lies fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-01 15:07:00 +00:00
Vadim Zeitlin
6dab3ba7e5 fixed xpm colour parsing bug due to case sensitive colour name comparison
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-30 23:52:22 +00:00
Julian Smart
1a77875bed More fixes for wxUniv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-30 13:43:34 +00:00
Gilles Depeyrot
83661a1347 include xpm files for Mac OS after correction of wxICON macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-30 11:07:42 +00:00
Gilles Depeyrot
b698c8e9bf corrections for Mac OS X after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-30 10:14:48 +00:00
Gilles Depeyrot
cdad5e204b added missing common cmdproc files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-30 09:34:30 +00:00
Gilles Depeyrot
293d3988da corrected virtual function prototype
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 20:42:17 +00:00
Gilles Depeyrot
820477cb34 implemented Carbon printing for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 20:40:22 +00:00
Gilles Depeyrot
92ed97b709 added include for Print Manager Session APIs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 20:37:12 +00:00
Julian Smart
217099990c Further wxUniv fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 19:18:30 +00:00
Václav Slavík
8f7b34a878 fixed copyrights in MGL files (finally...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 19:03:13 +00:00
Julian Smart
6e264973e6 Added project files for wxUniv under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 17:23:05 +00:00
Julian Smart
3808e19142 Added some more files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 17:21:17 +00:00
Vadim Zeitlin
c02ee97f96 2 more files added on wxUniv branch I had forgot to commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 17:18:47 +00:00
Julian Smart
feb85348c3 Added popupwin.h to trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 17:16:04 +00:00
Julian Smart
24ce4c1875 Some wxUniv compile fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 17:07:54 +00:00
Vadim Zeitlin
a5b3669d76 define wxWindowNative for wxUniv compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 16:51:05 +00:00
Julian Smart
cbf656555e Corrections to config checking; tweaking wxUniv's setup.h; added fix to makeb32.env
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 16:30:51 +00:00
Stefan Csomor
1eb9ac3c66 post wxUniv fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 16:25:21 +00:00
Stefan Csomor
90b959aee4 post wxUniv merge fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 16:19:53 +00:00
Julian Smart
bf7b3e2b9d Added extra MicroWindows functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 11:31:34 +00:00
Julian Smart
04ef50df3a First pass at adding MicroWindows support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 10:58:59 +00:00
Vadim Zeitlin
7ed4fab7be fixed 2 year old bug in wxBaseArray::operator=() (who the hell is/was RO who introduced it?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-29 09:13:34 +00:00
Gilles Depeyrot
a8562f5520 applied SourceForge patch #423536
removed obsolete xpm handling code
corrections after wxUniv merge


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 21:25:40 +00:00
Gilles Depeyrot
584bede061 corrections after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 21:23:41 +00:00
Gilles Depeyrot
7ef4c90b0a removed useless ; to allow smart preprocessing under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 21:19:28 +00:00
Julian Smart
2a365b7d3f Fixed some compilos. Things that still need fixing incl. logg.cpp compilation
and docvwmdi debugging


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 16:49:17 +00:00
Gilles Depeyrot
0bec761df7 implemented printing dialogs in Carbon with Sessions APIs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:33:35 +00:00
Gilles Depeyrot
f520d38155 corrected conditional compilation
added missing show for error message dialogs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:32:37 +00:00
Gilles Depeyrot
4b7b750dd1 added missing return on error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:31:37 +00:00
Gilles Depeyrot
93f0fe75dd corrected conditional compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:30:58 +00:00
Gilles Depeyrot
39348a9631 renamed port to session for Carbon printing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:30:09 +00:00
Gilles Depeyrot
a842a96e24 corrected after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:28:32 +00:00
Gilles Depeyrot
6c0ba0d02d added missing dynamic class declaration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:27:53 +00:00
Gilles Depeyrot
0b140baaa6 corrected conditional include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:25:25 +00:00
Gilles Depeyrot
505af178e7 corrected control inheritance
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:24:17 +00:00
Gilles Depeyrot
1e5e1c40e0 added wxMac conditional include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:23:26 +00:00
Gilles Depeyrot
1d53270b32 removed useless ; to allow smart preprocessing under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-28 06:22:47 +00:00
Gilles Depeyrot
d8c736e563 added missing includes after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 22:29:47 +00:00
Gilles Depeyrot
ac84e37d5f removed useless ; to allow smart preprocessing under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 22:26:08 +00:00
Gilles Depeyrot
89963b7fd0 removed common duplicated definitions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 22:24:42 +00:00
Gilles Depeyrot
55d607461b added missing conditional compilation tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 21:35:29 +00:00
Gilles Depeyrot
c02ef0be2f removed common duplicated definition
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 21:34:15 +00:00
Gilles Depeyrot
5601914e98 removed common duplicated definitions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 21:33:41 +00:00
Gilles Depeyrot
f39d60ccc3 corrected include file path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 21:31:12 +00:00
Gilles Depeyrot
be7b32267e derived new setup.h include from wxMSW after wxUniv merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 21:19:47 +00:00
Julian Smart
9806a0e71e Updated version to 2.3.2 so apps can test for differences in new merged source
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 20:36:30 +00:00
Gilles Depeyrot
9eee81a4cf reset preview bitmap variable to NULL after deleting it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 19:44:56 +00:00
Gilles Depeyrot
0532484d0f corrected wxICON for Mac OS (Classic and X)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 19:27:30 +00:00
Julian Smart
3a12b404f8 Now wxFrame derives from wxFrameMSW/GTK in non-wxUniv mode. Fixes RTTI problems.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 17:19:49 +00:00
Vadim Zeitlin
22bd93879d fix for wxBitmapType definition problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 13:55:28 +00:00
Vadim Zeitlin
83874e1547 wxSIZE_T_IS_UINT definition fix for mingw32 cross-compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 13:51:56 +00:00
Julian Smart
dd8b2f4a43 Added wxUSE_LOGWINDOW, wxUSE_LOGGUI settings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 12:34:14 +00:00
Julian Smart
606b005fb2 More small fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 12:31:16 +00:00
Vadim Zeitlin
4f55a07f9f linking fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 12:17:39 +00:00
Vadim Zeitlin
b90c32b486 yet another file I added on the wxUniv branch and forgot to merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 12:13:14 +00:00
Vadim Zeitlin
70050c82fe another file I added on the wxUniv branch and forgot to merge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 12:04:21 +00:00
Julian Smart
ff8b6290e9 Added wxUSE_NUMBERDLG to setup.h; added some files to VC++ project files;
added missing virtual function from wxSliderMSW


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 11:55:33 +00:00
Stefan Csomor
ba7eb0a5a7 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 06:01:57 +00:00
Vadim Zeitlin
e421922f90 MSW compilation fixes - widgets sample runs!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 00:27:24 +00:00
Vadim Zeitlin
29149a6491 compilation fixes - wxGTK compiles but not links
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 21:29:16 +00:00
Vadim Zeitlin
21aeca5e54 another file added on univ branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 21:09:16 +00:00
Vadim Zeitlin
32b8ec418a added more files (unchanged) from wxUniv branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 21:05:06 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Stefan Csomor
aeb313f31c forced redraw before scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 18:47:51 +00:00
Stefan Csomor
9714ffa0c4 added tiered implementation (using draw paragraph) for stattext, corrected scrollbar paging, forced redraw before scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 18:45:16 +00:00
Stefan Csomor
0c05747a9d added tiered implementation (using draw paragraph)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 18:41:02 +00:00
Vadim Zeitlin
e446cd6783 reverting accidental commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 17:31:54 +00:00
Vadim Zeitlin
b6ca231f85 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:08:16 +00:00
Vadim Zeitlin
544421165f use GetText() instead of GetText(wxString&), made some methods inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:08:03 +00:00
Vadim Zeitlin
6b1a0f7a66 testing merging with -kk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:03:48 +00:00
Robin Dunn
60be92e035 removed debug code that got left in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-25 23:51:23 +00:00
Robin Dunn
6a1836a0a4 some fixes and a new mixin class added to the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-25 23:46:28 +00:00
Vadim Zeitlin
bec0a26172 delete test added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 22:24:33 +00:00
Gilles Depeyrot
87df17a11b corrected use of Print Manager Session APIs for Carbon targets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 20:38:12 +00:00
Gilles Depeyrot
4cb1706ae5 use Print Manager session APIs if PM_USE_SESSION_APIS is true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 19:49:02 +00:00
Gilles Depeyrot
e18bf7e7c6 correction for compilation with -cpp-precomp option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 19:39:46 +00:00
Gilles Depeyrot
0c451ef3bb added -cpp-precomp option for c++ compiler under Mac OS X so that
precompiled system headers are used (compilation is twice as fast!)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:21:40 +00:00
Gilles Depeyrot
c60f15f01d remove PM_USE_SESSION_APIS setting so that wxMac can be compiled with
the -cpp-precomp compiler option


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:19:47 +00:00
Gilles Depeyrot
a689a4d09a use Print Manager session APIs if PM_USE_SESSION_APIS is true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:18:09 +00:00
Gilles Depeyrot
0ab2593768 use Print Manager session APIs if PM_USE_SESSION_APIS is true
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:13:03 +00:00
Gilles Depeyrot
09b7e6184a removed dialup from list of files because of compilation problem with
-cpp-precomp option under Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:02:37 +00:00
Gilles Depeyrot
6868c3eb8f corrected for compilation under Mac OS X with -cpp-precomp option
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:01:43 +00:00
Gilles Depeyrot
6d5e730730 added missing cast for delete
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 17:00:58 +00:00
Gilles Depeyrot
2bd598aa16 corrected #ifdef for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 16:58:19 +00:00
Gilles Depeyrot
8d336833e8 added -cpp-precomp compilation problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 16:57:09 +00:00
Vadim Zeitlin
6ef415205f fix for configure under Solaris (don't use unportable test -L)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-23 16:20:03 +00:00
Gilles Depeyrot
1db61f2fa6 clarified listbox problems (related to the custom CDEF)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 18:30:21 +00:00
Robin Dunn
9d6da64a8b generated code updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 16:53:59 +00:00
Vadim Zeitlin
b59893f3ef minor docs fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 15:04:06 +00:00
Stefan Csomor
f32e5dc5ca Raise and Lower implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 12:34:18 +00:00
Vadim Zeitlin
5da2c444ef 1. fixed wxBase RPM template
2. fixed several erros in filelist.txt
3. regenarated everything


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 01:31:45 +00:00
Vadim Zeitlin
2d3112adc9 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 01:28:42 +00:00
Vadim Zeitlin
7e05b755be some typos fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-22 01:28:01 +00:00
1927 changed files with 189235 additions and 44160 deletions

View File

@@ -37,6 +37,9 @@ base
gtk
motif
win32
univ
univ-debug
univ-release
base-debug
gtk-debug
motif-debug
@@ -46,3 +49,5 @@ gtk-release
motif-release
win32-release
*tags
log
univtags.cmd

View File

@@ -19,56 +19,39 @@ include ./src/make.env
.SUFFIXES: .o .cpp .c .cxx
.c.o :
$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) -o $@ $<
$(CCC) -c @DEP_INFO_FLAGS@ $(CFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
.cpp.o :
$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
$(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
.cxx.o :
$(CC) -c @DEP_INFO_FLAGS@ $(CPPFLAGS) $(PICFLAGS) -o $@ $<
$(CC) -c @DEP_INFO_FLAGS@ $(CXXFLAGS) $(PICFLAGS) @WXMSW_DLL_DEFINES@ -o $@ $<
########################### Paths #################################
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VP1 = @top_srcdir@/src/common
VP2 = @top_srcdir@/src/@TOOLKIT_DIR@
VP3 = @top_srcdir@/src/motif/xmcombo
VP4 = @top_srcdir@/src/generic
VP5 = @top_srcdir@/src/unix
VP6 = @top_srcdir@/src/html
VP7 = @top_srcdir@/src/png
VP8 = @top_srcdir@/src/jpeg
VP9 = @top_srcdir@/src/tiff
VP10 = @top_srcdir@/src/zlib
VP11 = @top_srcdir@/src/iodbc
VP12 = @top_srcdir@/src/msw/ole
FTVP01 = @top_srcdir@/src/freetype/unix
FTVP02 = @top_srcdir@/src/freetype/autohint
FTVP03 = @top_srcdir@/src/freetype/base
FTVP04 = @top_srcdir@/src/freetype/cff
FTVP05 = @top_srcdir@/src/freetype/cid
FTVP06 = @top_srcdir@/src/freetype/macfond
FTVP07 = @top_srcdir@/src/freetype/otlayout
FTVP08 = @top_srcdir@/src/freetype/psnames
FTVP09 = @top_srcdir@/src/freetype/raster1
FTVP10 = @top_srcdir@/src/freetype/sfnt
FTVP11 = @top_srcdir@/src/freetype/smooth
FTVP12 = @top_srcdir@/src/freetype/truetype
FTVP13 = @top_srcdir@/src/freetype/type1
FTVP14 = @top_srcdir@/src/freetype/type1z
FTVP15 = @top_srcdir@/src/freetype/winfonts
VP13 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
VP14 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
VP1 = @TOOLKIT_VPATH@
VP2 = @top_srcdir@/src/common
VP3 = @top_srcdir@/src/generic
VP4 = @top_srcdir@/src/unix
VP5 = @top_srcdir@/src/html
VP6 = @top_srcdir@/src/png
VP7 = @top_srcdir@/src/jpeg
VP8 = @top_srcdir@/src/tiff
VP9 = @top_srcdir@/src/zlib
VPA = @top_srcdir@/src/regex
VP10 = @top_srcdir@/src/iodbc
VP11 = @top_srcdir@/src/msw/ole
VP12 = $(FTVP01)@PATH_IFS@$(FTVP02)@PATH_IFS@$(FTVP03)@PATH_IFS@$(FTVP04)@PATH_IFS@$(FTVP05)@PATH_IFS@$(FTVP06)@PATH_IFS@$(FTVP07)@PATH_IFS@$(FTVP08)@PATH_IFS@
VP13 = $(FTVP09)@PATH_IFS@$(FTVP10)@PATH_IFS@$(FTVP11)@PATH_IFS@$(FTVP12)@PATH_IFS@$(FTVP13)@PATH_IFS@$(FTVP14)@PATH_IFS@$(FTVP15)@PATH_IFS@
# the comment at the end of the next line is needed because otherwise autoconf
# would remove this line completely - it contains a built-in hack to remove
# any VPATH assignment not containing ':'
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13)@PATH_IFS@$(VP14) # ':' for autoconf
VPATH = $(VP1)@PATH_IFS@$(VP2)@PATH_IFS@$(VP3)@PATH_IFS@$(VP4)@PATH_IFS@$(VP5)@PATH_IFS@$(VP6)@PATH_IFS@$(VP7)@PATH_IFS@$(VP8)@PATH_IFS@$(VP9)@PATH_IFS@$(VPA)@PATH_IFS@$(VP10)@PATH_IFS@$(VP11)@PATH_IFS@$(VP12)@PATH_IFS@$(VP13) # ':' for autoconf
top_srcdir = @top_srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -175,7 +158,7 @@ WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//
# this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
# ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
# .d and .h/.inl files for the current toolkit
include $(top_srcdir)/@PORT_FILES@
include @PORT_FILES@
SOURCES = $(ALL_SOURCES)
HEADERS = $(ALL_HEADERS)
@@ -187,7 +170,13 @@ DEPFILES = @ALL_DEPFILES@
# the object files of sublibraries (we assume that they don't change [often],
# so we don't generate these lists with tmake but embed them here)
ZLIBOBJS = \
REGEXOBJS = \
regcomp.o \
regexec.o \
regerror.o \
regfree.o
ZLIBOBJS = \
adler32.o \
compress.o \
crc32.o \
@@ -203,7 +192,7 @@ ZLIBOBJS = \
infutil.o \
inffast.o
PNGOBJS = \
PNGOBJS = \
png.o \
pngread.o \
pngrtran.o \
@@ -239,7 +228,7 @@ FREETYPEOBJS = \
type1z.o \
winfnt.o
JPEGOBJS = \
JPEGOBJS = \
jcomapi.o \
jutils.o \
jerror.o \
@@ -287,7 +276,7 @@ JPEGOBJS = \
jquant2.o \
jdmerge.o
TIFFOBJS = \
TIFFOBJS = \
tif_aux.o \
tif_close.o \
tif_codec.o \
@@ -368,9 +357,9 @@ all: @WX_ALL@
@$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME) $(OBJECTS) $(EXTRALIBS)
@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o
@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o @WX_LIBRARY_NAME_SHARED@
@$(INSTALL) -d ./lib
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o $(EXTRALIBS)
$(SHARED_LD) ./lib/$@ $(BURNT_LIBRARY_NAME_GL) glcanvas.o ./lib/@WX_LIBRARY_NAME_SHARED@ $(EXTRALIBS) $(OPENGLLIBS)
./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).r: ./lib/lib@WX_LIBRARY@-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).rsrc
$(DEREZ) $^ $(DEREZFLAGS) > $@
@@ -440,7 +429,7 @@ lexer.c: $(COMMDIR)/lexer.l
-include $(DEPFILES)
afminstall: preinstall
$(INSTALL) -d $(datadir)
@if test ! -d $(datadir); then $(INSTALL) -d $(datadir); fi
$(INSTALL) -d $(datadir)/wx
$(INSTALL) -d $(datadir)/wx/afm
$(INSTALL) -d $(datadir)/wx/gs_afm
@@ -454,9 +443,9 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
@echo " Installing wxWindows..."
@echo " "
$(INSTALL) -d $(prefix)
$(INSTALL) -d $(bindir)
$(INSTALL) -d $(libdir)
@if test ! -d $(prefix); then $(INSTALL) -d $(prefix); fi
@if test ! -d $(bindir); then $(INSTALL) -d $(bindir); fi
@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLKIT_NAME@-config $(bindir)/wx@TOOLKIT_NAME@-config
cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLKIT_NAME@-config wx-config
@@ -479,10 +468,10 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx@TOOLKIT_N
echo "$(INSTALL_DATA) $(top_srcdir)/include/wx/$$p $(includedir)/wx/$$p"; \
done
$(INSTALL) -d $(localedir)
@if test ! -d $(localedir); then $(INSTALL) -d $(localedir); fi
@for p in $(WX_LINGUAS); do \
$(INSTALL) -d $(localedir)/$$p; \
$(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; \
if test ! -d $(localedir)/$$p; then $(INSTALL) -d $(localedir)/$$p; fi;\
if test ! -d $(localedir)/$$p/LC_MESSAGES; then $(INSTALL) -d $(localedir)/$$p/LC_MESSAGES; fi;\
$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo; \
echo "$(INSTALL_DATA) $(top_srcdir)/locale/$$p.mo $(localedir)/$$p/LC_MESSAGES/wxstd.mo"; \
done
@@ -491,7 +480,7 @@ preinstall_gl: $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@
@echo " "
@echo " Installing wxWindows OpenGl add-on..."
@echo " "
$(INSTALL) -d $(libdir)
@if test ! -d $(libdir); then $(INSTALL) -d $(libdir); fi
$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY_GL@ $(libdir)/@WX_TARGET_LIBRARY_GL@
install: @AFMINSTALL@ @WX_ALL_INSTALLED@
@@ -619,7 +608,7 @@ ALL_GUI_DIST: ALL_DIST
mkdir $(DISTDIR)/src/tiff
mkdir $(DISTDIR)/src/iodbc
mkdir $(DISTDIR)/src/unix
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
cp $(SRCDIR)/*.in $(DISTDIR)/src
cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
cp $(COMMDIR)/*.c $(DISTDIR)/src/common
@@ -659,7 +648,7 @@ BASE_DIST: ALL_DIST
mkdir $(DISTDIR)/include/wx/unix
mkdir $(DISTDIR)/src/common
mkdir $(DISTDIR)/src/unix
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)/@PORT_FILES@
cp $(WXDIR)/@PORT_FILES@ $(DISTDIR)
cp $(WXDIR)/@RPM_FILES@ $(DISTDIR)/@RPM_FILES@
cp $(WXDIR)/@RPM_SPEC@ $(DISTDIR)/@RPM_SPEC@
cp $(WXDIR)/wxBase*.ds[pw] $(DISTDIR)
@@ -1385,7 +1374,7 @@ clean:
$(RM) *.d
$(RM) parser.c
$(RM) lexer.c
$(RM) -r ./lib/wx/*
# $(RM) -r ./lib/wx/*
$(RM) ./lib/lib*
cleanall: clean

119
aclocal.m4 vendored
View File

@@ -1,11 +1,104 @@
dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl This program is distributed in the hope that it will be useful,
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
# Configure paths for GTK+
# Owen Taylor 97-11-3
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS. Uses variables
dnl gtk_config_prefix and/or gtk_config_exec_prefix if defined.
AC_DEFUN(AM_PATH_GTK,
[
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
GTK_CFLAGS=`$GTK_CONFIG --cflags`
GTK_LIBS=`$GTK_CONFIG --libs gthread`
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_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
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <gtk/gtkfeatures.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((GTK_MAJOR_VERSION != gtk_major_version) ||
(GTK_MINOR_VERSION != gtk_minor_version) ||
(GTK_MICRO_VERSION != gtk_micro_version)) {
printf("Headers vs. library version mismatch!\n");
exit(1);
}
if (gtk_minor_version == 1) return FALSE;
return !((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
else
no_gtk=yes
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
])
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
dnl
AC_DEFUN(AM_PATH_GTK_2_0,
[dnl
[dnl
dnl Get the cflags and libraries from the gtk-config-2.0 script
dnl
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
@@ -13,12 +106,12 @@ AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed
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)
, enable_gtktest=yes)
for module in . $4
do
case "$module" in
gthread)
gthread)
gtk_config_args="$gtk_config_args gthread"
;;
esac
@@ -67,7 +160,7 @@ dnl
#include <stdio.h>
#include <stdlib.h>
int
int
main ()
{
int major, minor, micro;
@@ -86,7 +179,7 @@ main ()
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
printf("\n*** 'gtk-config-2.0 --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-2.0 was correct, then it is best\n");
@@ -97,16 +190,16 @@ main ()
printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
printf("*** to point to the correct copy of gtk-config-2.0, 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_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);
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);
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
#endif /* defined (GTK_MAJOR_VERSION) ... */
else
@@ -122,7 +215,7 @@ main ()
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);
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");
@@ -143,7 +236,7 @@ main ()
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])
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GTK_CONFIG_2_0" = "no" ; then
@@ -168,7 +261,7 @@ main ()
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 "***"
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 "***"
@@ -192,3 +285,5 @@ main ()
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

4910
configure vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

24
contrib/configure vendored
View File

@@ -812,7 +812,6 @@ done
ac_given_srcdir=$srcdir
trap 'rm -fr `echo "
Makefile
src/Makefile
src/ogl/Makefile
src/mmedia/Makefile
@@ -822,6 +821,8 @@ trap 'rm -fr `echo "
src/gizmos/Makefile
src/plot/Makefile
src/applet/Makefile
src/fl/Makefile
src/net/Makefile
samples/Makefile
samples/mmedia/Makefile
samples/ogl/Makefile
@@ -835,9 +836,17 @@ trap 'rm -fr `echo "
samples/gizmos/multicell/Makefile
samples/gizmos/splittree/Makefile
samples/gizmos/editlbox/Makefile
samples/gizmos/dynsash/Makefile
samples/gizmos/dynsash_switch/Makefile
samples/xrc/Makefile
samples/plot/Makefile
samples/applet/Makefile
samples/fl/Makefile
samples/fl/fl_demo1/Makefile
samples/fl/fl_demo2/Makefile
samples/fl/fl_sample1/Makefile
samples/fl/fl_sample2/Makefile
samples/fl/fl_sample3/Makefile
utils/Makefile
utils/wxrc/Makefile
utils/wxrcedit/Makefile
@@ -920,8 +929,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile
src/Makefile
CONFIG_FILES=\${CONFIG_FILES-"src/Makefile
src/ogl/Makefile
src/mmedia/Makefile
src/stc/Makefile
@@ -930,6 +938,8 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
src/gizmos/Makefile
src/plot/Makefile
src/applet/Makefile
src/fl/Makefile
src/net/Makefile
samples/Makefile
samples/mmedia/Makefile
samples/ogl/Makefile
@@ -943,9 +953,17 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile
samples/gizmos/multicell/Makefile
samples/gizmos/splittree/Makefile
samples/gizmos/editlbox/Makefile
samples/gizmos/dynsash/Makefile
samples/gizmos/dynsash_switch/Makefile
samples/xrc/Makefile
samples/plot/Makefile
samples/applet/Makefile
samples/fl/Makefile
samples/fl/fl_demo1/Makefile
samples/fl/fl_demo2/Makefile
samples/fl/fl_sample1/Makefile
samples/fl/fl_sample2/Makefile
samples/fl/fl_sample3/Makefile
utils/Makefile
utils/wxrc/Makefile
utils/wxrcedit/Makefile

View File

@@ -37,7 +37,6 @@ dnl File output
AC_OUTPUT([
Makefile
src/Makefile
src/ogl/Makefile
src/mmedia/Makefile
@@ -47,6 +46,8 @@ AC_OUTPUT([
src/gizmos/Makefile
src/plot/Makefile
src/applet/Makefile
src/fl/Makefile
src/net/Makefile
samples/Makefile
samples/mmedia/Makefile
samples/ogl/Makefile
@@ -60,9 +61,17 @@ AC_OUTPUT([
samples/gizmos/multicell/Makefile
samples/gizmos/splittree/Makefile
samples/gizmos/editlbox/Makefile
samples/gizmos/dynsash/Makefile
samples/gizmos/dynsash_switch/Makefile
samples/xrc/Makefile
samples/plot/Makefile
samples/applet/Makefile
samples/fl/Makefile
samples/fl/fl_demo1/Makefile
samples/fl/fl_demo2/Makefile
samples/fl/fl_sample1/Makefile
samples/fl/fl_sample2/Makefile
samples/fl/fl_sample3/Makefile
utils/Makefile
utils/wxrc/Makefile
utils/wxrcedit/Makefile

View File

@@ -0,0 +1,335 @@
/////////////////////////////////////////////////////////////////////////////
// Name: animate.h
// Purpose: Animation classes
// Author: Julian Smart and Guillermo Rodriguez Garcia
// Modified by:
// Created: 13/8/99
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ANIMATEH__
#define _WX_ANIMATEH__
#ifdef __GNUG__
#pragma interface "animate.h"
#endif
#include <wx/defs.h>
#include <wx/string.h>
#include <wx/gdicmn.h>
#include <wx/list.h>
#include <wx/timer.h>
//#define ANIMDLLEXPORT WXDLLEXPORT
#define ANIMDLLEXPORT
class ANIMDLLEXPORT wxAnimationBase;
class ANIMDLLEXPORT wxAnimationPlayer;
class WXDLLEXPORT wxImage;
enum wxAnimationDisposal
{
wxANIM_UNSPECIFIED = -1,
wxANIM_DONOTREMOVE = 0,
wxANIM_TOBACKGROUND = 1,
wxANIM_TOPREVIOUS = 2
} ;
class ANIMDLLEXPORT wxAnimationTimer: public wxTimer
{
public:
wxAnimationTimer() { m_player = (wxAnimationPlayer*) NULL; }
virtual void Notify();
void SetPlayer(wxAnimationPlayer* player) { m_player = player; }
protected:
wxAnimationPlayer* m_player;
};
/* wxAnimationPlayer
* Create an object of this class, and either pass an wxXXXAnimation object in the constructor,
* or call SetAnimation. Then call Play().
* The wxAnimation object is only destroyed in the destructor if destroyAnimation is TRUE
* in the constructor.
*/
class ANIMDLLEXPORT wxAnimationPlayer : public wxObject
{
DECLARE_CLASS(wxAnimationPlayer)
public:
wxAnimationPlayer(wxAnimationBase *animation = (wxAnimationBase *) NULL, bool destroyAnimation = FALSE);
~wxAnimationPlayer();
//// Accessors
void SetAnimation(wxAnimationBase* animation, bool destroyAnimation = FALSE);
wxAnimationBase* GetAnimation() const { return m_animation; }
void SetDestroyAnimation(bool destroyAnimation) { m_destroyAnimation = destroyAnimation; };
bool GetDestroyAnimation() const { return m_destroyAnimation; }
void SetCurrentFrame(int currentFrame) { m_currentFrame = currentFrame; };
int GetCurrentFrame() const { return m_currentFrame; }
void SetWindow(wxWindow* window) { m_window = window; };
wxWindow* GetWindow() const { return m_window; }
void SetPosition(const wxPoint& pos) { m_position = pos; };
wxPoint GetPosition() const { return m_position; }
void SetLooped(bool looped) { m_looped = looped; };
bool GetLooped() const { return m_looped; }
bool HasAnimation() const { return (m_animation != (wxAnimationBase*) NULL); }
bool IsPlaying() const { return m_isPlaying; }
// Specify whether the GIF's background colour is to be shown,
// or whether the window background should show through (the default)
void UseBackgroundColour(bool useBackground) { m_useBackgroundColour = useBackground; }
bool UsingBackgroundColour() const { return m_useBackgroundColour; }
// Set and use a user-specified background colour (valid for transparent
// animations only)
void SetCustomBackgroundColour(const wxColour& col, bool useCustomBackgroundColour = TRUE)
{ m_customBackgroundColour = col; m_useCustomBackgroundColour = useCustomBackgroundColour; }
bool UsingCustomBackgroundColour() const { return m_useCustomBackgroundColour; }
const wxColour& GetCustomBackgroundColour() const { return m_customBackgroundColour; }
// Another refinement - suppose we're drawing the animation in a separate
// control or window. We may wish to use the background of the parent
// window as the background of our animation. This allows us to specify
// whether to grab from the parent or from this window.
void UseParentBackground(bool useParent) { m_useParentBackground = useParent; }
bool UsingParentBackground() const { return m_useParentBackground; }
//// Operations
// Play
virtual bool Play(wxWindow& window, const wxPoint& pos = wxPoint(0, 0), bool looped = TRUE);
// Build animation (list of wxImages). If not called before Play
// is called, Play will call this automatically.
virtual bool Build();
// Stop the animation
virtual void Stop();
// Draw the current view of the animation into this DC.
// Call this from your OnPaint, for example.
virtual void Draw(wxDC& dc);
//// Accessing the current animation
virtual int GetFrameCount() const;
virtual wxImage* GetFrame(int i) const; // Creates a new wxImage
virtual wxAnimationDisposal GetDisposalMethod(int i) const;
virtual wxRect GetFrameRect(int i) const; // Position and size of frame
virtual int GetDelay(int i) const; // Delay for this frame
virtual wxSize GetLogicalScreenSize() const;
virtual bool GetBackgroundColour(wxColour& col) const ;
virtual bool GetTransparentColour(wxColour& col) const ;
//// Implementation
// Play the frame
virtual bool PlayFrame(int frame, wxWindow& window, wxPoint& pos);
virtual bool PlayFrame();
virtual void DrawFrame(int frame, wxDC& dc, const wxPoint& pos);
virtual void DrawBackground(wxDC& dc, const wxPoint& pos, const wxColour& colour);
// Clear the wxImage cache
virtual void ClearCache();
// Save the pertinent area of the window so we can restore
// it if drawing transparently
void SaveBackground(const wxRect& rect);
wxBitmap& GetBackingStore() { return m_backingStore; }
//// Data members
protected:
wxAnimationBase* m_animation;
bool m_destroyAnimation; // Destroy m_animation on deletion of this object
wxList m_frames; // List of cached wxBitmap frames.
int m_currentFrame; // Current frame
wxWindow* m_window; // Window to draw into
wxPoint m_position; // Position to draw at
bool m_looped; // Looped, or not
wxAnimationTimer m_timer; // The timer
bool m_isPlaying; // Is the animation playing?
wxBitmap m_savedBackground; // Saved background of window portion
wxBitmap m_backingStore; // The player draws into this
bool m_useBackgroundColour; // Use colour or background
wxColour m_customBackgroundColour; // Override animation background
bool m_useCustomBackgroundColour;
bool m_useParentBackground; // Grab background from parent?
};
/* wxAnimationBase
* Base class for animations.
* A wxXXXAnimation only stores the animation, providing accessors to wxAnimationPlayer.
* Currently an animation is read-only, but we could extend the API for adding frames
* programmatically, and perhaps have a wxMemoryAnimation class that stores its frames
* in memory, and is able to save all files with suitable filenames. You could then use
* e.g. Ulead GIF Animator to load the image files into a GIF animation.
*/
class ANIMDLLEXPORT wxAnimationBase : public wxObject
{
DECLARE_ABSTRACT_CLASS(wxAnimationBase)
public:
wxAnimationBase() {};
~wxAnimationBase() {};
//// Accessors. Should be overridden by each derived class.
virtual int GetFrameCount() const = 0;
virtual wxImage* GetFrame(int i) const = 0; // Creates a new wxImage
virtual wxAnimationDisposal GetDisposalMethod(int i) const = 0;
virtual wxRect GetFrameRect(int i) const = 0; // Position and size of frame
virtual int GetDelay(int i) const = 0; // Delay for this frame
virtual wxSize GetLogicalScreenSize() const = 0;
virtual bool GetBackgroundColour(wxColour& col) const = 0;
virtual bool GetTransparentColour(wxColour& col) const = 0;
// Is the animation OK?
virtual bool IsValid() const = 0;
//// Operations
virtual bool LoadFile(const wxString& filename) { return FALSE; }
};
/* wxGIFAnimation
* This will be moved to a separate file in due course.
*/
class ANIMDLLEXPORT wxGIFDecoder;
class ANIMDLLEXPORT wxGIFAnimation : public wxAnimationBase
{
DECLARE_CLASS(wxGIFAnimation)
public:
wxGIFAnimation() ;
~wxGIFAnimation() ;
//// Accessors
virtual int GetFrameCount() const;
virtual wxImage* GetFrame(int i) const;
virtual wxAnimationDisposal GetDisposalMethod(int i) const;
virtual wxRect GetFrameRect(int i) const; // Position and size of frame
virtual int GetDelay(int i) const; // Delay for this frame
virtual wxSize GetLogicalScreenSize() const ;
virtual bool GetBackgroundColour(wxColour& col) const ;
virtual bool GetTransparentColour(wxColour& col) const ;
virtual bool IsValid() const;
//// Operations
virtual bool LoadFile(const wxString& filename);
protected:
wxGIFDecoder* m_decoder;
};
/*
* wxAnimationCtrlBase
* Abstract base class for format-specific animation controls.
* This class implements most of the functionality; all a derived
* class has to do is create the appropriate animation class on demand.
*/
// Resize to animation size if this is set
#define wxAN_FIT_ANIMATION 0x0010
class ANIMDLLEXPORT wxAnimationCtrlBase: public wxControl
{
public:
wxAnimationCtrlBase() { }
wxAnimationCtrlBase(wxWindow *parent, wxWindowID id,
const wxString& filename = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxAN_FIT_ANIMATION|wxNO_BORDER,
const wxString& name = wxT("animationControl"))
{
Create(parent, id, filename, pos, size, style, name);
}
~wxAnimationCtrlBase();
bool Create(wxWindow *parent, wxWindowID id,
const wxString& filename = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxAN_FIT_ANIMATION|wxNO_BORDER,
const wxString& name = wxT("animationControl"));
//// Operations
virtual bool LoadFile(const wxString& filename = wxEmptyString);
virtual bool Play(bool looped = TRUE) ;
virtual void Stop() { m_animationPlayer.Stop(); }
virtual void FitToAnimation();
//// Accessors
virtual bool IsPlaying() const { return m_animationPlayer.IsPlaying(); }
virtual wxAnimationPlayer& GetPlayer() { return m_animationPlayer; }
virtual wxAnimationBase* GetAnimation() { return m_animation; }
const wxString& GetFilename() const { return m_filename; }
void SetFilename(const wxString& filename) { m_filename = filename; }
//// Event handlers
void OnPaint(wxPaintEvent& event);
protected:
virtual wxSize DoGetBestSize() const;
// Override this in derived classes
virtual wxAnimationBase* DoCreateAnimation(const wxString& filename) = 0;
wxAnimationPlayer m_animationPlayer;
wxAnimationBase* m_animation;
wxString m_filename;
private:
DECLARE_ABSTRACT_CLASS(wxAnimationCtrlBase)
DECLARE_EVENT_TABLE()
};
/*
* wxGIFAnimationCtrl
* Provides a GIF animation class when required.
*/
class ANIMDLLEXPORT wxGIFAnimationCtrl: public wxAnimationCtrlBase
{
public:
wxGIFAnimationCtrl() { }
wxGIFAnimationCtrl(wxWindow *parent, wxWindowID id,
const wxString& filename = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = wxAN_FIT_ANIMATION|wxNO_BORDER,
const wxString& name = wxT("animationControl"))
{
Create(parent, id, filename, pos, size, style, name);
}
protected:
virtual wxAnimationBase* DoCreateAnimation(const wxString& filename) ;
private:
DECLARE_DYNAMIC_CLASS(wxGIFAnimationCtrl)
};
#endif // _WX_ANIMATEH__

View File

@@ -44,7 +44,7 @@ public:
wxEchoVariable() : wxObject() {}
~wxEchoVariable() {}
/****************************************************************************
/****************************************************************************
RETURNS:
The boolean value of the variable
@@ -65,8 +65,8 @@ public:
public:
// static function to retrieve any variable avaliable
static wxString GetValue(const wxString &cls, const char *parms = NULL);
};
static wxString FindValue(const wxString &cls, const char *parms = NULL);
};
/*--------------------------------- MACROS --------------------------------*/
@@ -83,13 +83,13 @@ public:
wxString wxEchoVariable##name :: GetValue(const char *parms) const { \
wxString _BEV_parm = wxString(parms);
#define END_ECHO_VARIABLE(name, returnval) \
#define END_ECHO_VARIABLE(returnval) \
return returnval; \
}
#define STRING_ECHO_VARIABLE(name, string) \
BEGIN_ECHO_VARIABLE(##name##); \
END_ECHO_VARIABLE(##name##, wxString(##string##))
END_ECHO_VARIABLE(wxString(##string##))
#endif // __WX_ECHOVAR_H

View File

@@ -66,8 +66,8 @@ public:
public:
// static function to retrieve any variable avaliable
static bool GetValue(const wxString &cls);
};
static bool FindValue(const wxString &cls);
};
/*--------------------------------- MACROS --------------------------------*/
@@ -82,14 +82,13 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxIfElseVariable##name##, wxIfElseVariable); \
bool wxIfElseVariable##name :: GetValue() const {
#define END_IFELSE_VARIABLE(name, returnval) \
#define END_IFELSE_VARIABLE(returnval) \
return returnval; \
}
#define IFELSE_VARIABLE(name, state) \
BEGIN_IFELSE_VARIABLE(##name##); \
END_IFELSE_VARIABLE(##name##, bool (state))
END_IFELSE_VARIABLE(bool (state))
#endif // __WX_IFELSEVAR_H

View File

@@ -5,19 +5,23 @@
* Copyright (C) 1991-2001 SciTech Software, Inc.
* All rights reserved.
*
* ========================================================================
*
* The contents of this file are subject to the wxWindows License
* Version 3.0 (the "License"); you may not use this file except in
* compliance with the License. You may obtain a copy of the License at
* http://www.wxwindows.org/licence3.txt
*
* Software distributed under the License is distributed on an
* "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* ========================================================================
* ======================================================================
* |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
* | |
* |This copyrighted computer code is a proprietary trade secret of |
* |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
* |USA (www.scitechsoft.com). ANY UNAUTHORIZED POSSESSION, USE, |
* |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS |
* |STRICTLY PROHIBITED BY LAW. Unless you have current, express |
* |written authorization from SciTech to possess or use this code, you |
* |may be subject to civil and/or criminal penalties. |
* | |
* |If you received this code in error or you would like to report |
* |improper use, please immediately contact SciTech Software, Inc. at |
* |530-894-8400. |
* | |
* |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
* ======================================================================
*
* Language: ANSI C++
* Environment: Any
@@ -30,6 +34,7 @@
#define __WX_APPLET_WINDOW_H
#include "wx/html/htmlwin.h"
#include "wx/process.h"
// Forward declare
class wxApplet;
@@ -89,7 +94,7 @@ protected:
wxToolBarBase *m_NavBar;
int m_NavBackId;
int m_NavForwardId;
wxString m_DocRoot;
public:
// Constructor
wxHtmlAppletWindow(
@@ -101,7 +106,8 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxHW_SCROLLBAR_AUTO,
const wxString& name = "htmlAppletWindow");
const wxString& name = "htmlAppletWindow",
const wxString& docroot = "" );
// Destructor
~wxHtmlAppletWindow();
@@ -135,13 +141,13 @@ public:
void SendMessage(wxEvent& msg);
// Register a cookie of data in the applet manager
bool RegisterCookie(const wxString& name,wxObject *cookie);
static bool RegisterCookie(const wxString& name,wxObject *cookie);
// UnRegister a cookie of data in the applet manager
bool UnRegisterCookie(const wxString& name);
static bool UnRegisterCookie(const wxString& name);
// Find a cookie of data given it's public name
wxObject *FindCookie(const wxString& name);
static wxObject *FindCookie(const wxString& name);
// Event handlers to load a new page
void OnLoadPage(wxLoadPageEvent &event);
@@ -150,16 +156,36 @@ public:
void OnPageLoaded(wxPageLoadedEvent &event);
// LoadPage mutex locks
void Lock() { m_mutexLock = true;};
void UnLock() { m_mutexLock = false;};
void Lock(){ m_mutexLock = true;};
void UnLock(){ m_mutexLock = false;};
// Returns TRUE if the mutex is locked, FALSE otherwise.
bool IsLocked() { return m_mutexLock;};
bool IsLocked(){ return m_mutexLock;};
// Tries to lock the mutex. If it can't, returns immediately with false.
bool TryLock();
};
/****************************************************************************
REMARKS:
Defines the class for AppetProcess
***************************************************************************/
class AppletProcess : public wxProcess {
public:
AppletProcess(
wxWindow *parent)
: wxProcess(parent)
{
}
// instead of overriding this virtual function we might as well process the
// event from it in the frame class - this might be more convenient in some
// cases
virtual void OnTerminate(int pid, int status);
};
#endif // __WX_APPLET_WINDOW_H

View File

@@ -0,0 +1,64 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas (@Lithuania)
// Modified by:
// Created: 23/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __ANTIFLICKPL_G__
#define __ANTIFLICKPL_G__
#ifdef __GNUG__
#pragma interface "antiflickpl.h"
#endif
#include "wx/fl/controlbar.h"
class cbAntiflickerPlugin : public cbPluginBase
{
DECLARE_DYNAMIC_CLASS( cbAntiflickerPlugin )
protected:
// double-buffers are shared "resource" among all instances of
// antiflicker plugin within the application
//
// TODO:: locking should be implemented, for multithreaded GUIs
static wxBitmap* mpVertBuf;
static wxBitmap* mpHorizBuf;
static wxMemoryDC* mpVertBufDc;
static wxMemoryDC* mpHorizBufDc;
static int mRefCount;
wxDC* mpLRUBufDc; // last-reacently-used buffer
wxRect mLRUArea; // last-reacently-used area
protected:
// returns NULL, if sutable buffer is not present
wxDC* FindSuitableBuffer( const wxRect& forArea );
wxDC* AllocNewBuffer( const wxRect& forArea );
wxDC& GetWindowDC();
wxDC& GetClientDC();
public:
cbAntiflickerPlugin(void);
cbAntiflickerPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
virtual ~cbAntiflickerPlugin();
// handlers for plugin events
void OnStartDrawInArea ( cbStartDrawInAreaEvent& event );
void OnFinishDrawInArea( cbFinishDrawInAreaEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __ANTIFLICKPL_G__ */

View File

@@ -0,0 +1,122 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 23/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __BARDRAGPL_G__
#define __BARDRAGPL_G__
#ifdef __GNUG__
#pragma interface "bardragpl.h"
#endif
#include "wx/fl/controlbar.h"
#include "wx/fl/toolwnd.h"
class cbBarDragPlugin : public cbPluginBase
{
DECLARE_DYNAMIC_CLASS( cbBarDragPlugin )
protected:
// plugin is active only in bar-dragging state
bool mBarDragStarted;
bool mCanStick; // flag used to prevent "bouncing" of hint-rectangle
wxScreenDC* mpScrDc; // created while tracking hint-rect
wxCursor* mpCurCursor;
// rectnagle shows the position/dimensions of the bar,
// if it would be docked now
wxRect mPrevHintRect;
wxRect mHintRect;
int mMouseInRectX;
int mMouseInRectY;
cbDockPane* mpSrcPane; // pane, from which the bar was originally taken
int mBarWidthInSrcPane;
cbDockPane* mpCurPane;
cbBarInfo* mpDraggedBar; // bar, which is being dragged
bool mBarWasFloating;
wxRect mFloatedBarBounds;
public: /*** public properties ***/
int mInClientHintBorder; // when hint-rect moves within client window area,
// the thicker rectangle is drawn using hatched brush,
// the default border width for this rectangle is 8 pix.
protected:
void AdjustHintRect( wxPoint& mousePos );
void ClipRectInFrame( wxRect& rect );
void ClipPosInFrame( wxPoint& pos );
cbDockPane* HitTestPanes( wxRect& rect );
cbDockPane* HitTestPanes( wxPoint& pos );
bool HitsPane( cbDockPane* pPane, wxRect& rect );
void CalcOnScreenDims( wxRect& rect );
int GetDistanceToPane( cbDockPane* pPane, wxPoint& mousePos );
bool IsInOtherPane ( wxPoint& mousePos );
bool IsInClientArea( wxPoint& mousePos );
bool IsInClientArea( wxRect& rect );
void StickToPane( cbDockPane* pPane, wxPoint& mousePos );
void UnstickFromPane( cbDockPane* pPane, wxPoint& mousePos );
int GetBarWidthInPane( cbDockPane* pPane );
int GetBarHeightInPane( cbDockPane* pPane );
// on-screen hint-tracking related methods
void StartTracking();
void DrawHintRect ( wxRect& rect, bool isInClientRect);
void EraseHintRect( wxRect& rect, bool isInClientRect);
void FinishTracking();
void DoDrawHintRect( wxRect& rect, bool isInClientRect);
void RectToScr( wxRect& frameRect, wxRect& scrRect );
void ShowHint( bool prevWasInClient );
public:
cbBarDragPlugin(void);
cbBarDragPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
virtual ~cbBarDragPlugin();
// handlers for plugin events
void OnMouseMove( cbMotionEvent& event );
void OnLButtonUp( cbLeftUpEvent& event );
void OnLButtonDown( cbLeftDownEvent& event );
void OnLDblClick( cbLeftDClickEvent& event );
// handles event, which oriniates from itself
void OnDrawHintRect( cbDrawHintRectEvent& event );
void OnStartBarDragging( cbStartBarDraggingEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __BARDRAGPL_G__ */

View File

@@ -0,0 +1,96 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 30/11/98 (my 22th birthday :-)
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __DRAGHINTSPL_G__
#define __DRAGHINTSPL_G__
#ifdef __GNUG__
#pragma interface "barhintspl.h"
#endif
#include "wx/fl/controlbar.h"
#include "wx/fl/toolwnd.h"
/*
* Intercepts bar-decoration and sizing events, draws 3d-hints
* around fixed and flexible bars, similar to those in Microsoft DevStudio 6.x
*/
class cbBarHintsPlugin : public cbPluginBase
{
DECLARE_DYNAMIC_CLASS( cbBarHintsPlugin )
protected:
cbDockPane* mpPane; // is set up temorarely, while handling event
cbMiniButton* mBoxes[2];
bool mBtnPressed;
bool mClosePressed;
cbBarInfo* mpClickedBar;
bool mDepressed;
protected:
// drawing helpers
void Draw3DBox ( wxDC& dc, const wxPoint& pos, bool pressed );
void DrawCloseBox ( wxDC& dc, const wxPoint& pos, bool pressed );
void DrawCollapseBox( wxDC& dc, const wxPoint& pos,
bool atLeft, bool disabled, bool pressed );
void DrawGrooves ( wxDC& dc, const wxPoint& pos, int length );
void DoDrawHint( wxDC& dc, wxRect& rect, int pos, int boxOfs, int grooveOfs, bool isFixed );
void GetHintsLayout( wxRect& rect, cbBarInfo& info,
int& boxOfs, int& grooveOfs, int& pos );
int HitTestHints( cbBarInfo& info, const wxPoint& pos );
void ExcludeHints( wxRect& rect, cbBarInfo& info );
void CreateBoxes();
public:
/* public properties */
bool mCloseBoxOn; // default: ON
bool mCollapseBoxOn; // default: ON
int mGrooveCount; // default: 2 (two shaded bars)
int mHintGap; // default: 5 (pixels from above, below, right and left)
int mXWeight; // default: 2 (width in pixels of lines which used for drawing cross)
public:
cbBarHintsPlugin(void);
cbBarHintsPlugin( wxFrameLayout* pLayout, int paneMask = wxALL_PANES );
~cbBarHintsPlugin();
void SetGrooveCount( int nGrooves );
void OnInitPlugin();
// handlers of plugin-events
void OnSizeBarWindow( cbSizeBarWndEvent& event );
void OnDrawBarDecorations( cbDrawBarDecorEvent& event );
void OnLeftDown( cbLeftDownEvent& event );
void OnLeftUp ( cbLeftUpEvent& event );
void OnMotion ( cbMotionEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __DRAGHINTSPL_G__ */

View File

@@ -0,0 +1,47 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 28/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __CBCUSTOM_G__
#define __CBCUSTOM_G__
#ifdef __GNUG__
#pragma interface "cbcustom.h"
#endif
#include "wx/fl/controlbar.h"
class cbSimpleCustomizationPlugin : public cbPluginBase
{
public:
DECLARE_DYNAMIC_CLASS( cbSimpleCustomizationPlugin )
int mCustMenuItemId;
public:
cbSimpleCustomizationPlugin(void);
cbSimpleCustomizationPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
// plugin-event handlers
void OnCustomizeBar( cbCustomizeBarEvent& event );
void OnCustomizeLayout( cbCustomizeLayoutEvent& event );
// menu-event handler
void OnMenuItemSelected( wxCommandEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __CBCUSTOM_G__ */

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,22 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 23/01/99
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __DYNBARHND_G__
#define __DYNBARHND_G__
#ifdef __GNUG__
#pragma interface "dynbarhnd.h"
#endif
#include "wx/fl/controlbar.h"
#endif /* __DYNBARHND_G__ */

View File

@@ -0,0 +1,204 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: ??/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __DYNTBAR_G__
#define __DYNTBAR_G__
#ifdef __GNUG__
#pragma interface "dyntbar.h"
#endif
#include "wx/tbarbase.h"
#include "wx/dynarray.h"
// layout item
class wxToolLayoutItem : public wxObject
{
public:
wxRect mRect;
bool mIsSeparator;
};
class wxDynToolInfo;
typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
typedef wxDynToolInfo* wxDynToolInfoPtrT;
WX_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT );
WX_DEFINE_ARRAY( wxDynToolInfoPtrT, wxDynToolInfoArrayT );
// base class for layouting algorithm implementations
class LayoutManagerBase
{
public:
virtual void Layout( const wxSize& parentDim,
wxSize& resultingDim,
wxLayoutItemArrayT& items,
int horizGap,
int vertGap ) = 0;
virtual ~LayoutManagerBase() {}
};
// layouts items in left-to-right order from
// top towards bottom
class BagLayout : public LayoutManagerBase
{
public:
virtual void Layout( const wxSize& parentDim,
wxSize& resultingDim,
wxLayoutItemArrayT& items,
int horizGap,
int vertGap );
};
class wxDynToolInfo : public wxToolLayoutItem
{
DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
public:
wxWindow* mpToolWnd;
int mIndex;
wxSize mRealSize;
};
// layouting orientations for tools
#define LO_HORIZONTAL 0
#define LO_VERTICAL 1
#define LO_FIT_TO_WINDOW 2
// class manages containment and layouting of tool-windows
class wxDynamicToolBar : public wxToolBarBase
{
DECLARE_DYNAMIC_CLASS(wxDynamicToolBar)
protected:
friend class wxDynamicToolBarSerializer;
wxDynToolInfoArrayT mTools;
LayoutManagerBase* mpLayoutMan;
protected:
virtual void SizeToolWindows();
public: /* public properties */
int mSepartorSize; // default: 8
int mVertGap; // default: 0
int mHorizGap; // default: 0
public:
wxDynamicToolBar();
wxDynamicToolBar(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxNO_BORDER, const int orientation = wxVERTICAL,
const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
~wxDynamicToolBar(void);
bool Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
const long style = wxNO_BORDER, const int orientation = wxVERTICAL, const int RowsOrColumns = 1, const wxString& name = wxToolBarNameStr);
// overridables
virtual void AddTool( int toolIndex,
wxWindow* pToolWindow,
const wxSize& size = wxDefaultSize );
virtual void AddTool( int toolIndex,
const wxString& imageFileName,
int imageFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "", bool alignTextRight = FALSE,
bool isFlat = TRUE );
virtual void AddTool( int toolIndex, wxBitmap labelBmp,
const wxString& labelText = "", bool alignTextRight = FALSE,
bool isFlat = TRUE );
// method from wxToolBarBase (for compatibility), only
// first two arguments are valid
virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
const wxString& helpString1 = "", const wxString& helpString2 = "");
virtual void AddSeparator( wxWindow* pSepartorWnd = NULL );
wxDynToolInfo* GetToolInfo( int toolIndex );
void RemveTool( int toolIndex );
// the default implementation draws shaded line
virtual void DrawSeparator( wxDynToolInfo& info, wxDC& dc );
// see definitions of orientation types
virtual bool Layout();
virtual void GetPreferredDim( const wxSize& givenDim, wxSize& prefDim );
virtual LayoutManagerBase* CreateDefaulLayout() { return new BagLayout(); }
virtual void SetLayout( LayoutManagerBase* pLayout );
virtual void EnableTool(const int toolIndex, const bool enable = TRUE);
// event handlers
void OnSize( wxSizeEvent& event );
void OnPaint( wxPaintEvent& event );
void OnEraseBackground( wxEraseEvent& event );
// overriden from wxToolBarBase
virtual bool Realize(void);
// stuff from the 2.1.15
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x,
wxCoord y) const;
virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
// the tool is still in m_tools list when this function is called, it will
// only be deleted from it if it succeeds
virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
// called when the tools enabled flag changes
virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
// called when the tool is toggled
virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
// called when the tools "can be toggled" flag changes
virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
// the functions to create toolbar tools
virtual wxToolBarToolBase *CreateTool(int id,
const wxBitmap& bitmap1,
const wxBitmap& bitmap2,
bool toggle,
wxObject *clientData,
const wxString& shortHelpString,
const wxString& longHelpString);
virtual wxToolBarToolBase *CreateTool(wxControl *control);
DECLARE_EVENT_TABLE()
};
#endif /* __DYNTBAR_G__ */

View File

@@ -0,0 +1,31 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 23/01/99
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __DYNTBARHND_G__
#define __DYNTBARHND_G__
#ifdef __GNUG__
#pragma interface "dyntbarhnd.h"
#endif
#include "wx/fl/controlbar.h"
#include "wx/fl/dyntbar.h"
class cbDynToolBarDimHandler : public cbBarDimHandlerBase
{
DECLARE_DYNAMIC_CLASS( cbDynToolBarDimHandler )
public:
void OnChangeBarState(cbBarInfo* pBar, int newState );
void OnResizeBar( cbBarInfo* pBar, const wxSize& given, wxSize& preferred );
};
#endif /* __DYNTBARHND_G__ */

View File

@@ -0,0 +1,140 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 02/01/99
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __FRMVIEW_G__
#define __FRMVIEW_G__
#ifdef __GNUG__
#pragma interface "frmview.h"
#endif
#include "wx/module.h"
#if 0
#include "wx/fl/objstore.h"
#endif
class wxObjectStorage;
#include "wx/fl/controlbar.h"
class wxFrameManager;
class wxFrameView : public wxEvtHandler
{
protected:
wxStringList mTopMenus;
wxFrameLayout* mpLayout;
wxFrameManager* mpFrameMgr;
bool mDoToolUpdates;
friend class wxFrameManager;
friend class wxFrameViewSerializer;
protected:
void OnIdle( wxIdleEvent& event);
public:
wxFrameView();
~wxFrameView();
virtual void Activate();
virtual void Deactivate();
wxFrame* GetParentFrame();
wxWindow* GetClientWindow();
wxFrameManager& GetFrameManager();
void RegisterMenu( const wxString& topMenuName );
void CreateLayout();
wxFrameLayout* GetLayout();
void SetLayout( wxFrameLayout* pLayout );
void SetToolUpdates( bool doToolUpdates = TRUE );
// hooks for specific frame-views
virtual void OnInit() {}
virtual void OnSerialize( wxObjectStorage& store ) {}
virtual void OnActiveate() {}
virtual void OnDeactivate() {}
// imp. is mandatory
virtual void OnRecreate() {}
virtual void OnInitMenus() {}
DECLARE_EVENT_TABLE()
};
class wxFrame;
class wxFrameManager : wxObject
{
protected:
wxList mViews;
wxWindow* mpFrameWnd;
int mActiveViewNo;
wxWindow* mpClientWnd;
#if 0
wxObjectStorage mStore;
#endif
wxString mSettingsFile;
protected:
void DoSerialize( wxObjectStorage& store );
void DestroyViews();
int GetViewNo( wxFrameView* pView );
void EnableMenusForView( wxFrameView* pView, bool enable );
void SyncAllMenus();
public:
wxFrameManager();
~wxFrameManager();
// if file name is empty, views are are not saved/loaded
virtual void Init( wxWindow* pMainFrame, const wxString& settingsFile = "" );
// synonyms
wxFrame* GetParentFrame();
wxWindow* GetParentWindow();
int GetActiveViewNo();
wxFrameView* GetActiveView();
wxNode* GetActiveViewNode();
wxFrameView* GetView( int viewNo );
void SetClinetWindow( wxWindow* pFrameClient );
wxWindow* GetClientWindow();
void AddView( wxFrameView* pFrmView );
void RemoveView( wxFrameView* pFrmView );
void ActivateView( int viewNo );
void ActivateView( wxFrameView* pFrmView );
void DeactivateCurrentView();
wxObjectStorage& GetObjectStore();
void SaveViewsNow();
bool ReloadViews();
bool ViewsAreLoaded();
};
#endif /* __FRMVIEW_G__ */

View File

@@ -0,0 +1,74 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas (@Lithuania)
// Modified by:
// Created: ??/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __GARBAGEC_G__
#define __GARBAGEC_G__
#ifdef __GNUG__
#pragma interface "garbagec.h"
#endif
#include "wx/list.h"
struct GCItem
{
void* mpObj;
wxList mRefs; // references to other nodes
};
inline void* gc_node_to_obj( wxNode* pGCNode )
{
return ( (GCItem*) (pGCNode->Data()) )->mpObj;
}
// class implements extremely slow, but probably one of the most simple GC algorithms
class GarbageCollector
{
protected:
wxList mAllNodes;
wxList mRegularLst;
wxList mCycledLst;
wxNode* FindItemNode( void* pForObj );
void ResolveReferences();
wxNode* FindReferenceFreeItemNode();
void RemoveReferencesToNode( wxNode* pItemNode );
void DestroyItemList( wxList& lst );
public:
GarbageCollector() {}
virtual ~GarbageCollector();
// prepare data for GC alg.
virtual void AddObject( void* pObj, int refCnt = 1 );
virtual void AddDependency( void* pObj, void* pDependsOnObj );
// executes GC alg.
virtual void ArrangeCollection();
// access results of the alg.
wxList& GetRegularObjects();
wxList& GetCycledObjects();
// removes all data from GC
void Reset();
};
#endif /* __GARBAGEC_G__ */

View File

@@ -0,0 +1,123 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 19/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __GCUPDATESMGR_G__
#define __GCUPDATESMGR_G__
#ifdef __GNUG__
#pragma interface "gcupdatesmgr.h"
#endif
#include "wx/fl/controlbar.h"
#include "wx/fl/updatesmgr.h"
#include "wx/fl/garbagec.h"
/*
* class implements optimized logic for refreshing
* areas of frame layout - which actually need to be updated.
* Is used as default updates-manager by wxFrameLayout.
*
* it is called "Garbage Collecting" u.mgr for it's implementation
* tries to find out dependencies between bars, and to order
* them ito "hierarchy", this hierarchical sorting resembles
* implemenation of heap-garbage collectors, which resolve
* dependencies between references.
*
* Example: there are situations where the order of moving
* the windows does matter:
*
* case 1)
* ------ ---
* | A | |B|
* ------ ---> | |
* --- --- ------
* |B| | A |
* | | ------
* ---
* (future)
* (past)
*
* past/future positions of A and B windows completely overlapp, i.e.
* depend on each other, and there is not solution for
* moving the windows witout refreshing both of them,
* -- we have cyclic dependency here. The gc. alg will
* find this cyclic dependecy and will force "refresh"
* after movement.
*
* case 2)
*
* ------
* | A |
* ------ --->
* ---
* |B| ------
* | | | A |
* --- ------
* ---
* |B|
* | |
* ---
*
* (future)
* (past)
*
* in this case past/future positions do not overlapp, thus
* it's enough only to move windows, without refreshing them.
* GC will "notice" it.
*
* there is also third case, when overlapping is partial
* in this case the refershing can be also avoided by
* moving windows in the order of "most-dependant" towards the
* "least-dependent". GC handles this automatically, by
* sorting windows by their dependency-level (or "hierarchy")
*
* See garbagec.h for more details of this method, garbagec.h/cpp
* implement sorting of generic-dependencies (does not deal
* with graphical objects directly)
*
* Summary: improves performance when complex/large windows are
* moved around, by reducing number of repaints. Also helps
* to avoid dirty non-client areas of moved windows
* in some special cases of "overlapping anomalies"
*/
class cbGCUpdatesMgr : public cbSimpleUpdatesMgr
{
DECLARE_DYNAMIC_CLASS( cbGCUpdatesMgr )
protected:
GarbageCollector mGC;
void DoRepositionItems( wxList& items );
void AddItem( wxList& itemList,
cbBarInfo* pBar,
cbDockPane* pPane,
wxRect& curBounds,
wxRect& prevBounds );
public:
cbGCUpdatesMgr(void) {}
cbGCUpdatesMgr( wxFrameLayout* pPanel );
// notificiactions received from Frame Layout :
virtual void OnStartChanges();
// refreshes parts of the frame layout, which need an update
virtual void UpdateNow();
};
#endif /* __GCUPDATESMGR_G__ */

View File

@@ -0,0 +1,120 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 9/11/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __HINTANIMPL_G__
#define __HINTANIMPL_G__
#ifdef __GNUG__
#pragma interface "hintanimpl.h"
#endif
#include "wx/fl/controlbar.h"
#include "wx/timer.h"
class cbHintAnimTimer;
class cbHintAnimationPlugin : public cbPluginBase
{
DECLARE_DYNAMIC_CLASS( cbHintAnimationPlugin )
protected:
friend class cbHintAnimTimer;
wxScreenDC* mpScrDc; // created while tracking hint-rect
cbHintAnimTimer* mpAnimTimer;
// FOR NOW:: try it without mutually exculisve locks
volatile wxRect mCurRect;
// state variables
bool mAnimStarted;
bool mStopPending;
bool mPrevInClient;
bool mCurInClient;
wxRect mPrevRect;
public:
int mMorphDelay; // delay between frames in miliseconds, default: 20
int mMaxFrames; // number of iterations for hint morphing, default: 30
// (morph duration = mMorphDelay * mMaxFrames msec)
int mInClientHintBorder; // default: 4 pixels
bool mAccelerationOn; // TRUE, if morph accelerates, otherwise morph
// speed is constant. Default: TRUE
// TBD:: get/set methods for above members
protected:
void StartTracking();
void DrawHintRect ( wxRect& rect, bool isInClientRect);
void EraseHintRect( wxRect& rect, bool isInClientRect);
void FinishTracking();
void DoDrawHintRect( wxRect& rect, bool isInClientRect);
void RectToScr( wxRect& frameRect, wxRect& scrRect );
public:
cbHintAnimationPlugin(void);
~cbHintAnimationPlugin();
cbHintAnimationPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
void OnDrawHintRect( cbDrawHintRectEvent& event );
DECLARE_EVENT_TABLE()
};
// helper classes
struct MorphInfoT
{
wxPoint mFrom;
wxPoint mTill;
};
class cbHintAnimTimer : public wxTimer
{
protected:
friend class cbHintAnimationPlugin;
wxRect mPrevMorphed;
MorphInfoT mUpperLeft;
MorphInfoT mLowerRight;
int mCurIter;
long mLock;
cbHintAnimationPlugin* mpPl;
void MorphPoint( wxPoint& origin, MorphInfoT& info, wxPoint& point );
public:
cbHintAnimTimer(void);
virtual void Notify(void);
virtual bool Init( cbHintAnimationPlugin* pAnimPl, bool reinit );
};
#endif /* __HINTANIMPL_G__ */

View File

@@ -0,0 +1,165 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: ??/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __NEWBMPBTN_G__
#define __NEWBMPBTN_G__
#ifdef __GNUG__
#pragma interface "newbmpbtn.h"
#endif
#include "wx/button.h"
#include "wx/string.h"
// button lable-text alignment types
#define NB_ALIGN_TEXT_RIGHT 0
#define NB_ALIGN_TEXT_BOTTOM 1
#define NB_NO_TEXT 2
#define NB_NO_IMAGE 3
// classes declared in this header file
class wxNewBitmapButton;
class wxBorderLessBitmapButton;
// alternative class for wxBmpButton
class wxNewBitmapButton: public wxPanel
{
DECLARE_DYNAMIC_CLASS(wxNewBitmapButton)
protected:
friend class wxNewBitmapButtonSerializer;
int mTextToLabelGap;
int mMarginX;
int mMarginY;
int mTextAlignment;
bool mIsSticky;
bool mIsFlat;
wxString mLabelText;
wxString mImageFileName;
int mImageFileType;
wxBitmap mDepressedBmp; // source image for rendering
// labels for particular state
wxBitmap mFocusedBmp; // may not be always present -
// only if mHasFocusedBmp is TRUE
wxBitmap* mpDepressedImg;
wxBitmap* mpPressedImg;
wxBitmap* mpDisabledImg;
wxBitmap* mpFocusedImg;
// button state variables;
bool mDragStarted;
bool mIsPressed;
bool mIsInFocus;
bool mPrevPressedState;
bool mPrevInFocusState;
bool mHasFocusedBmp;
// type of event which is fired upon depression of this button
int mFiredEventType;
// pens for drawing decorations (borders)
wxPen mBlackPen;
wxPen mDarkPen;
wxPen mGrayPen;
wxPen mLightPen;
bool mIsCreated;
int mSizeIsSet;
protected:
void DestroyLabels();
// returns the label which match the current button state
virtual wxBitmap* GetStateLabel();
virtual void DrawShade( int outerLevel,
wxDC& dc,
wxPen& upperLeftSidePen,
wxPen& lowerRightSidePen );
bool IsInWindow( int x,int y );
public:
wxNewBitmapButton( const wxBitmap& labelBitmap = wxNullBitmap,
const wxString& labelText = "",
int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE,
// this is the default type of fired events
int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
int marginX = 2,
int marginY = 2,
int textToLabelGap = 2,
bool isSticky = FALSE
);
// use this constructor if buttons have to be persistant
wxNewBitmapButton( const wxString& bitmapFileName,
const int bitmapFileType = wxBITMAP_TYPE_BMP,
const wxString& labelText = "",
int alignText = NB_ALIGN_TEXT_BOTTOM,
bool isFlat = TRUE,
// this is the default type of fired events
int firedEventType = wxEVT_COMMAND_MENU_SELECTED,
int marginX = 2,
int marginY = 2,
int textToLabelGap = 2,
bool isSticky = FALSE
);
~wxNewBitmapButton();
// should be called after Create();
virtual void Reshape();
// overridables
virtual void SetLabel(const wxBitmap& labelBitmap, const wxString& labelText = "" );
virtual void SetAlignments( int alignText = NB_ALIGN_TEXT_BOTTOM,
int marginX = 2,
int marginY = 2,
int textToLabelGap = 2);
virtual void DrawDecorations( wxDC& dc );
virtual void DrawLabel( wxDC& dc );
virtual void RenderLabelImage( wxBitmap*& destBmp, wxBitmap* srcBmp,
bool isEnabled = TRUE,
bool isPressed = FALSE);
virtual void RenderLabelImages();
virtual void RenderAllLabelImages();
// event handlers
void OnLButtonDown( wxMouseEvent& event );
void OnLButtonUp( wxMouseEvent& event );
void OnMouseMove( wxMouseEvent& event );
void OnSize( wxSizeEvent& event );
void OnPaint( wxPaintEvent& event );
void OnEraseBackground( wxEraseEvent& event );
void OnKillFocus( wxFocusEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __NEWBMPBTN_G__ */

View File

@@ -0,0 +1,119 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Central header file for control-bar related classes
//
// Author: Aleksandras Gluchovas <mailto:alex@soften.ktu.lt>
// Modified by:
// Created: 06/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __PANEDRAWPL_G__
#define __PANEDRAWPL_G__
#ifdef __GNUG__
#pragma interface "panedrawpl.h"
#endif
#include "wx/fl/controlbar.h"
/*
* Simple, but all-in-one plugin implementation. Resembles look & feel of
* to MFC control-bars. Handles painting of pane and items in it.
* Fires bar/layout customization event, when user right-clicks bar/pane.
* Hooking an instance of this and row-layouting plugins per each pane,
* would be enough for the frame layout to function properly.
* (they are plugged in autimatically by wxFrameLayout class)
*/
class cbPaneDrawPlugin : public cbPluginBase
{
public:
DECLARE_DYNAMIC_CLASS( cbPaneDrawPlugin )
protected:
// resizing bars/rows state variables
bool mResizeStarted;
bool mResizeCursorOn;
wxPoint mDragOrigin;
cbBarInfo* mpDraggedBar; // also used when in bar-drag action
cbRowInfo* mpResizedRow;
bool mRowHandleHitted;
bool mIsUpperHandle;
bool mBarHandleHitted;
bool mIsLeftHandle;
bool mBarContentHitted;
// contstraints for dragging the handle
wxRect mHandleDragArea;
bool mHandleIsVertical;
int mHandleOfs;
int mDraggedDelta;
wxPoint mPrevPos;
// used for handling, start-draw-in-area events
wxClientDC* mpClntDc;
cbDockPane* mpPane; // is set up temorary short-cut, while handling event
protected:
// helpers
void DrawDraggedHandle( const wxPoint& pos, cbDockPane& pane );
virtual void DrawPaneShade( wxDC& dc, int alignment );
virtual void DrawPaneShadeForRow( cbRowInfo* pRow, wxDC& dc );
virtual void DrawUpperRowHandle( cbRowInfo* pRow, wxDC& dc );
virtual void DrawLowerRowHandle( cbRowInfo* pRow, wxDC& dc );
virtual void DrawUpperRowShades( cbRowInfo* pRow, wxDC& dc, int level );
virtual void DrawLowerRowShades( cbRowInfo* pRow, wxDC& dc, int level );
virtual void DrawBarInnerShadeRect( cbBarInfo* pBar, wxDC& dc );
virtual void DrawShade( int level, wxRect& rect, int alignment, wxDC& dc );
virtual void DrawShade1( int level, wxRect& rect, int alignment, wxDC& dc );
inline void SetLightPixel( int x, int y, wxDC& dc );
inline void SetDarkPixel ( int x, int y, wxDC& dc );
public:
cbPaneDrawPlugin(void);
cbPaneDrawPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
virtual ~cbPaneDrawPlugin();
virtual cbPluginBase* Clone() { return new cbPaneDrawPlugin(0,0); }
// handlers for plugin-events
void OnLButtonDown( cbLeftDownEvent& event );
void OnLDblClick ( cbLeftDClickEvent& event );
void OnLButtonUp ( cbLeftUpEvent& event );
void OnRButtonUp ( cbRightUpEvent& event );
void OnMouseMove ( cbMotionEvent& event );
void OnDrawPaneBackground ( cbDrawPaneBkGroundEvent& event );
void OnDrawPaneDecorations( cbDrawPaneDecorEvent& event );
void OnDrawRowDecorations ( cbDrawRowDecorEvent& event );
void OnDrawRowHandles ( cbDrawRowHandlesEvent& event );
void OnDrawRowBackground ( cbDrawRowBkGroundEvent& event );
void OnSizeBarWindow ( cbSizeBarWndEvent& event );
void OnDrawBarDecorations ( cbDrawBarDecorEvent& event );
void OnDrawBarHandles ( cbDrawBarHandlesEvent& event );
void OnStartDrawInArea ( cbStartDrawInAreaEvent& event );
void OnFinishDrawInArea ( cbFinishDrawInAreaEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __PANEDRAWPL_G__ */

View File

@@ -0,0 +1,164 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 06/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __ROWDRAGPL_G__
#define __ROWDRAGPL_G__
#ifdef __GNUG__
#pragma interface "rowdragpl.h"
#endif
#include "wx/fl/controlbar.h"
/*
* Plugin adds row-dragging fuctionality to the pane.
* Handles mouse/movement and pane-background erasing plugin-events.
* Behaviour and appearence resembles drag & drop posotioning
* of the toolbar-rows int Netscape Comunicator 4.xx.
*/
class cbRowDragPlugin : public cbPluginBase
{
DECLARE_DYNAMIC_CLASS( cbRowDragPlugin )
public:
// background colours for the highlighted/unhighlighted icons
wxColour mHightColor; // light-blue for NC-look
wxColour mLowColor; // light-gray -/-
wxColour mTrianInnerColor; // blue -/-
wxPen mTrianInnerPen; // black -/-
protected:
friend class cbRowDragPluginSerializer;
// drag & drop state variables
bool mDragStarted;
bool mDecisionMode;
wxPoint mDragOrigin;
int mCurDragOfs;
bool mCaptureIsOn;
// saved margins of the pane
int mSvTopMargin;
int mSvBottomMargin;
int mSvLeftMargin;
int mSvRightMargin;
//on-screen drawing state variables
wxBitmap* mpPaneImage;
wxBitmap* mpRowImage;
wxBitmap* mpCombinedImage;
wxScreenDC* mpScrDc;
wxRect mCombRect;
wxSize mRowImgDim;
int mInitialRowOfs;
// NOTE:: if mpRowInFocus is not NULL, then mCollapsedIconInFocus is -1,
// and v.v. (two different items cannot be in focus at the same time)
cbRowInfo* mpRowInFocus;
int mCollapsedIconInFocus;
cbDockPane* mpPane; // is set up temorarely, while handling event
wxList mHiddenBars;
wxBitmap* CaptureDCArea( wxDC& dc, wxRect& area );
// helpers for drag&drop
int GetHRowsCountForPane( cbDockPane* pPane );
void SetMouseCapture( bool captureOn );
void PrepareForRowDrag();
void ShowDraggedRow( int offset );
void ShowPaneImage();
void FinishOnScreenDraw();
void CollapseRow( cbRowInfo* pRow );
void ExpandRow( int collapsedIconIdx );
void InsertDraggedRowBefore( cbRowInfo* pBeforeRow );
bool ItemIsInFocus();
void CheckPrevItemInFocus( cbRowInfo* pRow, int iconIdx );
void UnhiglightItemInFocus();
cbRowInfo* GetFirstRow();
// "hard-coded metafile" for NN-look
virtual void DrawTrianUp( wxRect& inRect, wxDC& dc );
virtual void DrawTrianDown( wxRect& inRect, wxDC& dc );
virtual void DrawTrianRight( wxRect& inRect, wxDC& dc );
virtual void Draw3DPattern( wxRect& inRect, wxDC& dc );
virtual void DrawRombShades( wxPoint& p1, wxPoint& p2, wxPoint& p3, wxPoint& p4, wxDC& dc );
virtual void DrawOrtoRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush );
virtual void DrawRomb( wxRect& inRect, wxDC& dc, wxBrush& bkBrush );
virtual void Draw3DRect( wxRect& inRect, wxDC& dc, wxBrush& bkBrush );
virtual void DrawRectShade( wxRect& inRect, wxDC& dc,
int level, wxPen& upperPen, wxPen& lowerPen );
virtual void GetRowHintRect( cbRowInfo* pRow, wxRect& rect );
virtual void GetCollapsedInconRect( int iconIdx, wxRect& rect );
virtual int GetCollapsedIconsPos();
public:
cbRowDragPlugin(void);
cbRowDragPlugin( wxFrameLayout* pLayout, int paneMask = wxALL_PANES );
virtual ~cbRowDragPlugin();
virtual cbPluginBase* Clone() { return new cbRowDragPlugin(NULL,0); }
virtual void OnInitPlugin();
// handlers for plugin events (appearence-independent logic)
void OnMouseMove ( cbMotionEvent& event );
void OnLButtonDown( cbLeftDownEvent& event );
void OnLButtonUp ( cbLeftUpEvent& event );
void OnDrawPaneBackground( cbDrawPaneDecorEvent& event );
// overridables (appearence-depedent)
virtual void DrawCollapsedRowIcon( int index, wxDC& dc, bool isHighlighted );
virtual void DrawCollapsedRowsBorder( wxDC& dc );
virtual void DrawRowsDragHintsBorder( wxDC& dc );
virtual void DrawRowDragHint( cbRowInfo* pRow, wxDC& dc, bool isHighlighted );
virtual void DrawEmptyRow( wxDC& dc, wxRect& rowBounds );
virtual int GetCollapsedRowIconHeight();
virtual int GetRowDragHintWidth();
virtual void SetPaneMargins();
virtual bool HitTestCollapsedRowIcon( int iconIdx, const wxPoint& pos );
virtual bool HitTestRowDragHint( cbRowInfo* pRow, const wxPoint& pos );
DECLARE_EVENT_TABLE()
};
// internal helper-class
class cbHiddenBarInfo : public wxObject
{
DECLARE_DYNAMIC_CLASS( cbHiddenBarInfo )
public:
cbBarInfo* mpBar;
int mRowNo;
int mIconNo;
int mAlignment;
};
#endif /* __ROWDRAGPL_G__ */

View File

@@ -0,0 +1,87 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 02/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __ROWLAYOUTPL_G__
#define __ROWLAYOUTPL_G__
#ifdef __GNUG__
#pragma interface "rowlayoutpl.h"
#endif
#include "wx/fl/controlbar.h"
/*
* Simple implementation of plugin, which handles row-layouting
* requests sent from Frame Layout
*/
class cbRowLayoutPlugin : public cbPluginBase
{
DECLARE_DYNAMIC_CLASS( cbRowLayoutPlugin )
protected:
cbDockPane* mpPane; // is set up temorarely, while handling event
protected:
// not-fixed-bars layouting related helpers
void FitBarsToRange( int from, int till, cbBarInfo* pTheBar, cbRowInfo* pRow );
void RelayoutNotFixedBarsAround( cbBarInfo* pTheBar, cbRowInfo* pRow );
void MinimzeNotFixedBars( cbRowInfo* pRow, cbBarInfo* pBarToPreserve );
int GetRowFreeSpace( cbRowInfo* pRow );
void RecalcLengthRatios( cbRowInfo* pRow );
void ApplyLengthRatios( cbRowInfo* pRow );
void ExpandNotFixedBars( cbRowInfo* pRow );
void AdjustLengthOfInserted( cbRowInfo* pRow, cbBarInfo* pTheBar );
void DetectBarHandles( cbRowInfo* pRow );
void CheckIfAtTheBoundary( cbBarInfo* pTheBar, cbRowInfo& rowInfo );
// row-layouting helpers (simulate "bar-friction")
int CalcRowHeight( cbRowInfo& row );
void LayoutItemsVertically( cbRowInfo& row );
void StickRightSideBars( cbBarInfo* pToBar );
void SlideLeftSideBars ( cbBarInfo* pTheBar );
void SlideRightSideBars( cbBarInfo* pTheBar );
void ShiftLeftTrashold ( cbBarInfo* pTheBar, cbRowInfo& row );
void ShiftRightTrashold( cbBarInfo* pTheBar, cbRowInfo& row );
void InsertBefore( cbBarInfo* pBeforeBar,
cbBarInfo* pTheBar,
cbRowInfo& row
);
void DoInsertBar( cbBarInfo* pTheBar, cbRowInfo& row );
public:
cbRowLayoutPlugin(void);
cbRowLayoutPlugin( wxFrameLayout* pPanel, int paneMask = wxALL_PANES );
// event handlers
void OnResizeRow ( cbResizeRowEvent& event );
void OnInsertBar ( cbInsertBarEvent& event );
void OnRemoveBar ( cbRemoveBarEvent& event );
void OnLayoutRow ( cbLayoutRowEvent& event );
void OnLayoutRows( cbLayoutRowsEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __ROWLAYOUTPL_G__ */

View File

@@ -0,0 +1,216 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 06/09/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __TOOLWND_G__
#define __TOOLWND_G__
#ifdef __GNUG__
#pragma interface "toolwnd.h"
#endif
#include "wx/frame.h"
#include "wx/dynarray.h"
// fixed settings
#define BTN_BOX_HEIGHT 12
#define BTN_BOX_WIDTH 12
#define BTN_X_WIEGHT 2
class cbMiniButton;
typedef cbMiniButton* cbMinitButtonPtrT;
WX_DEFINE_ARRAY( cbMinitButtonPtrT, cbMiniButtonArrayT );
class wxToolWindow : public wxFrame
{
DECLARE_DYNAMIC_CLASS( wxToolWindow )
public: /** protected really, accessed only by serializers **/
cbMiniButtonArrayT mButtons;
wxWindow* mpClientWnd;
wxFont mTitleFont;
int mTitleHeight;
int mClntHorizGap;
int mClntVertGap;
int mWndVertGap;
int mWndHorizGap;
int mButtonGap;
int mInTitleMargin;
int mHintBorder;
bool mResizeStarted;
bool mRealTimeUpdatesOn;
int mMTolerance;
int mCursorType;
bool mMouseCaptured;
// drag&drop state variables
wxPoint mDragOrigin;
wxRect mInitialRect;
wxRect mPrevHintRect;
wxScreenDC* mpScrDc;
protected:
void GetScrWindowRect( wxRect& r );
void GetScrMousePos ( wxMouseEvent& event, wxPoint& pos );
void SetHintCursor ( int type );
void CalcResizedRect( wxRect& rect, wxPoint& delta, const wxSize& minDim );
void AdjustRectPos( const wxRect& original, const wxSize& newDim, wxRect& newRect );
wxSize GetMinimalWndDim();
void DrawHintRect( const wxRect& r );
int HitTestWindow( wxMouseEvent& event );
void LayoutMiniButtons();
public:
wxToolWindow();
~wxToolWindow();
void SetClient( wxWindow* pWnd );
wxWindow* GetClient();
void SetTitleFont( wxFont& font );
// buttons are added in right-to-left order
void AddMiniButton( cbMiniButton* pBtn );
void OnPaint( wxPaintEvent& event );
void OnMotion( wxMouseEvent& event );
void OnLeftDown( wxMouseEvent& event );
void OnLeftUp( wxMouseEvent& event );
void OnSize( wxSizeEvent& event );
void OnEraseBackground( wxEraseEvent& event );
// overridables:
virtual wxSize GetPreferredSize( const wxSize& given );
virtual void OnMiniButtonClicked( int btnIdx ) {}
virtual bool HandleTitleClick( wxMouseEvent& event ) { return FALSE; }
DECLARE_EVENT_TABLE()
};
// FIXME:: the code below should be moved to a separate file
#include "wx/fl/controlbar.h"
class cbMiniButton : public wxObject
{
public:
wxPoint mPos;
wxSize mDim;
bool mVisible;
bool mEnabled;
wxFrameLayout* mpLayout;
cbDockPane* mpPane;
cbPluginBase* mpPlugin;
wxWindow* mpWnd;
bool mWasClicked;
bool mDragStarted;
bool mPressed;
public:
cbMiniButton();
void SetPos( const wxPoint& pos );
bool HitTest( const wxPoint& pos );
void OnLeftDown( const wxPoint& pos );
void OnLeftUp( const wxPoint& pos );
void OnMotion( const wxPoint& pos );
void Refresh();
virtual void Draw( wxDC& dc );
bool WasClicked();
void Reset();
void Enable( bool enable ) { mEnabled = enable; }
bool IsPressed() { return mPressed; }
};
// classes specific to wxFrameLayout engine (FOR NOW in here...)
class cbCloseBox : public cbMiniButton
{
public:
virtual void Draw( wxDC& dc );
};
class cbCollapseBox : public cbMiniButton
{
public:
bool mIsAtLeft;
virtual void Draw( wxDC& dc );
};
class cbDockBox : public cbMiniButton
{
public:
virtual void Draw( wxDC& dc );
};
class cbFloatedBarWindow : public wxToolWindow
{
DECLARE_DYNAMIC_CLASS( cbFloatedBarWindow )
protected:
cbBarInfo* mpBar;
wxFrameLayout* mpLayout;
friend class cbFloatedBarWindowSerializer;
public:
cbFloatedBarWindow();
void SetBar( cbBarInfo* pBar );
void SetLayout( wxFrameLayout* pLayout );
cbBarInfo* GetBar();
// given coordinates are those of the bar itself
// floated container window's position and size
// are ajusted accordingly
void PositionFloatedWnd( int scrX, int scrY,
int width, int height );
// overriden methods of wxToolWindow
virtual wxSize GetPreferredSize( const wxSize& given );
virtual void OnMiniButtonClicked( int btnIdx );
virtual bool HandleTitleClick( wxMouseEvent& event );
void OnDblClick( wxMouseEvent& event );
DECLARE_EVENT_TABLE()
};
#endif /* __TOOLWND_G__ */

View File

@@ -0,0 +1,56 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas (@Lithuania)
// Modified by:
// Created: 19/10/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __UPDATESMGR_G__
#define __UPDATESMGR_G__
#ifdef __GNUG__
#pragma interface "updatesmgr.h"
#endif
#include "wx/fl/controlbar.h"
/*
* class implements slightly optimized logic for refreshing
* areas of frame layout - which actually need to be updated.
*/
class cbSimpleUpdatesMgr : public cbUpdatesManagerBase
{
DECLARE_DYNAMIC_CLASS( cbSimpleUpdatesMgr )
protected:
bool WasChanged( cbUpdateMgrData& data, wxRect& currentBounds );
public:
cbSimpleUpdatesMgr(void) {}
cbSimpleUpdatesMgr( wxFrameLayout* pPanel );
// notificiactions received from Frame Layout (in the order, in which
// they usually would be invoked)
virtual void OnStartChanges();
virtual void OnRowWillChange( cbRowInfo* pRow, cbDockPane* pInPane );
virtual void OnBarWillChange( cbBarInfo* pBar, cbRowInfo* pInRow, cbDockPane* pInPane );
virtual void OnPaneMarginsWillChange( cbDockPane* pPane );
virtual void OnPaneWillChange( cbDockPane* pPane );
virtual void OnFinishChanges();
// refreshes parts of the frame layout, which need an update
virtual void UpdateNow();
};
#endif /* __UPDATESMGR_G__ */

View File

@@ -0,0 +1,148 @@
/////////////////////////////////////////////////////////////////////////////
// Name: dynamicsash.h
// Purpose: A window which can be dynamically split to an arbitrary depth
// and later reunified through the user interface
// Author: Matt Kimball
// Modified by:
// Created: 7/15/2001
// RCS-ID: $Id$
// Copyright: (c) 2001 Matt Kimball
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DYNAMICSASH_H_
#define _WX_DYNAMICSASH_H_
/*
wxDynamicSashWindow
wxDynamicSashWindow widgets manages the way other widgets are viewed.
When a wxDynamicSashWindow is first shown, it will contain one child
view, a viewport for that child, and a pair of scrollbars to allow the
user to navigate the child view area. Next to each scrollbar is a small
tab. By clicking on either tab and dragging to the appropriate spot, a
user can split the view area into two smaller views separated by a
draggable sash. Later, when the user wishes to reunify the two subviews,
the user simply drags the sash to the side of the window.
wxDynamicSashWindow will automatically reparent the appropriate child
view back up the window hierarchy, and the wxDynamicSashWindow will have
only one child view once again.
As an application developer, you will simply create a wxDynamicSashWindow
using either the Create() function or the more complex constructor
provided below, and then create a view window whose parent is the
wxDynamicSashWindow. The child should respond to
wxDynamicSashSplitEvents -- perhaps with an OnSplit() event handler -- by
constructing a new view window whose parent is also the
wxDynamicSashWindow. That's it! Now your users can dynamically split
and reunify the view you provided.
If you wish to handle the scrollbar events for your view, rather than
allowing wxDynamicSashWindow to do it for you, things are a bit more
complex. (You might want to handle scrollbar events yourself, if,
for instance, you wish to scroll a subwindow of the view you add to
your wxDynamicSashWindow object, rather than scrolling the whole view.)
In this case, you will need to construct your wxDynamicSashWindow without
the wxMANAGE_SCROLLBARS style and you will need to use the
GetHScrollBar() and GetVScrollBar() methods to retrieve the scrollbar
controls and call SetEventHanler() on them to redirect the scrolling
events whenever your window is reparented by wxDyanmicSashWindow.
You will need to set the scrollbars' event handler at three times:
* When your view is created
* When your view receives a wxDynamicSashSplitEvent
* When your view receives a wxDynamicSashUnifyEvent
See the dynsash_switch sample application for an example which does this.
*/
#include <wx/event.h>
#include <wx/window.h>
class wxScrollBar;
#define wxEVT_DYNAMIC_SASH_BASE (((int)('d' - 'a') << 11) | ((int)('s' - 'a') << 6) | ((int)('h' - 'a') << 1))
#define wxEVT_DYNAMIC_SASH_SPLIT (wxEVT_DYNAMIC_SASH_BASE + 1)
#define wxEVT_DYNAMIC_SASH_UNIFY (wxEVT_DYNAMIC_SASH_BASE + 2)
#define EVT_DYNAMIC_SASH_SPLIT(id, func) EVT_CUSTOM(wxEVT_DYNAMIC_SASH_SPLIT, (id), (func))
#define EVT_DYNAMIC_SASH_UNIFY(id, func) EVT_CUSTOM(wxEVT_DYNAMIC_SASH_UNIFY, (id), (func))
/*
wxMANAGE_SCROLLBARS is a default style of wxDynamicSashWindow which
will cause it to respond to scrollbar events for your application by
automatically scrolling the child view.
*/
#define wxMANAGE_SCROLLBARS 0x00800000
/*
wxDynamicSashSplitEvents are sent to your view by wxDynamicSashWindow
whenever your view is being split by the user. It is your
responsibility to handle this event by creating a new view window as
a child of the wxDynamicSashWindow. wxDynamicSashWindow will
automatically reparent it to the proper place in its window hierarchy.
*/
class wxDynamicSashSplitEvent : public wxCommandEvent {
public:
wxDynamicSashSplitEvent();
wxDynamicSashSplitEvent(wxObject *target);
private:
DECLARE_DYNAMIC_CLASS(wxDynamicSashSplitEvent)
};
/*
wxDynamicSashUnifyEvents are sent to your view by wxDynamicSashWindow
whenever the sash which splits your view and its sibling is being
reunified such that your view is expanding to replace its sibling.
You needn't do anything with this event if you are allowing
wxDynamicSashWindow to manage your view's scrollbars, but it is useful
if you are managing the scrollbars yourself so that you can keep
the scrollbars' event handlers connected to your view's event handler
class.
*/
class wxDynamicSashUnifyEvent : public wxCommandEvent {
public:
wxDynamicSashUnifyEvent();
wxDynamicSashUnifyEvent(wxObject *target);
private:
DECLARE_DYNAMIC_CLASS(wxDynamicSashUnifyEvent);
};
/*
wxDynamicSashWindow. See above.
*/
class wxDynamicSashWindow : public wxWindow {
public:
wxDynamicSashWindow();
wxDynamicSashWindow(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
const wxString& name = "dynamicSashWindow");
virtual ~wxDynamicSashWindow();
virtual bool Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
long style = wxCLIP_CHILDREN | wxMANAGE_SCROLLBARS,
const wxString& name = "dynamicSashWindow");
virtual wxScrollBar *GetHScrollBar(const wxWindow *child) const;
virtual wxScrollBar *GetVScrollBar(const wxWindow *child) const;
/* This is overloaded from wxWindowBase. It's not here for you to
call directly. */
virtual void AddChild(wxWindowBase *child);
private:
class wxDynamicSashWindowImpl *m_impl;
DECLARE_DYNAMIC_CLASS(wxDynamicSashWindow)
};
#endif

View File

@@ -0,0 +1,43 @@
/////////////////////////////////////////////////////////////////////////////
// Name: email.h
// Purpose: wxEmail: portable email client class
// Author: Julian Smart
// Modified by:
// Created: 2001-08-21
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma interface "email.h"
#endif
#ifndef _WX_EMAIL_H_
#define _WX_EMAIL_H_
#include "wx/net/msg.h"
/*
* wxEmail
* Miscellaneous email functions
*/
class wxEmail
{
public:
//// Ctor/dtor
wxEmail() {};
//// Operations
// Send a message.
// Specify profile, or leave it to wxWindows to find the current user name
static bool Send(wxMailMessage& message, const wxString& profileName = wxEmptyString );
protected:
};
#endif //_WX_EMAIL_H_

View File

@@ -0,0 +1,67 @@
/////////////////////////////////////////////////////////////////////////////
// Name: msg.h
// Purpose: wxMailMessage
// Author: Julian Smart
// Modified by:
// Created: 2001-08-21
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma interface "msg.h"
#endif
#ifndef _WX_MSG_H_
#define _WX_MSG_H_
/*
* wxMailMessage
* Encapsulates an email message
*/
class wxMailMessage
{
public:
// A common usage
wxMailMessage(const wxString& subject, const wxString& to,
const wxString& body, const wxString& attachment = wxEmptyString,
const wxString& attachmentTitle = wxEmptyString)
{
m_to.Add(to);
m_subject = subject;
m_body = body;
if (!attachment.IsEmpty())
{
m_attachments.Add(attachment);
m_attachmentTitles.Add(attachmentTitle);
}
}
wxMailMessage() {};
//// Accessors
void AddTo(const wxString& to) { m_to.Add(to); }
void AddCc(const wxString& cc) { m_cc.Add(cc); }
void AddBcc(const wxString& bcc) { m_bcc.Add(bcc); }
void AddAttachment(const wxString& attach, const wxString& title = wxEmptyString)
{ m_attachments.Add(attach); m_attachmentTitles.Add(title); }
void SetSubject(const wxString& subject) { m_subject = subject; }
void SetBody(const wxString& body) { m_body = body; }
public:
wxArrayString m_to; //The To: Recipients
wxArrayString m_cc; //The CC: Recipients
wxArrayString m_bcc; //The BCC Recipients
wxString m_subject; //The Subject of the message
wxString m_body; //The Body of the message
wxArrayString m_attachments; //Files to attach to the email
wxArrayString m_attachmentTitles; //Titles to use for the email file attachments
};
#endif // _WX_MSG_H_

View File

@@ -0,0 +1,56 @@
/////////////////////////////////////////////////////////////////////////////
// Name: smapi.h
// Purpose: Simple MAPI classes
// Author: PJ Naughter <pjna@naughter.com>
// Modified by: Julian Smart
// Created: 2001-08-21
// RCS-ID: $Id$
// Copyright: (c) PJ Naughter
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma interface "smapi.h"
#endif
#ifndef _WX_SMAPI_H_
#define _WX_SMAPI_H_
#include "wx/net/msg.h"
class wxMapiData;
//The class which encapsulates the MAPI connection
class wxMapiSession
{
public:
//Constructors / Destructors
wxMapiSession();
~wxMapiSession();
//Logon / Logoff Methods
bool Logon(const wxString& sProfileName, const wxString& sPassword = wxEmptyString, wxWindow* pParentWnd = NULL);
bool LoggedOn() const;
bool Logoff();
//Send a message
bool Send(wxMailMessage& message);
//General MAPI support
bool MapiInstalled() const;
//Error Handling
long GetLastError() const;
protected:
//Methods
void Initialise();
void Deinitialise();
bool Resolve(const wxString& sName, void* lppRecip1);
wxMapiData* m_data;
};
#endif //_WX_SMAPI_H_

View File

@@ -0,0 +1,37 @@
/////////////////////////////////////////////////////////////////////////////
// Name: web.h
// Purpose: wxWeb: portable web browser-related class
// Author: Julian Smart
// Modified by:
// Created: 2001-08-21
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma interface "web.h"
#endif
#ifndef _WX_WEB_H_
#define _WX_WEB_H_
/*
* wxWeb
* Miscellaneous web functions
*/
class wxWeb
{
public:
//// Ctor/dtor
wxWeb() {};
//// Operations
protected:
};
#endif //_WX_WEB_H_

View File

@@ -57,6 +57,28 @@
#define wxSTC_MARK_ARROWDOWN 6
#define wxSTC_MARK_MINUS 7
#define wxSTC_MARK_PLUS 8
// Shapes used for outlining column
#define wxSTC_MARK_VLINE 9
#define wxSTC_MARK_LCORNER 10
#define wxSTC_MARK_TCORNER 11
#define wxSTC_MARK_BOXPLUS 12
#define wxSTC_MARK_BOXPLUSCONNECTED 13
#define wxSTC_MARK_BOXMINUS 14
#define wxSTC_MARK_BOXMINUSCONNECTED 15
#define wxSTC_MARK_LCORNERCURVE 16
#define wxSTC_MARK_TCORNERCURVE 17
#define wxSTC_MARK_CIRCLEPLUS 18
#define wxSTC_MARK_CIRCLEPLUSCONNECTED 19
#define wxSTC_MARK_CIRCLEMINUS 20
#define wxSTC_MARK_CIRCLEMINUSCONNECTED 21
// Markers used for outlining column
#define wxSTC_MARKNUM_FOLDEREND 25
#define wxSTC_MARKNUM_FOLDEROPENMID 26
#define wxSTC_MARKNUM_FOLDERMIDTAIL 27
#define wxSTC_MARKNUM_FOLDERTAIL 28
#define wxSTC_MARKNUM_FOLDERSUB 29
#define wxSTC_MARKNUM_FOLDER 30
#define wxSTC_MARKNUM_FOLDEROPEN 31
#define wxSTC_MARGIN_SYMBOL 0
@@ -90,6 +112,9 @@
#define wxSTC_CHARSET_ARABIC 178
#define wxSTC_CHARSET_VIETNAMESE 163
#define wxSTC_CHARSET_THAI 222
#define wxSTC_CASE_MIXED 0
#define wxSTC_CASE_UPPER 1
#define wxSTC_CASE_LOWER 2
#define wxSTC_INDIC_MAX 7
#define wxSTC_INDIC_PLAIN 0
#define wxSTC_INDIC_SQUIGGLE 1
@@ -109,12 +134,15 @@
// PrintColourMode - force black text on white background for printing.
#define wxSTC_PRINT_BLACKONWHITE 2
#define wxSTC_FIND_DOWN 1
// PrintColourMode - text stays coloured, but all background is forced to be white for printing.
#define wxSTC_PRINT_COLOURONWHITE 3
// PrintColourMode - only the default-background is forced to be white for printing.
#define wxSTC_PRINT_COLOURONWHITEDEFAULTBG 4
#define wxSTC_FIND_WHOLEWORD 2
#define wxSTC_FIND_MATCHCASE 4
#define wxSTC_FIND_WORDSTART 0x00100000
// SCFIND_REGEXP is not yet implemented.
#define wxSTC_FIND_REGEXP 0x00200000
#define wxSTC_CMD_UNDO 2176
#define wxSTC_CMD_CUT 2177
@@ -124,6 +152,7 @@
#define wxSTC_FOLDLEVELWHITEFLAG 0x1000
#define wxSTC_FOLDLEVELHEADERFLAG 0x2000
#define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
#define wxSTC_TIME_FOREVER 10000000
#define wxSTC_CMD_LINEDOWN 2300
#define wxSTC_CMD_LINEDOWNEXTEND 2301
#define wxSTC_CMD_LINEUP 2302
@@ -173,15 +202,31 @@
#define wxSTC_EDGE_BACKGROUND 2
// Show caret within N lines of edge when it's scrolled to view
// If CARET_SLOP not set then centre caret on screen when it's
// scrolled to view
#define wxSTC_CARET_SLOP 0x01
// Center caret on screen when it's scrolled to view
// Value not used
#define wxSTC_CARET_CENTER 0x02
// OR this with CARET_CENTER to reposition even when visible, or
// OR this with CARET_SLOP to reposition whenever outside slop border
// If CARET_SLOP also set then reposition whenever outside slop border
// If CARET_SLOP not set then recentre even when visible
#define wxSTC_CARET_STRICT 0x04
// If CARET_XEVEN set then both left and right margins are given equal weight
// rather than favouring left following behaviour.
#define wxSTC_CARET_XEVEN 0x08
// If CARET_XJUMPS set then when caret reaches the margin the display jumps
// enough to leave the caret solidly within the display.
#define wxSTC_CARET_XJUMPS 0x10
#define wxSTC_CURSORNORMAL -1
#define wxSTC_CURSORWAIT 3
// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy
#define wxSTC_VISIBLE_SLOP 0x01
#define wxSTC_VISIBLE_STRICT 0x04
// Notifications
// Type of modification and the action which caused the modification
// These are defined as a bit mask to make it easy to specify which notifications are wanted.
@@ -241,6 +286,19 @@
#define wxSTC_LEX_LATEX 14
#define wxSTC_LEX_LUA 15
#define wxSTC_LEX_DIFF 16
#define wxSTC_LEX_CONF 17
#define wxSTC_LEX_PASCAL 18
#define wxSTC_LEX_AVE 19
#define wxSTC_LEX_ADA 20
#define wxSTC_LEX_LISP 21
#define wxSTC_LEX_RUBY 22
#define wxSTC_LEX_EIFFEL 23
#define wxSTC_LEX_EIFFELKW 24
#define wxSTC_LEX_TCL 25
// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
// value assigned in sequence from SCLEX_AUTOMATIC+1.
#define wxSTC_LEX_AUTOMATIC 1000
// Lexical states for SCLEX_PYTHON
#define wxSTC_P_DEFAULT 0
@@ -273,6 +331,9 @@
#define wxSTC_C_IDENTIFIER 11
#define wxSTC_C_STRINGEOL 12
#define wxSTC_C_VERBATIM 13
#define wxSTC_C_REGEX 14
#define wxSTC_C_COMMENTLINEDOC 15
#define wxSTC_C_WORD2 16
// Lexical states for SCLEX_HTML, SCLEX_XML
#define wxSTC_H_DEFAULT 0
@@ -300,6 +361,12 @@
// More HTML
#define wxSTC_H_VALUE 19
// X-Code
#define wxSTC_H_XCCOMMENT 20
// SGML
#define wxSTC_H_SGML 21
// Embedded Javascript
#define wxSTC_HJ_START 40
#define wxSTC_HJ_DEFAULT 41
@@ -313,6 +380,7 @@
#define wxSTC_HJ_SINGLESTRING 49
#define wxSTC_HJ_SYMBOLS 50
#define wxSTC_HJ_STRINGEOL 51
#define wxSTC_HJ_REGEX 52
// ASP Javascript
#define wxSTC_HJA_START 55
@@ -327,6 +395,7 @@
#define wxSTC_HJA_SINGLESTRING 64
#define wxSTC_HJA_SYMBOLS 65
#define wxSTC_HJA_STRINGEOL 66
#define wxSTC_HJA_REGEX 67
// Embedded VBScript
#define wxSTC_HB_START 70
@@ -387,11 +456,12 @@
#define wxSTC_HPHP_VARIABLE 123
#define wxSTC_HPHP_COMMENT 124
#define wxSTC_HPHP_COMMENTLINE 125
#define wxSTC_HPHP_STRINGEOL 126
#define wxSTC_HPHP_HSTRING_VARIABLE 126
#define wxSTC_HPHP_OPERATOR 127
// Lexical states for SCLEX_PERL
#define wxSTC_PL_DEFAULT 0
#define wxSTC_PL_HERE 1
#define wxSTC_PL_ERROR 1
#define wxSTC_PL_COMMENTLINE 2
#define wxSTC_PL_POD 3
#define wxSTC_PL_NUMBER 4
@@ -406,12 +476,20 @@
#define wxSTC_PL_ARRAY 13
#define wxSTC_PL_HASH 14
#define wxSTC_PL_SYMBOLTABLE 15
#define wxSTC_PL_REF 16
#define wxSTC_PL_REGEX 17
#define wxSTC_PL_REGSUBST 18
#define wxSTC_PL_LONGQUOTE 19
#define wxSTC_PL_BACKTICKS 20
#define wxSTC_PL_DATASECTION 21
#define wxSTC_PL_HERE_DELIM 22
#define wxSTC_PL_HERE_Q 23
#define wxSTC_PL_HERE_QQ 24
#define wxSTC_PL_HERE_QX 25
#define wxSTC_PL_STRING_Q 26
#define wxSTC_PL_STRING_QQ 27
#define wxSTC_PL_STRING_QX 28
#define wxSTC_PL_STRING_QR 29
#define wxSTC_PL_STRING_QW 30
// Lexical states for SCLEX_LATEX
#define wxSTC_L_DEFAULT 0
@@ -434,6 +512,8 @@
#define wxSTC_LUA_OPERATOR 10
#define wxSTC_LUA_IDENTIFIER 11
#define wxSTC_LUA_STRINGEOL 12
// Lexical states for SCLEX_ERRORLIST
#define wxSTC_ERR_DEFAULT 0
#define wxSTC_ERR_PYTHON 1
#define wxSTC_ERR_GCC 2
@@ -441,6 +521,88 @@
#define wxSTC_ERR_CMD 4
#define wxSTC_ERR_BORLAND 5
#define wxSTC_ERR_PERL 6
#define wxSTC_ERR_NET 7
#define wxSTC_ERR_LUA 8
#define wxSTC_ERR_DIFF_CHANGED 10
#define wxSTC_ERR_DIFF_ADDITION 11
#define wxSTC_ERR_DIFF_DELETION 12
#define wxSTC_ERR_DIFF_MESSAGE 13
// Lexical states for SCLEX_BATCH
#define wxSTC_BAT_DEFAULT 0
#define wxSTC_BAT_COMMENT 1
#define wxSTC_BAT_WORD 2
#define wxSTC_BAT_LABEL 3
#define wxSTC_BAT_HIDE 4
#define wxSTC_BAT_COMMAND 5
#define wxSTC_BAT_IDENTIFIER 6
#define wxSTC_BAT_OPERATOR 7
// Lexical states for SCLEX_MAKEFILE
#define wxSTC_MAKE_DEFAULT 0
#define wxSTC_MAKE_COMMENT 1
#define wxSTC_MAKE_PREPROCESSOR 2
#define wxSTC_MAKE_IDENTIFIER 3
#define wxSTC_MAKE_OPERATOR 4
#define wxSTC_MAKE_TARGET 5
#define wxSTC_MAKE_IDEOL 9
// Lexical states for the SCLEX_CONF (Apache Configuration Files Lexer)
#define wxSTC_CONF_DEFAULT 0
#define wxSTC_CONF_COMMENT 1
#define wxSTC_CONF_NUMBER 2
#define wxSTC_CONF_IDENTIFIER 3
#define wxSTC_CONF_EXTENSION 4
#define wxSTC_CONF_PARAMETER 5
#define wxSTC_CONF_STRING 6
#define wxSTC_CONF_OPERATOR 7
#define wxSTC_CONF_IP 8
#define wxSTC_CONF_DIRECTIVE 9
// Avenue
#define wxSTC_AVE_DEFAULT 0
#define wxSTC_AVE_COMMENT 1
#define wxSTC_AVE_NUMBER 2
#define wxSTC_AVE_WORD 3
#define wxSTC_AVE_KEYWORD 4
#define wxSTC_AVE_STATEMENT 5
#define wxSTC_AVE_STRING 6
#define wxSTC_AVE_ENUM 7
#define wxSTC_AVE_STRINGEOL 8
#define wxSTC_AVE_IDENTIFIER 9
#define wxSTC_AVE_OPERATOR 10
// Lexical states for SCLEX_ADA
#define wxSTC_ADA_DEFAULT 0
#define wxSTC_ADA_COMMENT 1
#define wxSTC_ADA_NUMBER 2
#define wxSTC_ADA_WORD 3
#define wxSTC_ADA_STRING 4
#define wxSTC_ADA_CHARACTER 5
#define wxSTC_ADA_OPERATOR 6
#define wxSTC_ADA_IDENTIFIER 7
#define wxSTC_ADA_STRINGEOL 8
// Lexical states for SCLEX_LISP
#define wxSTC_LISP_DEFAULT 0
#define wxSTC_LISP_COMMENT 1
#define wxSTC_LISP_NUMBER 2
#define wxSTC_LISP_KEYWORD 3
#define wxSTC_LISP_STRING 6
#define wxSTC_LISP_STRINGEOL 8
#define wxSTC_LISP_IDENTIFIER 9
#define wxSTC_LISP_OPERATOR 10
// Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
#define wxSTC_EIFFEL_DEFAULT 0
#define wxSTC_EIFFEL_COMMENTLINE 1
#define wxSTC_EIFFEL_NUMBER 2
#define wxSTC_EIFFEL_WORD 3
#define wxSTC_EIFFEL_STRING 4
#define wxSTC_EIFFEL_CHARACTER 5
#define wxSTC_EIFFEL_OPERATOR 6
#define wxSTC_EIFFEL_IDENTIFIER 7
#define wxSTC_EIFFEL_STRINGEOL 8
// END of generated section
//----------------------------------------------------------------------
@@ -556,6 +718,10 @@ public:
// Find the position from a point within the window.
int PositionFromPoint(wxPoint pt);
// Find the position from a point within the window but return
// INVALID_POSITION if not close to text.
int PositionFromPointClose(int x, int y);
// Set caret to start of a line and ensure it is visible.
void GotoLine(int line);
@@ -573,8 +739,8 @@ public:
// Retrieve the position of the last correctly styled character.
int GetEndStyled();
// Convert all line endings in the document to use the current mode.
void ConvertEOLs();
// Convert all line endings in the document to one mode.
void ConvertEOLs(int eolMode);
// Retrieve the current end of line mode - one of CRLF, CR, or LF.
int GetEOLMode();
@@ -693,6 +859,9 @@ public:
// Set a style to be underlined or not.
void StyleSetUnderline(int style, bool underline);
// Set a style to be mixed case, or to force upper or lower case.
void StyleSetCase(int style, int caseForce);
// Set the foreground colour of the selection and whether to use this setting.
void SetSelForeground(bool useSetting, const wxColour& fore);
@@ -763,6 +932,18 @@ public:
// Retrieve the last line number that has line state.
int GetMaxLineState();
// Is the background of the line containing the caret in a different colour?
bool GetCaretLineVisible();
// Display the background of the line containing the caret in a different colour.
void SetCaretLineVisible(bool show);
// Get the colour of the background of the line containing the caret.
wxColour GetCaretLineBack();
// Set the colour of the background of the line containing the caret.
void SetCaretLineBack(const wxColour& back);
// Display a auto-completion list.
// The lenEntered parameter indicates how many characters before
// the caret should be used to provide context.
@@ -816,6 +997,15 @@ public:
// Retrieve state of ignore case flag.
bool AutoCompGetIgnoreCase();
// Display a list of strings and send notification when user chooses one.
void UserListShow(int listType, const wxString& itemList);
// Set whether or not autocompletion is hidden automatically when nothing matches
void AutoCompSetAutoHide(bool autoHide);
// Retrieve whether or not autocompletion is hidden automatically when nothing matches
bool AutoCompGetAutoHide();
// Set the number of spaces used for one level of indentation.
void SetIndent(int indentSize);
@@ -923,13 +1113,13 @@ public:
int GetLineCount();
// Sets the size in pixels of the left margin.
void SetMarginLeft(int width);
void SetMarginLeft(int pixelWidth);
// Returns the size in pixels of the left margin.
int GetMarginLeft();
// Sets the size in pixels of the right margin.
void SetMarginRight(int width);
void SetMarginRight(int pixelWidth);
// Returns the size in pixels of the right margin.
int GetMarginRight();
@@ -1006,6 +1196,48 @@ public:
// Returns true if overtype mode is active otherwise false is returned.
bool GetOvertype();
// Set the width of the insert mode caret
void SetCaretWidth(int pixelWidth);
// Returns the width of the insert mode caret
int GetCaretWidth();
// Sets the position that starts the target which is used for updating the
// document without affecting the scroll position.
void SetTargetStart(int pos);
// Get the position that starts the target.
int GetTargetStart();
// Sets the position that ends the target which is used for updating the
// document without affecting the scroll position.
void SetTargetEnd(int pos);
// Get the position that ends the target.
int GetTargetEnd();
// Replace the target text with the argument text.
// Returns the length of the replacement text.
int ReplaceTarget(const wxString& text);
// Replace the target text with the argument text after \d processing.
// Looks for \d where d is between 1 and 9 and replaces these with the strings
// matched in the last search operation which were surrounded by \( and \).
// Returns the length of the replacement text including any change
// caused by processing the \d patterns.
int ReplaceTargetRE(const wxString& text);
// Search for a counted string in the target and set the target to the found
// range.
// Returns length of range or -1 for failure in which case target is not moved.
int SearchInTarget(const wxString& text);
// Set the search flags used by SearchInTarget
void SetSearchFlags(int flags);
// Get the search flags used by SearchInTarget
int GetSearchFlags();
// Show a call tip containing a definition near position pos.
void CallTipShow(int pos, const wxString& definition);
@@ -1068,6 +1300,31 @@ public:
// Set some debugging options for folding
void SetFoldFlags(int flags);
// Ensure a particular line is visible by expanding any header line hiding it.
// Use the currently set visibility policy to determine which range to display.
void EnsureVisibleEnforcePolicy(int line);
// Sets whether a tab pressed when caret is within indentation indents
void SetTabIndents(bool tabIndents);
// Does a tab pressed when caret is within indentation indent?
bool GetTabIndents();
// Sets whether a backspace pressed when caret is within indentation unindents
void SetBackSpaceUnIndents(bool bsUnIndents);
// Does a backspace pressed when caret is within indentation unindent?
bool GetBackSpaceUnIndents();
// Sets the time the mouse must sit still to generate a mouse dwell event
void SetMouseDwellTime(int periodMilliseconds);
// Retrieve the time the mouse must sit still to generate a mouse dwell event
int GetMouseDwellTime();
// Move the caret inside current view if it's not there already
void MoveCaretInsideView();
// How many characters are on a line, not including end of line characters.
int LineLength(int line);
@@ -1119,9 +1376,11 @@ public:
void SearchAnchor();
// Find some text starting at the search anchor.
// Does not ensure the selection is visible.
int SearchNext(int flags, const wxString& text);
// Find some text starting at the search anchor and moving backwards.
// Does not ensure the selection is visible.
int SearchPrev(int flags, const wxString& text);
// Set the way the line the caret is on is kept visible.
@@ -1157,6 +1416,51 @@ public:
// Get which document modification events are sent to the container.
int GetModEventMask();
// Change internal focus flag
void SetFocus(bool focus);
// Get internal focus flag
bool GetFocus();
// Change error status - 0 = OK
void SetStatus(int statusCode);
// Get error status
int GetStatus();
// Set whether the mouse is captured when its button is pressed
void SetMouseDownCaptures(bool captures);
// Get whether mouse gets captured
bool GetMouseDownCaptures();
// Sets the cursor to one of the SC_CURSOR* values
void SetCursor(int cursorType);
// Get cursor type
int GetCursor();
// Move to the previous change in capitalistion
void WordPartLeft();
// Move to the previous change in capitalistion extending selection to new caret position.
void WordPartLeftExtend();
// Move to the change next in capitalistion
void WordPartRight();
// Move to the next change in capitalistion extending selection to new caret position.
void WordPartRightExtend();
// Set the way the display area is determined when a particular line is to be moved to.
void SetVisiblePolicy(int visiblePolicy, int visibleSlop);
// Delete back from the current position to the start of the line
void DelLineLeft();
// Delete forwards from the current position to the end of the line
void DelLineRight();
// Start notifying the container of all key presses and commands.
void StartRecord();
@@ -1178,6 +1482,9 @@ public:
// Set up the key words used by the lexer.
void SetKeyWords(int keywordSet, const wxString& keyWords);
// Set the lexing language of the document based on string name.
void SetLexerLanguage(const wxString& language);
// END of generated section
//----------------------------------------------------------------------
// Others...
@@ -1243,6 +1550,10 @@ public:
// Scroll enough to make the given column visible
void ScrollToColumn(int column);
// Send a message to Scintilla
long SendMsg(int msg, long wp=0, long lp=0);
//----------------------------------------------------------------------
@@ -1255,7 +1566,7 @@ private:
void OnMouseLeftDown(wxMouseEvent& evt);
void OnMouseMove(wxMouseEvent& evt);
void OnMouseLeftUp(wxMouseEvent& evt);
void OnMouseRightUp(wxMouseEvent& evt);
void OnContextMenu(wxContextMenuEvent& evt);
void OnMouseWheel(wxMouseEvent& evt);
void OnChar(wxKeyEvent& evt);
void OnKeyDown(wxKeyEvent& evt);
@@ -1271,8 +1582,6 @@ private:
void NotifyChange();
void NotifyParent(SCNotification* scn);
long SendMsg(int msg, long wp=0, long lp=0);
private:
DECLARE_EVENT_TABLE()
DECLARE_CLASS(wxStyledTextCtrl)
@@ -1307,6 +1616,9 @@ public:
void SetMessage(int val) { m_message = val; }
void SetWParam(int val) { m_wParam = val; }
void SetLParam(int val) { m_lParam = val; }
void SetListType(int val) { m_listType = val; }
void SetX(int val) { m_x = val; }
void SetY(int val) { m_y = val; }
int GetPosition() const { return m_position; }
int GetKey() const { return m_key; }
@@ -1322,6 +1634,9 @@ public:
int GetMessage() const { return m_message; }
int GetWParam() const { return m_wParam; }
int GetLParam() const { return m_lParam; }
int GetListType() const { return m_listType; }
int GetX() const { return m_x; }
int GetY() const { return m_y; }
bool GetShift() const;
bool GetControl() const;
@@ -1350,42 +1665,56 @@ private:
int m_message; // wxEVT_STC_MACRORECORD
int m_wParam;
int m_lParam;
int m_listType;
int m_x;
int m_y;
#endif
};
#ifndef SWIG
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE, 1650)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED, 1651)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED, 1652)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI, 1653)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED, 1654)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT, 1655)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT, 1656)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK, 1657)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED, 1658)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY, 1659)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD, 1660)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK, 1661)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN, 1662)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED, 1663)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHANGE, 1650)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_STYLENEEDED, 1651)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_CHARADDED, 1652)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTREACHED, 1653)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_SAVEPOINTLEFT, 1654)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_ROMODIFYATTEMPT, 1655)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_KEY, 1656)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DOUBLECLICK, 1657)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_UPDATEUI, 1658)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MODIFIED, 1659)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MACRORECORD, 1660)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_MARGINCLICK, 1661)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_NEEDSHOWN, 1662)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_POSCHANGED, 1663)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_PAINTED, 1664)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_USERLISTSELECTION, 1665)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_URIDROPPED, 1666)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLSTART, 1667)
DECLARE_LOCAL_EVENT_TYPE(wxEVT_STC_DWELLEND, 1668)
END_DECLARE_EVENT_TYPES()
#else
enum {
wxEVT_STC_CHANGE,
wxEVT_STC_STYLENEEDED,
wxEVT_STC_CHARADDED,
wxEVT_STC_UPDATEUI,
wxEVT_STC_SAVEPOINTREACHED,
wxEVT_STC_SAVEPOINTLEFT,
wxEVT_STC_ROMODIFYATTEMPT,
wxEVT_STC_DOUBLECLICK,
wxEVT_STC_MODIFIED,
wxEVT_STC_KEY,
wxEVT_STC_DOUBLECLICK,
wxEVT_STC_UPDATEUI,
wxEVT_STC_MODIFIED,
wxEVT_STC_MACRORECORD,
wxEVT_STC_MARGINCLICK,
wxEVT_STC_NEEDSHOWN,
wxEVT_STC_POSCHANGED
wxEVT_STC_POSCHANGED,
wxEVT_STC_PAINTED,
wxEVT_STC_USERLISTSELECTION,
wxEVT_STC_URIDROPPED,
wxEVT_STC_DWELLSTART,
wxEVT_STC_DWELLEND,
};
#endif
@@ -1394,20 +1723,26 @@ END_DECLARE_EVENT_TYPES()
#ifndef SWIG
typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
#define EVT_STC_CHANGE(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_STYLENEEDED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_CHARADDED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_UPDATEUI(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_SAVEPOINTREACHED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_SAVEPOINTLEFT(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_ROMODIFYATTEMPT(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DOUBLECLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_MODIFIED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_KEY(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_MACRORECORD(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_MARGINCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_NEEDSHOWN(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_POSCHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_CHANGE(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_STYLENEEDED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_CHARADDED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_SAVEPOINTREACHED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_SAVEPOINTLEFT(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_ROMODIFYATTEMPT(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_KEY(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DOUBLECLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_UPDATEUI(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_MODIFIED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_MACRORECORD(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_MARGINCLICK(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_NEEDSHOWN(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_POSCHANGED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_POSCHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_PAINTED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_USERLISTSELECTION(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_URIDROPPED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLSTART(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#define EVT_STC_DWELLEND(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxStyledTextEventFunction) & fn, (wxObject *) NULL ),
#endif

View File

@@ -77,7 +77,6 @@ public:
wxXmlProperty(const wxString& name, const wxString& value,
wxXmlProperty *next)
: m_name(name), m_value(value), m_next(next) {}
~wxXmlProperty() { delete m_next; }
wxString GetName() const { return m_name; }
wxString GetValue() const { return m_value; }
@@ -116,7 +115,7 @@ public:
wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
const wxString& name, const wxString& content,
wxXmlProperty *props, wxXmlNode *next);
~wxXmlNode() { delete m_properties; delete m_next; delete m_children; }
~wxXmlNode();
// copy ctor & operator=. Note that this does NOT copy syblings
// and parent pointer, i.e. m_parent and m_next will be NULL

View File

@@ -154,7 +154,7 @@ public:
// Returns numeric ID that is equivalent to string id used in XML
// resource. To be used in event tables
// Macro XMLID is provided for convenience
static int GetXMLID(const char *str_id);
static int GetXMLID(const wxChar *str_id);
// Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
long GetVersion() const { return m_version; }
@@ -176,10 +176,6 @@ protected:
// Creates resource from info in given node:
wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent, wxObject *instance = NULL);
// Remove nodes with property "platform" that does not
// match current platform
void ProcessPlatformProperty(wxXmlNode *node);
bool GetUseLocale() { return m_useLocale; }
private:
@@ -347,7 +343,9 @@ protected:
{ return m_resource->CreateResFromNode(node, parent, instance); }
// helper
#if wxUSE_FILESYSTEM
wxFileSystem& GetCurFileSystem() { return m_resource->GetCurFileSystem(); }
#endif
};
#define ADD_STYLE(style) AddStyle(wxT(#style), style)

View File

@@ -1,6 +1,6 @@
# $Id$
CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet
CONTRIB_SAMPLES=mmedia ogl stc gizmos canvas xrc plot applet fl
all:
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done

View File

@@ -0,0 +1,223 @@
# Microsoft Developer Studio Project File - Name="AniTestVC" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=AniTestVC - Win32 UnivDebug
!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 "AniTestVC.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 "AniTestVC.mak" CFG="AniTestVC - Win32 UnivDebug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "AniTestVC - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "AniTestVC - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "AniTestVC - Win32 Debug DLL" (based on "Win32 (x86) Application")
!MESSAGE "AniTestVC - Win32 Release DLL" (based on "Win32 (x86) Application")
!MESSAGE "AniTestVC - Win32 UnivRelease" (based on "Win32 (x86) Application")
!MESSAGE "AniTestVC - Win32 UnivDebug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "AniTestVC - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/anitest.exe" /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "AniTestVC - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "AniTestVC - Win32 Debug DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "DebugDLL"
# PROP BASE Intermediate_Dir "DebugDLL"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "DebugDLL"
# PROP Intermediate_Dir "DebugDLL"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_2d.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "AniTestVC - Win32 Release DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "ReleaseDLL"
# PROP BASE Intermediate_Dir "ReleaseDLL"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseDLL"
# PROP Intermediate_Dir "ReleaseDLL"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx23_2.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/anitest.exe" /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "AniTestVC - Win32 UnivRelease"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "UnivRelease"
# PROP BASE Intermediate_Dir "UnivRelease"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "UnivRelease"
# PROP Intermediate_Dir "UnivRelease"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT BASE CPP /YX
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/minimal.exe" /libpath:"../../lib" /libpath:"../../contrib/lib"
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx_univ.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib anim.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"UnivRelease/anitest.exe" /libpath:"../../../lib"
!ELSEIF "$(CFG)" == "AniTestVC - Win32 UnivDebug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "UnivDebug"
# PROP BASE Intermediate_Dir "UnivDebug"
# PROP BASE Ignore_Export_Lib 0
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "UnivDebug"
# PROP Intermediate_Dir "UnivDebug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/minimal.exe" /pdbtype:sept /libpath:"../../lib" /libpath:"../../contrib/lib"
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx_univd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib animd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"UnivDebug/anitest.exe" /pdbtype:sept /libpath:"../../../lib"
!ENDIF
# Begin Target
# Name "AniTestVC - Win32 Release"
# Name "AniTestVC - Win32 Debug"
# Name "AniTestVC - Win32 Debug DLL"
# Name "AniTestVC - Win32 Release DLL"
# Name "AniTestVC - Win32 UnivRelease"
# Name "AniTestVC - Win32 UnivDebug"
# Begin Source File
SOURCE=.\anitest.cpp
# End Source File
# Begin Source File
SOURCE=.\anitest.h
# End Source File
# Begin Source File
SOURCE=.\anitest.rc
# End Source File
# End Target
# End Project

View File

@@ -0,0 +1,29 @@
Microsoft Developer Studio Workspace File, Format Version 5.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "AniTestVC"=.\AniTestVC.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,24 @@
#
# File: makefile.unx
# Author: Julian Smart
# Created: 1998
# Updated:
# Copyright: (c) 1998 Julian Smart
#
# "%W% %G%"
#
# Makefile for anitest example (UNIX).
top_srcdir = @top_srcdir@/..
top_builddir = ../../..
program_dir = contrib/samples/animate
PROGRAM=anitest
OBJECTS=$(PROGRAM).o
APPEXTRALIBS=$(top_builddir)/lib/libwx_anim.@WX_TARGET_LIBRARY_TYPE@
APPEXTRADEFS=-I$(top_srcdir)/contrib/include
include $(top_builddir)/src/makeprog.env

View File

@@ -0,0 +1,197 @@
/////////////////////////////////////////////////////////////////////////////
// Name: anitest.cpp
// Purpose: Animation sample
// Author: Julian Smart
// Modified by:
// Created: 02/07/2001
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ===========================================================================
// declarations
// ===========================================================================
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#endif
#include "anitest.h"
IMPLEMENT_APP(MyApp)
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// event tables
// ---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(ANITEST_ABOUT, MyFrame::OnAbout)
EVT_MENU(ANITEST_QUIT, MyFrame::OnQuit)
EVT_MENU(ANITEST_OPEN, MyFrame::OnOpen)
EVT_SIZE(MyFrame::OnSize)
END_EVENT_TABLE()
// ===========================================================================
// implementation
// ===========================================================================
// ---------------------------------------------------------------------------
// MyApp
// ---------------------------------------------------------------------------
// Initialise this in OnInit, not statically
bool MyApp::OnInit()
{
// Create the main frame window
MyFrame* frame = new MyFrame((wxFrame *)NULL, -1, "Animation Demo",
wxPoint(-1, -1), wxSize(500, 400),
wxDEFAULT_FRAME_STYLE);
// Give it an icon
#ifdef __WXMSW__
frame->SetIcon(wxIcon("mdi_icn"));
#else
frame->SetIcon(wxIcon( mondrian_xpm ));
#endif
// Make a menubar
wxMenu *file_menu = new wxMenu;
file_menu->Append(ANITEST_OPEN, "&Open Animation...\tCtrl+O", "Open a GIF animation");
file_menu->Append(ANITEST_QUIT, "&Exit\tAlt+X", "Quit the program");
wxMenu *help_menu = new wxMenu;
help_menu->Append(ANITEST_ABOUT, "&About\tF1");
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
menu_bar->Append(help_menu, "&Help");
// Associate the menu bar with the frame
frame->SetMenuBar(menu_bar);
frame->CreateStatusBar();
frame->Show(TRUE);
SetTopWindow(frame);
return TRUE;
}
// ---------------------------------------------------------------------------
// MyFrame
// ---------------------------------------------------------------------------
// Define my frame constructor
MyFrame::MyFrame(wxWindow *parent,
const wxWindowID id,
const wxString& title,
const wxPoint& pos,
const wxSize& size,
const long style)
: wxFrame(parent, id, title, pos, size,
style | wxNO_FULL_REPAINT_ON_RESIZE)
{
// m_animation = NULL;
m_canvas = new MyCanvas(this, wxPoint(0, 0), wxSize(-1, -1));
#if 0
m_player.SetDestroyAnimation(FALSE);
m_player.SetWindow(m_canvas);
m_player.SetPosition(wxPoint(0, 0));
#endif
m_animationCtrl = new wxGIFAnimationCtrl(m_canvas, -1, wxEmptyString,
wxPoint(0, 0), wxSize(200, 200));
}
MyFrame::~MyFrame()
{
// m_player.Stop();
}
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{
Close();
}
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
{
(void)wxMessageBox("wxWindows 2 Animation Demo\n"
"Author: Julian Smart (c) 2001\n",
"About Animation Demo");
}
void MyFrame::OnOpen(wxCommandEvent& event)
{
wxFileDialog dialog(this, wxT("Please choose an animated GIF"),
wxEmptyString, wxEmptyString, wxT("*.gif"), wxOPEN);
if (dialog.ShowModal() == wxID_OK)
{
wxString filename(dialog.GetPath());
m_animationCtrl->Stop();
if (m_animationCtrl->LoadFile(filename))
{
m_animationCtrl->Play();
}
else
{
wxMessageBox("Sorry, this animation was not a valid animated GIF.");
}
}
}
// ---------------------------------------------------------------------------
// MyCanvas
// ---------------------------------------------------------------------------
BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
EVT_PAINT(MyCanvas::OnPaint)
END_EVENT_TABLE()
// Define a constructor for my canvas
MyCanvas::MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size)
: wxScrolledWindow(parent, -1, pos, size,
wxSUNKEN_BORDER |
wxNO_FULL_REPAINT_ON_RESIZE |
wxVSCROLL | wxHSCROLL)
{
SetBackgroundColour(wxColour("YELLOW"));
}
void MyCanvas::OnPaint(wxPaintEvent& event)
{
wxPaintDC dc(this);
#if 0
MyFrame* frame = (MyFrame*) GetParent();
if (frame->GetPlayer().IsPlaying())
{
frame->GetPlayer().Draw(dc);
}
#endif
}

View File

@@ -0,0 +1,71 @@
/////////////////////////////////////////////////////////////////////////////
// Name: anitest.cpp
// Purpose: anitest sample
// Author: Julian Smart
// Modified by:
// Created: 02/07/2001
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/animate/animate.h"
// Define a new application
class MyApp : public wxApp
{
public:
bool OnInit();
};
class MyCanvas : public wxScrolledWindow
{
public:
MyCanvas(wxWindow *parent, const wxPoint& pos, const wxSize& size);
void OnPaint(wxPaintEvent& event);
private:
DECLARE_EVENT_TABLE()
};
// Define a new frame
class MyFrame : public wxFrame
{
public:
MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title,
const wxPoint& pos, const wxSize& size, const long style);
~MyFrame();
void OnAbout(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
void OnOpen(wxCommandEvent& event);
MyCanvas* GetCanvas() const { return m_canvas; }
wxGIFAnimationCtrl* GetAnimationCtrl() const { return m_animationCtrl; }
#if 0
wxAnimationPlayer& GetPlayer() { return m_player; }
wxAnimationBase& GetAnimation() { return m_animation; }
#endif
DECLARE_EVENT_TABLE()
protected:
MyCanvas* m_canvas;
wxGIFAnimationCtrl* m_animationCtrl;
#if 0
wxAnimationPlayer m_player;
wxGIFAnimation m_animation;
#endif
};
// menu items ids
enum
{
ANITEST_QUIT = 100,
ANITEST_OPEN,
ANITEST_ABOUT
};

View File

@@ -0,0 +1,3 @@
mondrian ICON "mondrian.ico"
#include "wx/msw/wx.rc"

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

View File

@@ -0,0 +1,17 @@
#
# File: makefile.b32
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright:
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = $(WXWIN)
TARGET=anitest
EXTRALIBS=$(WXDIR)\lib\anim.lib
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,19 @@
#
# File: makefile.g95
# Author: Julian Smart
# Created: 1999
# Updated:
# Copyright: (c) Julian Smart, 1999
#
# Makefile for wxWindows sample (Cygwin/Mingw32).
WXDIR = ../../..
TARGET=anitest
OBJECTS = $(TARGET).o
EXTRAINC = -I$(WXDIR)/contrib/include
RCEXTRAINC = --include-dir $(WXDIR)/contrib/include
EXTRALIBS = -lanim
include $(WXDIR)/src/makeprog.g95

View File

@@ -0,0 +1,36 @@
# Symantec C++ makefile
WXDIR = $(WXWIN)
WXLIB = $(WXDIR)\lib\wx.lib
INCDIR = $(WXDIR)\include
INCLUDE=$(INCDIR)
TARGET=minimal
include $(WXDIR)\src\makesc.env
minimal.exe: minimal.obj $(DEFFILE) minimal.res
*$(CC) $(LDFLAGS) -o$@ $** $(LIBS)
*$(RC) -k minimal.res
sc32.def:
echo EXETYPE NT > sc32.def
echo SUBSYSTEM WINDOWS >> sc32.def
sc16.def:
echo NAME $(TARGET) > sc16.def
echo EXETYPE WINDOWS >> sc16.def
echo STUB 'WINSTUB.EXE' >> sc16.def
echo CODE PRELOAD MOVEABLE DISCARDABLE >> sc16.def
echo DATA PRELOAD MOVEABLE MULTIPLE >> sc16.def
echo HEAPSIZE 1024 >> sc16.def
echo STACKSIZE 8192 >> sc16.def
clean:
-del *.obj
-del *.exe
-del *.res
-del *.map
-del *.rws
-del sc32.def
-del sc16.def

View File

@@ -0,0 +1,35 @@
#
# File: Makefile for samples
# Author: Robert Roebling
# Created: 1999
# Updated:
# Copyright: (c) 1998 Robert Roebling
#
# This makefile requires a Unix version of wxWindows
# to be installed on your system. This is most often
# done typing "make install" when using the complete
# sources of wxWindows or by installing the two
# RPM packages wxGTK.XXX.rpm and wxGTK-devel.XXX.rpm
# under Linux.
#
CC = gcc
PROGRAM = anitest
OBJECTS = $(PROGRAM).o animate.o
# implementation
.SUFFIXES: .o .cpp
.cpp.o :
$(CC) -c `wx-config --cflags` -o $@ $<
all: $(PROGRAM)
$(PROGRAM): $(OBJECTS)
$(CC) -o $(PROGRAM) $(OBJECTS) `wx-config --libs`
clean:
rm -f *.o $(PROGRAM)

View File

@@ -0,0 +1,44 @@
#
# File: makefile.va
# Author: David Webster
# Created: 1999
# Updated:
# Copyright: (c) David Webster
#
# Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM)
# Use FINAL=1 argument to nmake to build final version with no debug info.
# Set WXDIR for your system
WXDIR=$(WXWIN)
!include $(WXDIR)\src\makeva.env
#
# Define which program this is and what it's path is and where to output to
#
PROGRAM=anitest
THISDIR=$(WXWIN)\samples\$(PROGRAM)
OPATH=$(THISDIR)\$D
#
# Make sure output directory is available
#
!if [md $(OPATH)]
!endif
#
# Standard definitions
#
PROGRC=$(THISDIR)\$(PROGRAM).rcO
OBJECTS=$(OPATH)\$(PROGRAM).obj $(OPATH)\animate.obj
PROGRES=$(OPATH)\$(PROGRAM).res
PROGTARGET=$(OPATH)\$(PROGRAM).exe
.cpp{$OPATH}.obj:
@echo $<
icc @<<
$(CPPFLAGS) /Fo$@ /Tp $<
<<
!include $(WXDIR)\src\makeprog.va

View File

@@ -0,0 +1,9 @@
WXDIR = $(WXWIN)
PROGRAM = anitest
OBJECTS = $(PROGRAM).obj
EXTRALIBS = $(WXDIR)\lib\anim$(LIBEXT).lib
EXTRAINC = -I$(WXDIR)\contrib\include
!include $(WXDIR)\src\makeprog.vc

View File

@@ -0,0 +1,15 @@
#
# Makefile for WATCOM
#
# Created by Julian Smart, January 1999
#
#
WXDIR = $(%WXWIN)
PROGRAM = anitest
OBJECTS = $(PROGRAM).obj animate.obj
!include $(WXDIR)\src\makeprog.wat

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

View File

@@ -56,7 +56,7 @@ BSC32=bscmake.exe
# 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/simple.exe" /libpath:"../../../../lib"
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/simple.exe" /libpath:"../../../../lib"
!ELSEIF "$(CFG)" == "SimpleVC - Win32 Debug"
@@ -83,7 +83,7 @@ BSC32=bscmake.exe
# 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/simple.exe" /pdbtype:sept /libpath:"../../../../lib"
!ELSEIF "$(CFG)" == "SimpleVC - Win32 Debug DLL"

View File

@@ -56,7 +56,7 @@ BSC32=bscmake.exe
# 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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/test.exe" /libpath:"../../../../lib"
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib canvas.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/test.exe" /libpath:"../../../../lib"
!ELSEIF "$(CFG)" == "TestVC - Win32 Debug"
@@ -83,7 +83,7 @@ BSC32=bscmake.exe
# 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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/test.exe" /pdbtype:sept /libpath:"../../../../lib"
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib canvasd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/test.exe" /pdbtype:sept /libpath:"../../../../lib"
!ELSEIF "$(CFG)" == "TestVC - Win32 Debug DLL"

View File

@@ -0,0 +1,10 @@
# $Id$
CONTRIB_SAMPLES=fl_demo1 fl_demo2 fl_sample1 fl_sample2 fl_sample3
all:
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE)); done
clean:
@for d in $(CONTRIB_SAMPLES); do (cd $$d && $(MAKE) clean); done

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 822 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 822 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@@ -0,0 +1,25 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# "%W% %G%"
#
# Makefile : Builds sample on UNIX/Linux.
top_srcdir = @top_srcdir@/..
top_builddir = ../../../..
TARGET = fl_demo1
program_dir = contrib/samples/fl/$(TARGET)
APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
PROGRAM = $(TARGET)
OBJECTS = $(TARGET).o
include $(top_builddir)/src/makeprog.env

View File

@@ -0,0 +1,108 @@
# Microsoft Developer Studio Project File - Name="fl_demo1" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=fl_demo1 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "fl_demo.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo1 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "fl_demo1 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "fl_demo1 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "fl_demo1 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
!ENDIF
# Begin Target
# Name "fl_demo1 - Win32 Release"
# Name "fl_demo1 - Win32 Debug"
# Begin Source File
SOURCE=.\fl_demo1.cpp
!IF "$(CFG)" == "fl_demo1 - Win32 Release"
!ELSEIF "$(CFG)" == "fl_demo1 - Win32 Debug"
# ADD CPP /Yc"wx/wxprec.h"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\fl_demo1.rc
# End Source File
# End Target
# End Project

View File

@@ -0,0 +1,29 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "fl_demo1"=.\fl_demo.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,241 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by: Sebastian Haase (June 21, 2001)
// Created: 04/11/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "fl_demo1.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
#include "wx/textctrl.h"
// fl headers
#include "wx/fl/controlbar.h" // core API
// extra plugins
#include "wx/fl/barhintspl.h" // beveal for bars with "X"s and grooves
#include "wx/fl/rowdragpl.h" // NC-look with dragable rows
#include "wx/fl/cbcustom.h" // customization plugin
#include "wx/fl/hintanimpl.h"
// beuty-care
#include "wx/fl/gcupdatesmgr.h" // smooth d&d
#include "wx/fl/antiflickpl.h" // double-buffered repaint of decorations
#include "wx/fl/dyntbar.h" // auto-layouting toolbar
#include "wx/fl/dyntbarhnd.h" // control-bar dimension handler for it
#include "fl_demo1.h"
// comment it out if it breaks, (this is my workaround for MSDev 4.0 linker)
char wxDummyChar;
IMPLEMENT_APP (MyApp)
bool MyApp::OnInit(void)
{
MyFrame *frame = new MyFrame(NULL);
frame->SetBackgroundColour( wxColour(192,192,192) );
wxMenu *file_menu = new wxMenu;
file_menu->Append( NEW_TEST_LOAD, "&Load layouts" );
file_menu->Append( NEW_TEST_SAVE, "&Store layouts" );
file_menu->Append( NEW_TEST_EXIT, "E&xit" );
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
frame->SetMenuBar(menu_bar);
frame->CreateStatusBar(3);
frame->Show(TRUE);
frame->mpClientWnd->Refresh();
SetTopWindow(frame);
wxMessageBox("Hello, this demo has a bunch of yet-not-fixed-bugs and misssing functionality\n" \
"The ONLY purpose is to demostrate self-layouting toolbars,\nflat-bitmapped-buttons and 2-new FL-plugins" \
"(cbRowDragPlugin & cbBarHintsPlugin)\n\n" \
"BTW, disabled images and label-text are rendered at run-time" );
return TRUE;
}
/***** Implementation for class MyFrame *****/
BEGIN_EVENT_TABLE( MyFrame, wxFrame )
// EVT_CHAR_HOOK(MyFrame::OnKeyDown)
// EVT_PAINT( MyFrame::OnPaint )
EVT_MENU( NEW_TEST_SAVE, MyFrame::OnSave )
EVT_MENU( NEW_TEST_LOAD, MyFrame::OnLoad )
EVT_MENU( NEW_TEST_EXIT, MyFrame::OnExit )
END_EVENT_TABLE()
void MyFrame::OnLoad( wxCommandEvent& event )
{
wxMessageBox("Hey - you found a BIG question-mark !!");
}
void MyFrame::OnSave( wxCommandEvent& event )
{
wxMessageBox("Hey - you found another BIG question-mark !!");
}
void MyFrame::OnExit( wxCommandEvent& event )
{
Destroy();
}
wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
{
wxTextCtrl* pCtrl =
new wxTextCtrl( this, -1, value,
wxDefaultPosition, wxSize(0,0), wxTE_MULTILINE );
pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
return pCtrl;
}
MyFrame::MyFrame(wxFrame *frame)
: wxFrame( frame, -1, "wxWindows 2.0 wxFrameLayout Test Application", wxDefaultPosition,
wxSize( 700, 500 ),
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
"freimas" )
{
mpClientWnd = CreateTextCtrl( "Client window" );
mpLayout = new wxFrameLayout( this, mpClientWnd );
#ifdef __WXGTK__
cbCommonPaneProperties props;
mpLayout->GetPaneProperties( props );
props.mRealTimeUpdatesOn = FALSE; // real-time OFF!!!
mpLayout->SetPaneProperties( props, wxALL_PANES );
#endif
mpLayout->SetUpdatesManager( new cbGCUpdatesMgr() );
// this is now default...
//mpLayout->SetMargins( 1,1,1,1 ); // gaps for vertical/horizontal/right/left panes
// setup plugins for testing
mpLayout->PushDefaultPlugins();
mpLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for bars
mpLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
mpLayout->AddPlugin( CLASSINFO( cbRowDragPlugin ) );
mpLayout->AddPlugin( CLASSINFO( cbAntiflickerPlugin ) );
mpLayout->AddPlugin( CLASSINFO( cbSimpleCustomizationPlugin ) );
// drop in some bars
cbDimInfo sizes0( 200,45, // when docked horizontally
200,85, // when docked vertically
175,35, // when floated
FALSE, // the bar is not fixed-size
4, // vertical gap (bar border)
4 // horizontal gap (bar border)
);
cbDimInfo sizes1( 150,35, // when docked horizontally
150,85, // when docked vertically
175,35, // when floated
TRUE, // the bar is not fixed-size
4, // vertical gap (bar border)
4 // horizontal gap (bar border)
);
cbDimInfo sizes2( 175,45, // when docked horizontally
175,37, // when docked vertically
170,35, // when floated
TRUE, // the bar is not fixed-size
4, // vertical gap (bar border)
4, // horizontal gap (bar border)
new cbDynToolBarDimHandler()
);
mpLayout->AddBar( CreateTextCtrl("Hello"), // bar window
sizes0, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
0, // offset from the start of row (in pixels)
"InfoViewer1", // name to refere in customization pop-ups
TRUE
);
mpLayout->AddBar( CreateTextCtrl("Bye"), // bar window
sizes0, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
1, // insert into 0th row (vert. position)
0, // offset from the start of row (in pixels)
"InfoViewer2", // name to refere in customization pop-ups
TRUE
);
mpLayout->AddBar( CreateTextCtrl("Fixed0"), // bar window
sizes1, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
0, // offset from the start of row (in pixels)
"ToolBar1", // name to refere in customization pop-ups
TRUE
);
wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
pToolBar->Create( this, -1 );
// 1001-1006 ids of command events fired by added tool-buttons
pToolBar->AddTool( 1001, BMP_DIR "new.bmp" );
pToolBar->AddTool( 1002, BMP_DIR "open.bmp" );
pToolBar->AddTool( 1003, BMP_DIR "save.bmp" );
pToolBar->AddTool( 1004, BMP_DIR "cut.bmp" );
pToolBar->AddTool( 1005, BMP_DIR "copy.bmp" );
pToolBar->AddTool( 1006, BMP_DIR "paste.bmp" );
mpLayout->AddBar( pToolBar, // bar window (can be NULL)
sizes2, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
0, // offset from the start of row (in pixels)
"ToolBar2", // name to refere in customization pop-ups
FALSE
);
mpLayout->EnableFloating( TRUE ); // off, thinking bout wxGtk...
}
MyFrame::~MyFrame()
{
if ( mpLayout)
delete mpLayout; // should be destroyed manually
}

View File

@@ -0,0 +1,55 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by: Sebastian Haase (June 21, 2001)
// Created: 04/11/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __NEW_TEST_G__
#define __NEW_TEST_G__
#ifdef __GNUG__
#pragma interface "fl_demo1.h"
#endif
#define NEW_TEST_SAVE 1101
#define NEW_TEST_LOAD 1102
#define NEW_TEST_EXIT 1103
#include "wx/panel.h"
// Define a new application type
class MyApp: public wxApp
{
public:
bool OnInit(void);
};
// Define a new frame type
class MyFrame: public wxFrame
{
public:
wxFrameLayout* mpLayout;
wxTextCtrl* mpClientWnd;
wxTextCtrl* CreateTextCtrl( const wxString& value );
public:
MyFrame(wxFrame *frame);
virtual ~MyFrame();
bool OnClose(void) { Show(FALSE); return TRUE; }
void OnLoad( wxCommandEvent& event );
void OnSave( wxCommandEvent& event );
void OnExit( wxCommandEvent& event );
DECLARE_EVENT_TABLE()
};
#endif

View File

@@ -0,0 +1,3 @@
/* mondrian ICON "mondrian.ico" */
#include "wx/msw/wx.rc"

View File

@@ -0,0 +1,23 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = ..\..\..\..
TARGET = fl_demo1
EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
!if "$(FINAL)" == "1"
EXTRALIBS = $(WSLIBDIR)\fl.lib
!else
EXTRALIBS = $(WSLIBDIR)\fld.lib
!endif
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,18 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# Makefile for wxWorkshop for mingw & cygwin.
WXDIR = ../../../..
TARGET = fl_demo1
EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
EXTRALIBS = $(WXDIR)/lib/libfl.a
OBJECTS = $(TARGET).o
include $(WXDIR)/src/makeprog.g95

View File

@@ -0,0 +1,24 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# Makefile : Builds fl sample (VC++, WIN32)
# Use FINAL=1 argument to nmake to build final version with no debug info.
WXDIR = ..\..\..\..
TARGET = fl_demo1
EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
!if "$(FINAL)" == "1"
EXTRALIBS = $(WXDIR)\lib\fl.lib
!else
EXTRALIBS = $(WXDIR)\lib\fld.lib
!endif
PROGRAM = $(TARGET)
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.vc

View File

@@ -0,0 +1,25 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# "%W% %G%"
#
# Makefile : Builds sample on UNIX/Linux.
top_srcdir = @top_srcdir@/..
top_builddir = ../../../..
TARGET = fl_demo2
program_dir = contrib/samples/fl/$(TARGET)
APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
PROGRAM = $(TARGET)
OBJECTS = $(TARGET).o
include $(top_builddir)/src/makeprog.env

View File

@@ -0,0 +1,108 @@
# Microsoft Developer Studio Project File - Name="fl_demo2" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=fl_demo2 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "fl_demo.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "fl_demo.mak" CFG="fl_demo2 - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "fl_demo2 - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "fl_demo2 - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "fl_demo2 - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../../include" /I "../../../../contrib/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /D BMP_DIR=\"../bitmaps/\" /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wx.lib png.lib zlib.lib jpeg.lib tiff.lib regex.lib fl.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /libpath:"../../../../lib"
!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../../include" /I "../../../../contrib/include" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /D BMP_DIR=\"../bitmaps/\" /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /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 wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD 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 comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib regexd.lib fld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /pdbtype:sept /libpath:"../../../../lib"
!ENDIF
# Begin Target
# Name "fl_demo2 - Win32 Release"
# Name "fl_demo2 - Win32 Debug"
# Begin Source File
SOURCE=.\fl_demo2.cpp
!IF "$(CFG)" == "fl_demo2 - Win32 Release"
!ELSEIF "$(CFG)" == "fl_demo2 - Win32 Debug"
# ADD CPP /Yc"wx/wxprec.h"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\fl_demo2.rc
# End Source File
# End Target
# End Project

View File

@@ -0,0 +1,29 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "fl_demo2"=.\fl_demo.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,986 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by: Sebastian Haase (June 21, 2001)
// Created: 04/11/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "fl_demo2.h"
#endif
// For compilers that support precompilation, includes "wx/wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
// wxWindows headers.
#include "wx/treectrl.h"
#include "wx/imaglist.h"
#include "wx/notebook.h"
// fl headers.
#include "wx/fl/controlbar.h"
#include "wx/fl/rowlayoutpl.h"
#include "wx/fl/antiflickpl.h"
#include "wx/fl/bardragpl.h"
#include "wx/fl/cbcustom.h"
#include "wx/fl/rowdragpl.h"
// some extra fl plugins.
#include "wx/fl/barhintspl.h"
#include "wx/fl/hintanimpl.h"
#include "wx/fl/dyntbar.h"
#include "wx/fl/dyntbarhnd.h" // fl-dimension-handler for dynamic toolbar
#include "fl_demo2.h"
/***** Implementation for class MyApp *****/
// Create a new application object
IMPLEMENT_APP (MyApp)
// `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit(void)
{
// Create the main frame window
MyFrame *frame = new MyFrame(NULL, "wxWindows 2.0 wxFrameLayout demo", 50, 50, 650, 540);
// Give it an icon
#ifdef __WINDOWS__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
frame->SetIcon(wxIcon("aiai.xbm"));
#endif
// Make a menubar
wxMenu *file_menu = new wxMenu;
wxMenu *active_menu = new wxMenu;
file_menu->Append( ID_LOAD, "&Load layouts" );
file_menu->Append( ID_STORE, "&Store layouts" );
file_menu->AppendSeparator();
file_menu->Append( ID_AUTOSAVE, "&Auto Save Layouts", "save layouts on exit", TRUE );
file_menu->AppendSeparator();
file_menu->Append(MINIMAL_ABOUT, "A&bout !");
file_menu->Append(MINIMAL_QUIT, "E&xit\tTab");
//active_menu->Append( ID_SETTINGS, "&Settings...\tCtrl" );
//active_menu->AppendSeparator();
active_menu->Append( ID_REMOVE, "&Remove Active" );
active_menu->Append( ID_REMOVEALL, "Remove &All" );
active_menu->Append( ID_RECREATE, "Re&create" );
active_menu->AppendSeparator();
active_menu->Append( ID_FIRST, "Activate f&irst layout \tF1", "activate it", TRUE );
active_menu->Append( ID_SECOND, "Activate &second layout\tF2","activate it", TRUE );
active_menu->Append( ID_THIRD, "Activate &third layout\tF3","activate it", TRUE );
wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File");
menu_bar->Append(active_menu, "Active &Layout");
frame->CreateStatusBar(3);
frame->SetMenuBar(menu_bar);
frame->SyncMenuBarItems();
// Show the frame
frame->Show(TRUE);
SetTopWindow(frame);
return TRUE;
}
MyFrame::~MyFrame()
{
// frame-layouts is not a windows (objects), thus should
// be cleaned up manually
for( int i = 0; i != MAX_LAYOUTS; ++i )
{
if ( mLayouts[i] )
delete mLayouts[i];
}
if ( mpNestedLayout )
delete mpNestedLayout;
if ( mpAboutBoxLayout )
delete mpAboutBoxLayout;
}
/***** Implementation for class MyFrame *****/
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU( MINIMAL_QUIT, MyFrame::OnQuit )
EVT_MENU( MINIMAL_ABOUT, MyFrame::OnAbout )
EVT_MENU( ID_LOAD, MyFrame::OnLoad )
EVT_MENU( ID_STORE, MyFrame::OnStore )
EVT_MENU( ID_AUTOSAVE, MyFrame::OnAutoSave )
//EVT_MENU( ID_SETTINGS, MyFrame::OnSettings )
EVT_MENU( ID_REMOVE, MyFrame::OnRemove )
EVT_MENU( ID_REMOVEALL, MyFrame::OnRemoveAll )
EVT_MENU( ID_RECREATE, MyFrame::OnRecreate )
EVT_MENU( ID_FIRST, MyFrame::OnFirst )
EVT_MENU( ID_SECOND, MyFrame::OnSecond )
EVT_MENU( ID_THIRD, MyFrame::OnThird )
EVT_BUTTON( ID_SAY_ITSOK, MyFrame::OnSayItsOk )
EVT_BUTTON( ID_BTN_YES, MyFrame::OnBtnYes )
EVT_BUTTON( ID_BTN_NO, MyFrame::OnBtnNo )
EVT_BUTTON( ID_BTN_ESC, MyFrame::OnBtnEsc )
EVT_CHAR_HOOK( MyFrame::OnChar )
END_EVENT_TABLE()
// My frame constructor
MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
mpNestedLayout( NULL ),
mpAboutBoxLayout( NULL ),
mActiveLayoutNo( FIRST_LAYOUT ),
mAutoSave( TRUE ),
mSavedAlready( FALSE ),
mpClntWindow( NULL ),
mImageList( 16,16, FALSE, 2 )
{
mpInternalFrm = (wxPanel*)this;
mAboutBox.Create( this, -1, "About box in wxWindows style...",
wxDefaultPosition,
wxSize( 385,220),
wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL );
int i = 0;
for( i = 0; i != MAX_LAYOUTS; ++i )
mLayouts[i] = NULL;
// image-list is one of the few objects which
// currently cannot be serialized, create it first
// and use it as initial reference (IR)
wxBitmap bmp1,bmp2;
if ( wxFileExists( BMP_DIR "folder_icon.bmp" ) )
bmp1.LoadFile( BMP_DIR "folder_icon.bmp", wxBITMAP_TYPE_BMP );
if ( wxFileExists( BMP_DIR "class_icon1.bmp" ) )
bmp2.LoadFile( BMP_DIR "class_icon1.bmp", wxBITMAP_TYPE_BMP );
mImageList.Add( bmp1 );
mImageList.Add( bmp2 );
InitAboutBox();
// create multiple layouts
mpNestedLayout = 0;
mpClntWindow = CreateTxtCtrl("client window");
// Create all layouts
for( i = 0; i != MAX_LAYOUTS; ++i )
{
CreateLayout( i );
}
// hide others
for( i = SECOND_LAYOUT; i != MAX_LAYOUTS; ++i )
{
mLayouts[i]->HideBarWindows();
}
// activate first one
mLayouts[FIRST_LAYOUT]->Activate();
mActiveLayoutNo = FIRST_LAYOUT;
}
/*** event handlers ***/
bool MyFrame::OnClose(void)
{
// USEFUL TRICK:: avoids flickering of application's frame
// when closing NN windows on exit:
this->Show(FALSE);
if ( (mAutoSave && mSavedAlready) || !mAutoSave )
{
}
else
{
wxCommandEvent evt;
this->OnStore(evt);
}
mAboutBox.Destroy();
this->Destroy();
return TRUE;
}
void MyFrame::OnLoad( wxCommandEvent& event )
{
wxMessageBox("Hey - you found a BIG question-mark !!");
}
void MyFrame::OnStore( wxCommandEvent& event )
{
wxMessageBox("Hey - you found another BIG question-mark !!");
}
void MyFrame::OnAutoSave( wxCommandEvent& event )
{
mAutoSave = !mAutoSave;
wxCommandEvent evt;
this->OnStore(evt);
SyncMenuBarItems();
}
void MyFrame::OnRemove( wxCommandEvent& event )
{
RemoveLayout( mActiveLayoutNo );
Refresh();
}
void MyFrame::OnRemoveAll( wxCommandEvent& event )
{
for( int i = 0; i != MAX_LAYOUTS; ++i )
{
RemoveLayout( i );
}
Refresh();
}
void MyFrame::OnRecreate( wxCommandEvent& event )
{
OnRemove( event ); // first destroy active layout
CreateLayout( mActiveLayoutNo );
mLayouts[mActiveLayoutNo]->Activate();
}
void MyFrame::OnFirst( wxCommandEvent& event )
{
ActivateLayout( FIRST_LAYOUT );
}
void MyFrame::OnSecond( wxCommandEvent& event )
{
ActivateLayout( SECOND_LAYOUT );
}
void MyFrame::OnThird( wxCommandEvent& event )
{
ActivateLayout( THIRD_LAYOUT );
}
void MyFrame::OnQuit( wxCommandEvent& event )
{
// USEFUL TRICK:: avoids flickering of application's frame
// when closing NN windows on exit:
this->Show(FALSE);
if ( (mAutoSave && mSavedAlready) || !mAutoSave )
{
}
else
{
wxCommandEvent evt;
this->OnStore(evt);
}
Destroy();
}
void MyFrame::OnAbout( wxCommandEvent& event )
{
wxFont font;
#ifdef __WXMSW__
font.SetFaceName("MS Sans Serif");
#else
font.SetFamily( wxSWISS );
#endif
font.SetStyle( wxSLANT );
font.SetWeight( wxNORMAL );
font.SetPointSize( 8 );
#ifdef __WXMSW__
font.RealizeResource();
#endif
mAboutBox.Center( wxBOTH );
mAboutBox.Show(TRUE);
}
void MyFrame::OnChar( wxKeyEvent& event )
{
wxCommandEvent evt;
if ( event.m_keyCode == WXK_F1 )
{
this->OnFirst( evt );
}
else
{
if ( event.m_keyCode == WXK_F2 )
{
this->OnSecond( evt );
}
else
{
if ( event.m_keyCode == WXK_F3 )
{
this->OnThird( evt );
}
if ( event.m_keyCode == WXK_F4 && !event.AltDown() )
{
// "AI" :-)
wxMessageBox("There are only 3 layouts in this demo :-(");
}
else
{
if ( event.m_keyCode == WXK_TAB )
{
// USEFUL TRICK:: avoids flickering of application's frame
// when closing NN windows on exit:
this->Show(FALSE);
if ( (mAutoSave && mSavedAlready) || !mAutoSave )
{
}
else
{
wxCommandEvent evt;
this->OnStore(evt);
}
Destroy();
}
else
{
event.Skip();
}
}
}
}
}
void MyFrame::OnSayItsOk( wxCommandEvent& event )
{
wxMessageBox("It's OK :-)\n\n now click on the border around the button\n and try dragging it!" );
}
void MyFrame::OnBtnYes( wxCommandEvent& event )
{
mAboutBox.Show(FALSE);
}
void MyFrame::OnBtnNo( wxCommandEvent& event )
{
mAboutBox.Show(FALSE);
}
void MyFrame::OnBtnEsc( wxCommandEvent& event )
{
mAboutBox.Show(FALSE);
}
/*** helper methods ***/
void MyFrame::InitAboutBox()
{
wxPanel* pArea = new wxPanel();
pArea->Create( &mAboutBox, -1 );
new wxStaticText(pArea, -1, "This is wxFrameLayout contribution demo.",
wxPoint(10, 10) );
new wxStaticText(pArea, -1, "Aleksandras Gluchovas (c) 1998",
wxPoint(10, 30) );
new wxStaticText(pArea, -1, "<mailto:alex@soften.ktu.lt>",
wxPoint(10, 50) );
mpAboutBoxLayout = new wxFrameLayout( &mAboutBox, pArea, TRUE );
wxFrameLayout& layout = *mpAboutBoxLayout;
cbDimInfo sizes( 90,40, // when docked horizontally
45,55, // when docked vertically
90,40, // when floated
TRUE, 4, 4 // true - bar is fixed-size
);
wxButton* pYes = CreateButton("&Yes", &mAboutBox, ID_SAY_ITSOK );
wxButton* pNo = CreateButton("&No", &mAboutBox, ID_BTN_NO );
wxButton* pEsc = CreateButton("Cancel", &mAboutBox, ID_BTN_ESC );
layout.AddBar( pEsc, sizes, FL_ALIGN_BOTTOM, 0, 20, "cancel button");
layout.AddBar( pNo, sizes, FL_ALIGN_BOTTOM, 0, 20, "no button");
layout.AddBar( pYes, sizes, FL_ALIGN_BOTTOM, 0, 20, "yes button");
layout.mBorderPen.SetColour( 192, 192, 192 );
layout.SetMargins( 15, 15, 15, 15, wxALL_PANES );
cbCommonPaneProperties props;
layout.GetPaneProperties( props, FL_ALIGN_TOP );
props.mShow3DPaneBorderOn = FALSE;
layout.SetPaneProperties( props, wxALL_PANES );
layout.Activate();
pYes->SetDefault();
pYes->SetFocus();
}
wxTextCtrl* MyFrame::CreateTxtCtrl( const wxString& txt, wxWindow* parent )
{
return new wxTextCtrl( (parent != NULL ) ? parent : mpInternalFrm,
-1, txt, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE );
}
wxButton* MyFrame::CreateButton( const wxString& label,
wxWindow* pParent, long id )
{
return new wxButton( (pParent)?pParent : mpInternalFrm, id,
label, wxPoint( 0,0 ), wxSize( 0,0 ) );
}
wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
{
wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, -1 );
int rootid = pTree->AppendItem( (long)0, label, 0);
if ( label[0] != 'X' )
{
pTree->AppendItem(rootid, "Leaf1", 0);
pTree->AppendItem(rootid, "Leaf2", 0);
}
else
{
pTree->AppendItem(rootid, "Scully", 0);
pTree->AppendItem(rootid, "Mulder", 0);
}
return pTree;
}
wxChoice* MyFrame::CreateChoice( const wxString& txt )
{
wxString choice_strings[5];
choice_strings[0] = txt;
choice_strings[1] = "Julian";
choice_strings[2] = "Hattie";
choice_strings[3] = "Ken";
choice_strings[4] = "Dick";
wxChoice *choice = new wxChoice( mpInternalFrm, 301, wxDefaultPosition,
wxDefaultSize, 5, choice_strings);
choice->SetSelection(0);
return choice;
}
// helper
void MyFrame::AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent )
{
cbDimInfo sizes2( 275,38, // when docked horizontally
45,275, // when docked vertically
80,30, // when floated
TRUE, // the bar is fixed-size
4, // vertical gap (bar border)
4, // horizontal gap (bar border)
new cbDynToolBarDimHandler()
);
cbDimInfo sizes3( 275,55, // when docked horizontally
275,60, // when docked vertically
45,130, // when floated
TRUE, // the bar is fixed-size
4, // vertical gap (bar border)
4, // horizontal gap (bar border)
new cbDynToolBarDimHandler()
);
cbDimInfo sizes4( 430,35, // when docked horizontally
44,375, // when docked vertically
80,100, // when floated
TRUE, // the bar is fixed-size
4, // vertical gap (bar border)
4, // horizontal gap (bar border)
new cbDynToolBarDimHandler()
);
wxDynamicToolBar* pTBar2 = new wxDynamicToolBar( mpInternalFrm, -1 );
wxChoice* pChoice = new wxChoice( pTBar2, -1, wxDefaultPosition, wxSize( 140,25 ) );
pTBar2->AddTool( 1, pChoice );
pTBar2->AddTool( 2, BMP_DIR "search.bmp" );
//pTBar2->AddSeparator();
pTBar2->AddTool( 3, BMP_DIR "bookmarks.bmp" );
pTBar2->AddTool( 4, BMP_DIR "nextmark.bmp" );
pTBar2->AddTool( 5, BMP_DIR "prevmark.bmp" );
wxDynamicToolBar* pTBar3 = new wxDynamicToolBar( mpInternalFrm, -1 );
pTBar3->AddTool( 1, BMP_DIR "open.bmp", wxBITMAP_TYPE_BMP, " Open " );
pTBar3->AddTool( 2, BMP_DIR "save.bmp", wxBITMAP_TYPE_BMP, " Save " );
pTBar3->AddTool( 3, BMP_DIR "saveall.bmp", wxBITMAP_TYPE_BMP, " Save All " );
//pTBar3->AddSeparator();
pTBar3->AddTool( 4, BMP_DIR "cut.bmp", wxBITMAP_TYPE_BMP, " Open " );
pTBar3->AddTool( 5, BMP_DIR "copy.bmp", wxBITMAP_TYPE_BMP, " Copy " );
pTBar3->AddTool( 6, BMP_DIR "paste.bmp", wxBITMAP_TYPE_BMP, " Paste " );
#ifdef __WXMSW__
pTBar3->EnableTool( 2, FALSE );
#endif
wxDynamicToolBar* pTBar4 = new wxDynamicToolBar( mpInternalFrm, -1 );
pTBar4->AddTool( 1, BMP_DIR "bookmarks.bmp", wxBITMAP_TYPE_BMP, "Bookmarks ", TRUE );
pTBar4->AddTool( 2, BMP_DIR "nextmark.bmp", wxBITMAP_TYPE_BMP, "Next bookmark ", TRUE );
pTBar4->AddTool( 3, BMP_DIR "prevmark.bmp", wxBITMAP_TYPE_BMP, "Prev bookmark ", TRUE );
//pTBar4->AddSeparator();
pTBar4->AddTool( 4, BMP_DIR "search.bmp", wxBITMAP_TYPE_BMP, "Search ", TRUE );
#ifdef __WXMSW__
pTBar4->EnableTool( 4, FALSE );
#endif
layout.AddBar( pTBar2,
sizes2, FL_ALIGN_TOP,
0,
0,
"Search",
TRUE
);
layout.AddBar( pTBar3,
sizes3, FL_ALIGN_BOTTOM,
0,
0,
"Titled",
TRUE
);
layout.AddBar( pTBar4,
sizes4, FL_ALIGN_BOTTOM,
1,
0,
"Bookmarks",
TRUE
);
}
wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
{
bool isNested = (pParent != mpInternalFrm);
// check if we're craeting nested layout
if ( isNested )
{
layout.mBorderPen.SetColour( 128,255,128 );
// if so, than make border smaller
for( int i = 0; i != MAX_PANES; ++i )
{
cbDockPane& pane = *layout.GetPane( i );
pane.mTopMargin = 5;
pane.mBottomMargin = 5;
pane.mLeftMargin = 5;
pane.mRightMargin = 5;
}
}
int cbWidth = 200;
int cbHeight = ( isNested ) ? 50 : 150;
cbDimInfo sizes4( cbWidth,cbHeight,
cbWidth,cbHeight,
cbWidth,cbHeight, FALSE );
cbWidth = 75;
cbHeight = 31;
cbDimInfo sizes5( cbWidth,cbHeight,
42,65,
cbWidth,cbHeight, TRUE,
3, // vertical gap (bar border)
3 // horizontal gap (bar border)
);
// create "workplace" window in the third layout
// SEB: originally here was a wxpp (wxWorkshop) class demotrated
// wxTabbedWindow* pMiniTabArea = new wxTabbedWindow();
// pMiniTabArea->Create( pParent, -1 );
wxTreeCtrl* pClassView = new wxTreeCtrl( pParent, -1,
wxDefaultPosition, wxDefaultSize, wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS );
pClassView->SetImageList( &mImageList );
wxTreeItemId rootId = pClassView->AddRoot( "wxWindows 2.0 classes", 0 );
pClassView->AppendItem( rootId, "wxWin Dynamic classes (grabbed at run-time)", 0 );
pClassView->AppendItem( rootId, "serializer-classes (grabbed at run-time)", 0 );
// now create "output" window
wxNotebook* pTabbedArea = new wxNotebook(pParent, -1);
// SEB: originally here was a wxpp (wxWorkshop) class used
// wxPaggedWindow* pTabbedArea = new wxPaggedWindow();
// pTabbedArea->Create( pParent, -1 );
wxPanel* pSheet3 = new wxPanel();
pSheet3->Create( pTabbedArea, -1 );
pSheet3->Show(FALSE);
pTabbedArea->AddPage( CreateTxtCtrl("build", pTabbedArea), "Build");
pTabbedArea->AddPage( CreateTxtCtrl("debug", pTabbedArea), "Debug");
pTabbedArea->AddPage( pSheet3, "is THIS recursive - or what !?");
pTabbedArea->AddPage( CreateTxtCtrl("profile", pTabbedArea), "Profile");
layout.AddBar( new StartButton95(pParent), sizes5, FL_ALIGN_TOP, 0, 0, "Start..." );
layout.AddBar( pClassView, sizes4, FL_ALIGN_LEFT, 0, 0, "Project Workplace" );
layout.AddBar( pTabbedArea, sizes4, FL_ALIGN_BOTTOM, 0, 50, "Output" );
return pSheet3;
}
void MyFrame::DropInSomeBars( int layoutNo )
{
/* create once... and forget! */
// setup dimension infos for various bar shapes
int cbWidth = 90;
int cbHeight = 30;
if ( layoutNo == SECOND_LAYOUT )
cbHeight = 60;
wxFrameLayout& layout = *mLayouts[layoutNo];
cbDimInfo sizes( cbWidth,cbHeight, // when docked horizontally
cbWidth,cbHeight, // when docked vertically
cbWidth,cbHeight, // when floated
TRUE // true - bar is fixed-size
);
cbWidth = 120;
cbDimInfo sizes1( cbWidth,cbHeight,
cbWidth,cbHeight,
cbWidth,cbHeight, FALSE ); // false - bar is "flexible"
cbWidth = 120;
cbHeight = 40;
cbDimInfo sizes3( cbWidth,cbHeight,
cbWidth,cbHeight,
cbWidth,cbHeight, TRUE ); // -/-
cbWidth = 200;
cbHeight = 150;
cbDimInfo sizes4( cbWidth,cbHeight,
cbWidth,cbHeight,
cbWidth,cbHeight, FALSE ); // -/-
cbWidth = 63;
cbHeight = 31;
cbDimInfo sizes5( cbWidth,cbHeight,
cbHeight,cbWidth,
cbWidth,cbHeight, TRUE,
3, // vertical gap (bar border)
3 // horizontal gap (bar border)
); // -/-
if ( layoutNo == FIRST_LAYOUT )
{
// add 4 fixed-size bars (`sizes' dim-info) and one "flexible" (with `sizes1' dim-info)
wxWindow* pGreenOne = new MyTestPanel(mpInternalFrm);
pGreenOne->SetBackgroundColour( wxColour(128,255,128) );
layout.AddBar( pGreenOne, sizes, FL_ALIGN_TOP, 0, 50, "Bar1", TRUE );
layout.AddBar( new MyTestPanel(mpInternalFrm), sizes, FL_ALIGN_TOP, 2, 50, "Bar2", TRUE );
layout.AddBar( new MyTestPanel(mpInternalFrm), sizes, FL_ALIGN_BOTTOM, 2, 50, "Bar3", TRUE );
layout.AddBar( new MyTestPanel(mpInternalFrm), sizes, FL_ALIGN_LEFT, 2, 50, "Bar4", TRUE );
layout.AddBar( new MyTestPanel(mpInternalFrm), sizes1, wxCBAR_HIDDEN, 2, 50, "Super-Bar", TRUE );
}
else
{
if ( layoutNo == SECOND_LAYOUT )
{
// show off various wx-controls in the second layout
layout.AddBar( CreateTxtCtrl(), sizes, FL_ALIGN_TOP, 0, 50, "Fixed text Area&0" );
layout.AddBar( CreateButton("OK"), sizes, FL_ALIGN_TOP, 0, 100, "First Button" );
layout.AddBar( CreateTxtCtrl(), sizes1, FL_ALIGN_BOTTOM, 0, 50, "First Tree" );
layout.AddBar( CreateTreeCtrl("Root"), sizes1, FL_ALIGN_LEFT, 0, 0, "TreeCtrl Window" );
layout.AddBar( CreateChoice("Choice 1"), sizes3, FL_ALIGN_TOP, 0, 0, "Choice 1 (buggy)", FALSE, wxCBAR_HIDDEN );
layout.AddBar( CreateChoice("Choice 2"), sizes3, FL_ALIGN_TOP, 0, 0, "Choice 2 (buggy)", FALSE, wxCBAR_HIDDEN );
layout.AddBar( CreateTreeCtrl("X-Files"), sizes1, FL_ALIGN_RIGHT, 0, 100, "X-Files" );
layout.AddBar( CreateTxtCtrl("smaller1"), sizes3, FL_ALIGN_TOP, 0, 50, "smaller Area1" );
layout.AddBar( CreateTxtCtrl("smaller2"), sizes3, FL_ALIGN_TOP, 0, 50, "sm&ller Area2" );
}
else
{
if ( layoutNo == THIRD_LAYOUT )
{
#ifdef __WXGTK__
cbCommonPaneProperties props;
layout.GetPaneProperties( props );
props.mRealTimeUpdatesOn = FALSE; // real-time OFF for gtk!!!
layout.SetPaneProperties( props, wxALL_PANES );
#endif
layout.AddBar( CreateTxtCtrl("Tool1"), sizes3, FL_ALIGN_TOP, 0, 50, "Fixed text Area1" );
layout.AddBar( CreateTxtCtrl("Tool2"), sizes3, FL_ALIGN_TOP, 0, 50, "Fixed text Area2" );
layout.AddBar( CreateTxtCtrl("Tool3"), sizes3, FL_ALIGN_TOP, 0, 50, "Fixed text Area3" );
layout.AddBar( CreateTxtCtrl("Tool4"), sizes3, FL_ALIGN_TOP, 1, 50, "Fixed text Area4" );
layout.AddBar( CreateTxtCtrl("Tool5"), sizes3, FL_ALIGN_TOP, 1, 50, "Fixed text Area5" );
layout.AddBar( CreateTxtCtrl("Tool6"), sizes3, FL_ALIGN_TOP, 1, 50, "Fixed text Area6" );
layout.AddBar( CreateTxtCtrl("Tool7"), sizes3, FL_ALIGN_TOP, 2,250, "Fixed text Area7" );
cbDimInfo sizes10( 175,35, // when docked horizontally
175,38, // when docked vertically
170,35, // when floated
TRUE, // the bar is not fixed-size
4, // vertical gap (bar border)
4, // horizontal gap (bar border)
new cbDynToolBarDimHandler()
);
wxDynamicToolBar* pToolBar = new wxDynamicToolBar();
pToolBar->Create( mpInternalFrm, -1 );
// 1001-1006 ids of command events fired by added tool-buttons
pToolBar->AddTool( 1001, BMP_DIR "new.bmp" );
pToolBar->AddTool( 1002, BMP_DIR "open.bmp" );
pToolBar->AddTool( 1003, BMP_DIR "save.bmp" );
pToolBar->AddTool( 1004, BMP_DIR "cut.bmp" );
pToolBar->AddTool( 1005, BMP_DIR "copy.bmp" );
pToolBar->AddTool( 1006, BMP_DIR "paste.bmp" );
layout.AddBar( pToolBar, // bar window (can be NULL)
sizes10, FL_ALIGN_TOP, // alignment ( 0-top,1-bottom, etc)
0, // insert into 0th row (vert. position)
0, // offset from the start of row (in pixels)
"Real-Toolbar", // name to refere in customization pop-ups
FALSE
);
// create first "developement" layout
AddSearchToolbars( layout, mpInternalFrm);
wxWindow* pSheet3 = CreateDevLayout( layout, mpInternalFrm);
// create another ***secreat developement*** layout inside
// the third sheet of the outter one's output bar
mpNestedLayout = new wxFrameLayout( pSheet3,
CreateTxtCtrl("\"Mobils in Mobile\" --C.Nemo",pSheet3), FALSE );
CreateDevLayout( *mpNestedLayout, pSheet3 );
mpNestedLayout->Activate();
}
}
}
}
void MyFrame::CreateLayout( int layoutNo )
{
wxFrameLayout* pLayout = new wxFrameLayout( mpInternalFrm, mpClntWindow, FALSE );
if ( layoutNo == THIRD_LAYOUT )
{
pLayout->PushDefaultPlugins();
pLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // facny "X"es and beveal for bars
#ifdef __WXGTK__
pLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) );
#endif
pLayout->AddPlugin( CLASSINFO( cbRowDragPlugin ) );
}
mLayouts[layoutNo] = pLayout;
DropInSomeBars( layoutNo );
}
void MyFrame::RemoveLayout( int layoutNo )
{
wxFrameLayout* pLayout = mLayouts[layoutNo];
if ( !pLayout )
return;
pLayout->HideBarWindows();
// destroy nested layout first
if ( layoutNo == THIRD_LAYOUT )
{
if ( mpNestedLayout )
delete mpNestedLayout;
mpNestedLayout = NULL;
}
// NOTE:: bar windows are NOT destroyed automatically by frame-layout
pLayout->DestroyBarWindows();
delete pLayout;
mLayouts[layoutNo] = NULL;
Refresh();
}
void MyFrame::SyncMenuBarItems()
{
for( int i = 0; i != MAX_LAYOUTS; ++i )
{
GetMenuBar()->Check( ID_FIRST+i, mActiveLayoutNo == FIRST_LAYOUT+i );
}
GetMenuBar()->Check( ID_AUTOSAVE, mAutoSave );
}
void MyFrame::ActivateLayout( int layoutNo )
{
if ( layoutNo == mActiveLayoutNo )
return;
if ( mLayouts[mActiveLayoutNo] )
mLayouts[mActiveLayoutNo]->Deactivate();
mActiveLayoutNo = layoutNo;
if ( mLayouts[mActiveLayoutNo] )
mLayouts[mActiveLayoutNo]->Activate();
else
Refresh();
SyncMenuBarItems();
}
/***** Implementation for class StartButton95 (just for fun) *****/
IMPLEMENT_DYNAMIC_CLASS( StartButton95, wxPanel )
BEGIN_EVENT_TABLE( StartButton95, wxPanel )
EVT_LEFT_DOWN( StartButton95::OnMouseDown )
EVT_LEFT_UP ( StartButton95::OnMouseUp )
EVT_PAINT ( StartButton95::OnPaint )
END_EVENT_TABLE()
void StartButton95::OnMouseDown( wxMouseEvent& event )
{
m_bPressed = TRUE;
Refresh();
CaptureMouse();
}
void StartButton95::OnMouseUp( wxMouseEvent& event )
{
// "this is not a bug"
SetCursor( wxCURSOR_WAIT );
GetParent()->SetCursor( wxCURSOR_WAIT );
::wxSetCursor( wxCURSOR_WAIT );
wxSleep(1);
int i = 0;
for( i = 1; i != 6; ++i )
{
m_bPressed = (i % 2) != 0;
Refresh();
wxSleep(1);
}
GetParent()->Close();
//*((char*)(i)-3) = 'X'; // Aleks what's the meaning of this???
}
void StartButton95::OnPaint( wxPaintEvent& event )
{
wxBitmap* pBmp = 0;
if ( m_bPressed )
{
if ( !m_PBmp.Ok() && wxFileExists( BMP_DIR "start95_pr.bmp" ) )
m_PBmp.LoadFile( BMP_DIR "start95_pr.bmp", wxBITMAP_TYPE_BMP );
pBmp = &m_PBmp;
}
else
{
if ( !m_DBmp.Ok() && wxFileExists( BMP_DIR "start95_dp.bmp" ) )
m_DBmp.LoadFile( BMP_DIR "start95_dp.bmp", wxBITMAP_TYPE_BMP );
pBmp = &m_DBmp;
}
if (!pBmp) return;
wxMemoryDC mdc;
wxPaintDC dc(this);
mdc.SelectObject( *pBmp );
dc.Blit( 0,0, pBmp->GetWidth(), pBmp->GetHeight(), &mdc, 0,0, wxCOPY );
mdc.SelectObject( wxNullBitmap );
}

View File

@@ -0,0 +1,160 @@
/////////////////////////////////////////////////////////////////////////////
// Name: No names yet.
// Purpose: Contrib. demo
// Author: Aleksandras Gluchovas
// Modified by:
// Created: 04/11/98
// RCS-ID: $Id$
// Copyright: (c) Aleksandras Gluchovas
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __FLDEMO_G__
#define __FLDEMO_G__
// ID for the menu commands
#define MINIMAL_QUIT 1
#define MINIMAL_ABOUT 102
#define ID_LOAD 103
#define ID_STORE 104
#define ID_AUTOSAVE 105
//#define ID_SETTINGS 106
#define ID_REMOVE 107
#define ID_REMOVEALL 108
#define ID_RECREATE 109
#define ID_ACTIVATE 110
#define ID_FIRST 111
#define ID_SECOND 112
#define ID_THIRD 113
#define ID_SAY_ITSOK 114
#define ID_BTN_YES 115
#define ID_BTN_NO 116
#define ID_BTN_ESC 117
#define MAX_LAYOUTS 3
#define FIRST_LAYOUT 0
#define SECOND_LAYOUT 1
#define THIRD_LAYOUT 2
class wxFrameLayout;
class wxObjectStorage;
// FOR NOW::
typedef wxPanel MyTestPanel;
// Define a new application type
class MyApp: public wxApp
{
public:
bool OnInit(void);
};
// Define a new frame type
class MyFrame: public wxFrame
{
protected:
wxFrameLayout* mLayouts[MAX_LAYOUTS];
wxFrameLayout* mpNestedLayout;
wxFrameLayout* mpAboutBoxLayout;
int mActiveLayoutNo;
bool mAutoSave;
bool mSavedAlready;
// container windows:
wxTextCtrl* mpClntWindow;
wxPanel* mpInternalFrm;
wxImageList mImageList;
wxFrame mAboutBox;
// helpers for control-creation
wxTextCtrl* CreateTxtCtrl ( const wxString& txt = "wxTextCtrl", wxWindow* parent = NULL );
wxTreeCtrl* CreateTreeCtrl( const wxString& label = "TreeCtrl" );
wxChoice* CreateChoice ( const wxString& txt = "Choice1" );
wxButton* CreateButton ( const wxString& label = "wxButton", wxWindow* pParent = NULL, long id = ID_SAY_ITSOK );
// helpers for layout-creation
void AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent );
wxWindow* CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent );
void DropInSomeBars( int layoutNo );
void CreateLayout( int layoutNo );
void RemoveLayout( int layoutNo );
void InitAboutBox();
void ActivateLayout( int layoutNo );
public: /* public */
MyFrame( wxFrame *frame, char *title, int x, int y, int w, int h);
~MyFrame();
void SyncMenuBarItems();
// event handlers
bool OnClose(void);
void OnLoad( wxCommandEvent& event );
void OnStore( wxCommandEvent& event );
void OnAutoSave( wxCommandEvent& event );
void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
//void OnSettings( wxCommandEvent& event );
void OnRemove( wxCommandEvent& event );
void OnRemoveAll( wxCommandEvent& event );
void OnRecreate( wxCommandEvent& event );
void OnFirst( wxCommandEvent& event );
void OnSecond( wxCommandEvent& event );
void OnThird( wxCommandEvent& event );
void OnSayItsOk( wxCommandEvent& event );
void OnBtnYes( wxCommandEvent& event );
void OnBtnNo( wxCommandEvent& event );
void OnBtnEsc( wxCommandEvent& event );
void OnChar( wxKeyEvent& event );
DECLARE_EVENT_TABLE()
};
// Define a new button type, StartButton95 (Just for fun)
class StartButton95 : public wxPanel
{
DECLARE_DYNAMIC_CLASS( StartButton95 )
bool m_bPressed;
wxBitmap m_PBmp;
wxBitmap m_DBmp;
public:
StartButton95(void) : m_bPressed(FALSE) {}
StartButton95(wxWindow* parent)
: m_bPressed(FALSE) { wxPanel::Create(parent,-1); }
void OnMouseDown( wxMouseEvent& event );
void OnMouseUp( wxMouseEvent& event );
void OnPaint( wxPaintEvent& event );
DECLARE_EVENT_TABLE();
};
#endif

View File

@@ -0,0 +1,3 @@
/* mondrian ICON "mondrian.ico" */
#include "wx/msw/wx.rc"

View File

@@ -0,0 +1,23 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# Makefile : Builds sample for 32-bit BC++
WXDIR = ..\..\..\..
TARGET = fl_demo2
EXTRACPPFLAGS =-DBMP_DIR=\"../bitmaps/\"
!if "$(FINAL)" == "1"
EXTRALIBS = $(WSLIBDIR)\fl.lib
!else
EXTRALIBS = $(WSLIBDIR)\fld.lib
!endif
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.b32

View File

@@ -0,0 +1,18 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# Makefile for wxWorkshop for mingw & cygwin.
WXDIR = ../../../..
TARGET = fl_demo2
EXTRACPPFLAGS = -DBMP_DIR=\"../bitmaps/\"
EXTRALIBS = $(WXDIR)/lib/libfl.a
OBJECTS = $(TARGET).o
include $(WXDIR)/src/makeprog.g95

View File

@@ -0,0 +1,24 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# Makefile : Builds fl sample (VC++, WIN32)
# Use FINAL=1 argument to nmake to build final version with no debug info.
WXDIR = ..\..\..\..
TARGET = fl_demo2
EXTRAINC = -DBMP_DIR=\"../bitmaps/\"
!if "$(FINAL)" == "1"
EXTRALIBS = $(WXDIR)\lib\fl.lib
!else
EXTRALIBS = $(WXDIR)\lib\fld.lib
!endif
PROGRAM = $(TARGET)
OBJECTS = $(TARGET).obj
!include $(WXDIR)\src\makeprog.vc

View File

@@ -0,0 +1,25 @@
#
# File: Makefile
# Author: Hans Van Leemputten
# Created: 2001
# Updated:
# Copyright: (c) wxWorkshop team, 2001
#
# "%W% %G%"
#
# Makefile : Builds sample on UNIX/Linux.
top_srcdir = @top_srcdir@/..
top_builddir = ../../../..
TARGET = fl_sample1
program_dir = contrib/samples/fl/$(TARGET)
APPEXTRADEFS = -I$(top_srcdir)/contrib/include -DBMP_DIR=\"../bitmaps/\"
APPEXTRALIBS = $(top_builddir)/lib/libfl.@WX_TARGET_LIBRARY_TYPE@
PROGRAM = $(TARGET)
OBJECTS = $(TARGET).o
include $(top_builddir)/src/makeprog.env

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