Compare commits

..

851 Commits

Author SHA1 Message Date
Bryan Petty
93d7e8170c This commit was manufactured by cvs2svn to create tag
'BEFORE_WIN_AUTODETECT'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/BEFORE_WIN_AUTODETECT@9968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 19:48:15 +00:00
Kendall Bennett
33ac7e6f01 Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
clean with this compiler. Hopefully I did this without breaking other
compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 19:48:15 +00:00
Vadim Zeitlin
b1d1dc510d fixed (?) crashes because of default GUI font being deleted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-02 13:35:14 +00:00
Robin Dunn
f3cf386509 Added missing docs for methods in wxGridSizer and wxFlexGridSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 23:14:40 +00:00
Gilles Depeyrot
947ea04d01 added xpmdecod files
added resource files


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 20:17:33 +00:00
Robert Roebling
830ed6d97d Some minor clean-ups to the wxScrolledWindow code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 20:09:10 +00:00
Gilles Depeyrot
2f51a9ecc5 Added Mac OS X resource file handling:
- rez wxMac library resources into a rsrc file in the lib directory
  - derez the previous rsrc file into an ascii file in the lib directory
  - rez the ascii file into the executables as needed
  - mark executables with application creator code APPL
Compiling the resources into a file in the lib directory avoids dependencies
on the wxMac resource sources when creating executables. However, decompiling
and recompiling could be avoided if resource merging worked (ResMerger?).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 19:40:09 +00:00
Julian Smart
3d5aff50cb Remvoed a yield in HitTest because of undesirable consequences
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 17:05:15 +00:00
Robin Dunn
a92edd311c Check if the timer is already running before starting it again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 16:49:23 +00:00
Robert Roebling
0bc0cd5d81 wxScrolledWindow next take, the Gizmo controls
work again and several other problem have
    been solved, among them at least on reported
    about the old implementation (wrong max size
    due to a rounding error).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 16:40:06 +00:00
Gilles Depeyrot
c854c7d92c applied SourceForge patch #419884 from Marc Newsam
this patch allows the notebook to add and delete pages


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 16:27:26 +00:00
Julian Smart
7699e843c0 Removed generic scrolwin.cpp from wxGTK list because of filename duplication
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 16:03:46 +00:00
Julian Smart
c112dde0a0 Updated src/gtk/files.lst
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 15:44:26 +00:00
Jouk Jansen
2900bd1c81 Committing in .
Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/common/mimecmn.cpp
 	wxWindows/src/generic/descrip.mms
 	wxWindows/src/gtk/descrip.mms wxWindows/src/unix/mimetype.cpp

  Updated compile support for OpenVMS

 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 14:46:48 +00:00
Robert Roebling
d9a4f62064 wxScrolledWindow now emits wxScrollWinEvents. Something
does not work yet as desried, though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 14:32:41 +00:00
Julian Smart
5570ec300e Added #define for apps to detect new situation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 13:01:58 +00:00
Julian Smart
35b6b7d54a Added required #include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 12:51:01 +00:00
Stefan Csomor
72d750d462 corrected event handling according to current msw/gtk implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-01 06:46:38 +00:00
Robin Dunn
49348d874d regenerated some more sources for gtk.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 23:59:17 +00:00
Robin Dunn
91c41b30c2 Some tweaks and cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 23:52:22 +00:00
Robin Dunn
9e689c0658 version number.
regenerated some sources for gtk.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 23:47:01 +00:00
Robin Dunn
ec5d77998a Implemented wxGetClientDisplayRect which returns the dimensions of the
desktop minus taskbar, etc. on Windows and defaults to the full
desktop dimensions on other platforms.  (If there is a way to do it
for other platforms please do.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 20:55:11 +00:00
Robin Dunn
926bb76c2a Some tweaks and cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 18:37:26 +00:00
Robin Dunn
ed1ae3fb27 Bug fix from Mike Fletcher
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 18:37:06 +00:00
Robin Dunn
7114b9fa28 Updates for the sample apps. Some readme's, show how to use py2exe,
InnoSetup, etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 18:34:21 +00:00
Robin Dunn
b6962846e8 Show how to get an icon from a bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 18:33:20 +00:00
Robin Dunn
d7ec656498 Switched to InnoSetup for MSW distributions
Other distrib stuff


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 18:32:18 +00:00
David Webster
a51fb6427c New makefile and modified .def file supporting the xpmdecod module.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 15:35:30 +00:00
David Webster
adebd2d72c Too quick a trigger finger first time. Compile error fixed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 14:25:22 +00:00
David Webster
3875544933 Suppress "Assignement in logical expression" type warnings for compilers that compain about this sort of thing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 14:13:41 +00:00
David Webster
51523f25d7 Support for proper sizeing for scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 13:52:11 +00:00
David Webster
716ed2259a no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 13:51:20 +00:00
Julian Smart
fa3541bd15 Changed generic wxScrolledWindow -> wxGenericScrolledWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-30 12:35:54 +00:00
Václav Slavík
6957a370ff minor comments tweaking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 22:24:54 +00:00
Václav Slavík
468ae730db changed wxAddBasePath to wxHtmlCotentsItem's method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 22:14:02 +00:00
Robert Roebling
aafe448833 Native wxScrolledWindow finishing touches.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 18:35:13 +00:00
Václav Slavík
5e8e25e729 cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 17:58:12 +00:00
Václav Slavík
9749497156 cleanup and reformatting to match indentation style of the rest of wx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 17:57:59 +00:00
Václav Slavík
dad9554b4c indentation fixes; virtual dtor for all platforms, not only MacOS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 17:57:35 +00:00
Václav Slavík
d969af82fc makefile.unx's now default to OpenGL, not Mesa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9929 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 17:57:22 +00:00
Robert Roebling
30954328be wxScrolledWindow is now a native widget under GTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 15:27:57 +00:00
Julian Smart
fa1c6ab937 Updated version numbers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 13:43:22 +00:00
Julian Smart
e74a9319f9 Updated distribution scripts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-29 13:42:03 +00:00
Václav Slavík
c97e7fa8db added xpmdecod.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:39:09 +00:00
Václav Slavík
c3f4609ebb fixed gcc pragmas in fs_*.h,cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:31:03 +00:00
Václav Slavík
0de01330ba added imagxpm.h and xpmdecod
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:30:43 +00:00
Václav Slavík
b86e511a9b documented XPM support and updated status of TIFF handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:30:35 +00:00
Václav Slavík
424f5e2700 added wxXPMDecoder
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:30:24 +00:00
Václav Slavík
9d8bdf2dbc added XPM demo to samples/image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 23:30:11 +00:00
Robert Roebling
7f0275efe2 add #define wxUSE_SPINCTRL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 14:45:57 +00:00
Robert Roebling
079c842cae Implement wxRB_GROUP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 14:45:11 +00:00
Gilles Depeyrot
3e968053fb added common imagxpm files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 13:35:16 +00:00
Gilles Depeyrot
56cff98620 corrections for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 13:32:21 +00:00
Gilles Depeyrot
f040060e2f corrections for modifications made to common mimetype code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-28 13:31:46 +00:00
Václav Slavík
6523de8a56 oops, forgot to check in change that adds WX_ICONV_TAKES_CHAR
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 18:22:47 +00:00
Robin Dunn
00a32dc1fb Made wxSplitterWindow conform to the docs with respect to using a
negative sash position in the Split* methods.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 16:57:11 +00:00
Robert Roebling
29f45f85e9 Maybe compilation works now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 16:30:22 +00:00
Julian Smart
71d04f7ffd Added showing the default URL in DisplayContents and DisplayIndex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 15:04:57 +00:00
George Tasker
b6c8bd6959 There was no icon file in this example, causing compilation with VC to fail. I just stole a DialogEditor icon to use here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 03:41:47 +00:00
George Tasker
c03b48d7f8 Fixes problem where child window does not appear immediately (until second child is added) in the WINDOWS menu.
OGL Studio sample did not even show the child frame when a new one was created [bug reported by Julian].
This patch supplied by Markus Greither


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 03:36:13 +00:00
Vadim Zeitlin
88c49a0f21 compilation fix (sorry)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 00:34:18 +00:00
Robin Dunn
df05452ec0 generated source updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 00:16:34 +00:00
Robin Dunn
7905ec5558 Now that XPMs can be written in wxGTK, updated my conversion tools to
actually do it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 00:16:02 +00:00
Vadim Zeitlin
b0a2157c88 translate MDI menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-27 00:10:05 +00:00
Václav Slavík
28c6addc20 fixed SIZEOF_WCHAR_T detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 22:46:50 +00:00
Václav Slavík
891000d61b removed duplicities in HTML entities tables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 22:37:27 +00:00
Kendall Bennett
53a240f02b Updates to OS/2 makefiles.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 22:30:07 +00:00
Julian Smart
e143729845 Fixed Simple Toolbar bug; removed 2 pixel kludge in splash screen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 20:34:19 +00:00
Robert Roebling
67a6726a2c Added Greg's wxBitmapButton patch, take 2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 18:58:09 +00:00
Vadim Zeitlin
6d56eb5c56 applied patch 417699 (remove WXDLLEXPORT from inline functions)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 16:38:11 +00:00
Vadim Zeitlin
7d88e2447e applied patch 419155 (OLE x-compilation with mingw)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 16:17:14 +00:00
Vadim Zeitlin
1216f52d92 fixed wxUSE_MAC not being defined under Unix => -D_REENTRANT was missing resulting in Solaris compilation failure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 14:13:01 +00:00
George Tasker
a701b7f87e $(EXTRAINC) moved to the beginning of INC= line so that if a user wants to override the location of include directories with their own, it is possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 10:39:01 +00:00
Julian Smart
963a1fcd6e Minor mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 10:17:58 +00:00
Stefan Csomor
94fdced0a0 adjusted for vaseks addition of USE_IMAGE and USE_XMP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 10:17:12 +00:00
Robin Dunn
c2229593ba test for replacing menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 06:34:58 +00:00
George Tasker
a0b1b91fe6 Fixed BCC compilation warning if wxUSE_HELP was 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 01:12:48 +00:00
George Tasker
9ef2e675a5 Changed ::Fit() to only fit the sizer if the window is the top level window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-26 01:08:19 +00:00
Václav Slavík
b93d0d082d added fool-proof test for sizeof(wchar_t) that works on SGI/Irix. This a workaround for autoconf's limitation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-25 18:36:05 +00:00
George Tasker
65ba4113c6 Fixes ::Fit() and ::SetSizeHints() to keep the dialog sized so that it will not grow outside the display area of the screen. NEcessary to fix the problems seen in wxAnyChoiceDialog() derived classes where the dialog grows too big to see the top or bottom of the dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-25 16:08:22 +00:00
Julian Smart
3b59b26706 Added MS Word template file to be applied to manual before generation of PDF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-25 15:45:24 +00:00
Julian Smart
a98f98ac6f Some doc corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-25 15:38:00 +00:00
Julian Smart
6a611b39fe Added .emacs tip to coding standards; fixed doc bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-25 11:06:38 +00:00
Václav Slavík
95c8801cdf added check for iconv() version; fixed strconv.cpp to compile with both prototypes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 22:16:24 +00:00
Václav Slavík
1309ba6c7e implemented (more) correct <pre> handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 22:05:19 +00:00
Julian Smart
3da2715fb8 Corrected include/wx/palette.h; added wxGenericTreeCtrl::SetFont
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 16:38:02 +00:00
Vadim Zeitlin
2c1c448a24 regenerated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 13:37:49 +00:00
Vadim Zeitlin
1cf8c0a9d4 openbsd support added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 13:35:47 +00:00
Vadim Zeitlin
a06c1b9b72 Unix compilation fixes for new MIME code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-24 00:07:04 +00:00
Vadim Zeitlin
2b813b73cd applied MIME patch(es) from Chris Elliott
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 23:46:21 +00:00
Vadim Zeitlin
4ea45e6ba3 fir for Sun CC 6.0 compilation of wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 23:34:07 +00:00
Vadim Zeitlin
e545ddb6e5 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 23:33:34 +00:00
Vadim Zeitlin
6d51f22029 some ifdef's - now it might compile without wxUSE_IMAGE although not tested
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 23:31:42 +00:00
David Webster
08399e45e7 add wxUSE_IMAGE to setup.h and GetHFONT to wxFont.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 18:33:05 +00:00
David Webster
5fd2b2c6ae new y position transforms in dc. Def updates and add imagexpm.cpp to make.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 18:32:05 +00:00
David Webster
cffbfebc68 Moving y pos transofrmation code to wxOS2::wxDC elimiantes need for some #ifdef __WXPM__ code here.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 18:31:23 +00:00
Julian Smart
0bbfe845ed Added support for more special characters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 14:55:37 +00:00
Julian Smart
eba0e3477b Added imagxpm.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-23 14:45:04 +00:00
Stefan Neis
cb21bd1b10 Added include file for non-precompiled headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 23:10:14 +00:00
Václav Slavík
31929f8009 added wxXPMHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:34:37 +00:00
Václav Slavík
c96ea65713 added wxUSE_IMAGE; added write-only wxXPMHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:31:53 +00:00
Václav Slavík
a8d4e3ac60 added test for XPM writing; ConvertToBitmap, ConvertToImage changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:25:18 +00:00
Václav Slavík
45ef9db336 moved gtk/palette.cpp to generic/paletteg.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:25:09 +00:00
Václav Slavík
ce113d5ffe moved gtk/palette.h to generic/paletteg.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:24:37 +00:00
Václav Slavík
0046ff7c4f added wxUSE_IMAGE, wxUSE_XPM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:23:05 +00:00
Václav Slavík
3ff75b5a4f added wxXPMHandler and paletteg.cpp/h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:21:59 +00:00
Václav Slavík
775c6f0cd2 added wxUSE_IMAGE; added write-only wxXPMHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 22:21:21 +00:00
Stefan Neis
a92d972108 Added define missing in EMX headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 20:40:59 +00:00
Stefan Neis
b9c15d1092 Added missing include for non-precompiled headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 20:38:36 +00:00
Stefan Neis
efe7d6ff7e Adapted SetData function to common API (taking a reference
instead of a pointer)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 20:36:00 +00:00
Stefan Neis
3417f6618c Added missing includes for non-precompiled headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 20:32:01 +00:00
Vadim Zeitlin
7529690de8 don't include unnecessary headers in the distribution
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 16:12:34 +00:00
Robert Roebling
5cd09f0b8d Toplevel windows now send both activate and focus
events under wxGTK - and probably under wxMSW
    as well?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 14:46:18 +00:00
Robert Roebling
f1339c5685 My iconv (GLIBC 2.2) uses char** as the second
parameter. altough it is the in-buffer for the
    character conversion. I added some very ugly
    conversion to strconv to make it compile. While
    being at it, I also reformated the whole file,
    it looks less like Assembler or Perl now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 14:06:55 +00:00
Vadim Zeitlin
3f2bcf3437 detabified
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 12:24:51 +00:00
Vadim Zeitlin
1f3943e027 fixing mngw32 (cross)compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 11:53:11 +00:00
Robert Roebling
942bef71b0 Applied BMP patch.
Applied deferred wxBitmapButton patch.
  Added error checking to wxFileStream and wxFFileStream.
  Corrected activate event things.

  All these patches work in the stable branch, the
   dev-branch does not currently compile.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-22 10:20:56 +00:00
Václav Slavík
b06a6b20d5 synced wxImage,wxBitmap docs with my changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 23:18:05 +00:00
George Tasker
1600865926 Fixed a possible double deletion of 'file'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 18:02:57 +00:00
George Tasker
97af118998 Removed a duplicate "ADD_STYLE(wxLC_REPORT);" line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 18:02:07 +00:00
Václav Slavík
17f7bb9ed5 added check for wxUSE_WCHAR_T
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 17:25:29 +00:00
Vadim Zeitlin
8bf30fe9b0 merged wxFont related fix (operator==) and optimization (cache default GUI font)
from 2.2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 16:03:10 +00:00
George Tasker
f4929e864e Spelling typo fixed in a comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 15:48:36 +00:00
George Tasker
3897b707bd Minor code tweeks to stop BCC compiler warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 15:48:12 +00:00
George Tasker
461697c2ae Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header to solve BCC compilation issues
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 15:43:33 +00:00
Václav Slavík
ecdce304e4 applied BCC fixes for wxXML
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 14:53:54 +00:00
Vadim Zeitlin
9c21efe301 oops... conflict removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 01:49:11 +00:00
Vadim Zeitlin
807a903e68 merged optimizations from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-21 01:46:19 +00:00
Stefan Neis
0fa7981012 Commited updated list of files to compile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 21:18:27 +00:00
Stefan Neis
8269a90377 Added wxGetEnv and wxPutEnv.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 21:17:54 +00:00
Stefan Neis
f74d0b57aa Hopefully fixed bug #233492 (SelectAll crashed on empty grids).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 20:48:51 +00:00
David Webster
f15b49521a new Def file supporting const changes in wxObject. Bug fixes in STATTEXT and WINDOW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 16:10:04 +00:00
David Webster
8cfc5426cf Fixed the deleteion of VisualAge stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 15:15:04 +00:00
David Webster
61cca9d24e Got rid of some wierd VisualAge debug nonsense that had appeared in this after the last update????
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 13:26:05 +00:00
David Webster
abe5726aff Const casting fix for Vis C.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 13:00:39 +00:00
George Tasker
35cd9dba7b Changed code to get rid of a compiler warning about statement always being FALSE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 11:21:40 +00:00
George Tasker
5f6d6405bb Minor grammatical/formatting changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 11:18:04 +00:00
Robin Dunn
e9c4505ef4 Fixed the order of parameters to actually match the code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 04:30:28 +00:00
Robin Dunn
254b84f3fd Commented out hack for VC++ 5.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:39:53 +00:00
Robin Dunn
c6b4bf32aa Changes for building with Python 2.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:39:19 +00:00
Robin Dunn
84d31cc23f Tests to show problem with wxExecute when using redirection on a GUI app.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:38:16 +00:00
Robin Dunn
8ab7390901 reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:37:23 +00:00
Robin Dunn
6b48f1bdc5 UN-tabbed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:36:41 +00:00
Robin Dunn
0a651eb856 A few changes to match header changes and let wxPython compile again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:36:03 +00:00
Robin Dunn
1cfd32fa13 Added a demo to show off all the colours that can be added to
wxTheColourDatabase by the wxPython.lib.colourdb module.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-20 00:25:34 +00:00
Robin Dunn
c8ace611be Added a demo to show off all the colours that can be added to
wxTheColourDatabase by the wxPython.lib.colourdb module.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 23:32:05 +00:00
Vadim Zeitlin
6057972be4 some const correctness for wxClassInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 23:13:07 +00:00
Vadim Zeitlin
aac65598a1 some const correctness for wxClassInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 23:00:46 +00:00
David Webster
45bfc84b20 Positioning fixes to compsate for wxWindow's use of the MS backwards standard.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 22:30:15 +00:00
Gilles Depeyrot
475031bb37 added comment to explain __WXMAC_X__ define
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 20:29:20 +00:00
Gilles Depeyrot
007ae8d09d Corrections for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 19:16:56 +00:00
Gilles Depeyrot
f4b6ffa972 correction for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 19:11:09 +00:00
Robin Dunn
83f96286bb Added wxCURSOR_ARROWWAIT which is the default arrow+hourglass cursor
on MSW, or the same as wxCURSOR_WAIT on wxGTK.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 19:08:24 +00:00
Gilles Depeyrot
656fc51cda corrections for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 19:06:42 +00:00
Julian Smart
7df9fbc3f1 Fix/hack 1.
========

At present, if you wish to load a .hhc file instead of add books manually, you can only have one book - UNLESS you omit the outer <ul> </ul>. Then the contents will appear to have more than book, although in fact it's just one book that's displayed on level zero and therefore get the Book icons.

However, you'll also get a dummy 'book' with the name of the project but no children. So my hack detects whether the .hhc file is trying to add books at level zero, and if so, throws away the first 'book', so that only the hhc-specified books get shown.

So the end result is that our hhc file can specify multiple sections that don't all hang off one dummy book node which itself hangs off the root node -- which is a UI pain!

Fix 2.
====

I changed  the test

        if (!m_Page.IsEmpty())

to

        if (tag.GetParam("TYPE") == "text/sitemap")

at around L.120 of helpdata.cpp as suggested in the comment, so we don't have to specify a URL for the node to be valid. Sometimes you don't want a URL in a contents item. I've added some tests to stop it complaining if you click on a URL-less item.

Feature enhancement/Hack 3.
======================

I've added wxHtmlHelpController::SetBookBasePath so that the .hhp/.hhc files don't have to be in the same hierarchy as the HTML files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 16:17:15 +00:00
Vadim Zeitlin
655076c7b0 fix to allow negative coords for wxFrame creation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 11:14:48 +00:00
Vadim Zeitlin
a9f21e71d6 fix for scrollbar rounding errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-19 11:13:14 +00:00
David Webster
c9cb56f7f2 wxControl and wxDialog coded and supporting module def file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-18 20:47:32 +00:00
David Webster
6c34d0ede9 Fix to excule OnPaint from WXPM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-18 20:46:54 +00:00
David Webster
d608dde1d7 wxControl and wxDialog coded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-18 20:46:23 +00:00
Gilles Depeyrot
76ee796101 removed unused files so that makefile VPATH works under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-18 19:23:09 +00:00
Julian Smart
a69cb1cc9d No longer paint the selection background under the image
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-18 17:13:31 +00:00
Vadim Zeitlin
9f96b16267 wxString::FormatV() fix (bug 416853)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-17 22:34:02 +00:00
George Tasker
389b961e23 Fixed a compiler performance warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-17 11:05:24 +00:00
Vadim Zeitlin
b9ca40a921 another attempt to fix wxMotif build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-17 09:47:41 +00:00
Stefan Neis
faec5a4383 Added patch #412132 (Fix for bug #215410) (Mainly in CalcDimensions()),
changing GRID_SCROLL_LINE to 1.
Fixed Bug #413014 (Missing refresh after calling DeleteCols) by fixing
        Redimension.
Fixed Bug #232657 (Mouse not captured during wxGrid column resize) by
        fixing ChangeCursorMode.
Fixed some minor problems with screen updates (CalcDimensions should only be
        called while not BatchMode, Autosizing Rows/Cols should happen within
        BatchMode, Sizing a row/column should update also labels)
        - touched various functions.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 22:58:26 +00:00
David Webster
6d167e3938 StatText coded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 22:26:36 +00:00
David Webster
d143f2ad06 Remove OnCtlColour from wxStatText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 22:25:50 +00:00
David Webster
1f3154c809 Static Box coded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 22:24:55 +00:00
David Webster
ca8f0290a4 textctrl is now coded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 15:20:36 +00:00
David Webster
c4955899eb OnActivate change for wxFrame to better deal with prior window focus and textctrl is no coded.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 14:22:41 +00:00
George Tasker
4a45223c97 Blob support fixes - still does not work, but getting there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 14:03:09 +00:00
Ron Lee
6426998c39 simplified (hopefully:) and explained the shared lib versioning system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9759 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-16 00:19:18 +00:00
George Tasker
beb0d04d04 Change demo to not try to drop the table when it thinks it is creating it for the first time - per Paul Gammans
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-15 13:08:39 +00:00
George Tasker
21e052699d A couple more 'int' to UWORD conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-15 13:06:01 +00:00
George Tasker
87cc34563c A couple more 'int' to UWORD conversions
Fixed ::CreateTable() syntax problem with Sybase reported by Paul Gammans


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-15 13:05:34 +00:00
Vadim Zeitlin
7018409531 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 23:29:06 +00:00
Vadim Zeitlin
4485629732 fixed DoDrawEllipse() bbox calculation (patch 415116)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 22:07:42 +00:00
Vadim Zeitlin
e9456d8d5b merged focus handling fix from 2.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 21:46:54 +00:00
Gilles Depeyrot
ed50e39ba2 added spinctrl and corrected list of files for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 20:21:30 +00:00
Gilles Depeyrot
fd88dcbccd added missing interface pragma
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 20:09:19 +00:00
Vadim Zeitlin
f35398824b applied wxPerl doc patches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 19:46:05 +00:00
Gilles Depeyrot
ea5999b96f corrected dynamic library creation for Mac OS X
added compilation option to solve common object link error for Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 19:39:51 +00:00
Václav Slavík
11ad1132ca applied patch #415855
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-14 18:03:41 +00:00
Vadim Zeitlin
6f18aba58b linking fix for wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 14:56:22 +00:00
Vadim Zeitlin
55bd3f34b6 use screen resolution, not hard coded one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 14:43:23 +00:00
Vadim Zeitlin
551fe3a6f0 reckognize cp125x charsets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 14:28:04 +00:00
George Tasker
62f1dc8207 Updated to alert the user to the need for them to edit this file to set the location of the libxml install so that XML will compile. Also tells them where to download libxml if they need to know that
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 11:40:58 +00:00
George Tasker
fafa563280 Fixed a BCC compilation ambiguity for wxString [int] vs [unsigned int]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 11:40:21 +00:00
Gilles Depeyrot
4b6ed6bc17 corrections for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 10:49:20 +00:00
Gilles Depeyrot
214b7e74f0 correction for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 09:59:47 +00:00
Gilles Depeyrot
a5bc50ee00 added spinctrl implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-13 09:52:29 +00:00
David Webster
3bd418ca9f Filling out common controls now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-12 22:45:21 +00:00
Stefan Csomor
07b2eb27ec corrected cw6 project files and other small problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-12 08:40:59 +00:00
Stefan Csomor
31d309952c corrected cw6 project files and other small problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-12 08:34:32 +00:00
Stefan Csomor
7aaf328ffa corrected cw6 project files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-12 08:31:25 +00:00
Robin Dunn
03a2c06221 Updated infoframe from Chris Fama
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9729 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-12 02:53:14 +00:00
Václav Slavík
ee7841ab13 wxBitmap compilation fix for BCC enforced typecast in resource.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 22:21:15 +00:00
David Webster
e1a688e45e DC updates and an associated .Def file update
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 18:05:27 +00:00
David Webster
ac7fb818cc DC updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 18:04:54 +00:00
Václav Slavík
2aeec9eccc applied fix to fix BCC's wxBitmap ctor problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 18:04:34 +00:00
Václav Slavík
809f39fe42 added remark about wxMENU_TEAROFF being wxGTK only
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 18:00:49 +00:00
George Tasker
9fd258db58 Updated to alert the user to the need for them to edit this file to set the location of the libxml install so that XML will compile. Also tells them where to download libxml if they need to know that
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 16:17:05 +00:00
Vadim Zeitlin
7a65650641 warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 15:03:27 +00:00
George Tasker
0715c838e9 Updated to reflect changes in the wxDb/wxDbTable classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 15:02:50 +00:00
George Tasker
e938ff5e20 A couple more 'int' to UWORD conversions I had not merged into my previous checkin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 14:37:48 +00:00
George Tasker
3fe813a9ad Experimental BLOB code added - set wxODBC_BLOB_EXPERIMENT to 1 in dbtest.h if you want to help work on this
Added some more test functions that have no GUI hook yet, but will be used in wxBase buidls eventually
Fixed handling of checks for TableExists() and TablePrivileges() to use the (HOPEFULLY) now working functions.
Better exception handling when the .CFG file does not exist
Better reporting of database errors shown by example


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 14:20:56 +00:00
George Tasker
02cf6fdd85 Fixed TablePrivileges() function (I HOPE!) so it will work with all supported databases
All variables/parameters having to do with number of columns changed to be of type UWORD rather than int, avoiding compiler warnings and giant tables causing problems, and matching the types with the ODBC APIs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 14:11:02 +00:00
George Tasker
6b3f4fb875 All variables/parameters having to do with number of columns changed to be of type UWORD rather than int, avoiding compiler warnings and giant tables causing problems, and matching the types with the ODBC APIs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 14:10:21 +00:00
Julian Smart
6da8e679fc More fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 12:07:12 +00:00
Gilles Depeyrot
62a879dfa0 added destructor (correction for Mac OS X)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 06:32:17 +00:00
Gilles Depeyrot
1bc4d9b013 ifdef pi which is already defined by Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-11 06:18:08 +00:00
David Webster
676304331f New Module definition file for all the new image/bitmap/dc changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 21:44:33 +00:00
Julian Smart
aa2d25a57a Fixed some wxDragImage bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 21:01:40 +00:00
Robin Dunn
1af9e5c56d Updated the changelog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 20:52:40 +00:00
Robin Dunn
743e91ff02 wxPython can now be built using the distutils that comes with Python
2.1


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 20:52:04 +00:00
Vadim Zeitlin
ce20b5d721 more fixes for mingw32 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 20:38:44 +00:00
Julian Smart
0c96db12c4 Corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 15:04:41 +00:00
Vadim Zeitlin
abb74e9763 check that file was closed successfully in wxCopyFile (bug 414987 )
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 14:31:44 +00:00
Julian Smart
ff43029e01 Removed misleading text from wxDragImage doc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 13:46:39 +00:00
Julian Smart
6ea5c52d29 Implemented Chuck Messenger's naming and simplification improvements,
plus Move coordinate correction


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 13:44:03 +00:00
Julian Smart
db400410d8 Removed spurious wxCHECK which forgot about the possibility of ~wxScreenDC...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 13:42:18 +00:00
Julian Smart
c447ce1745 Ok() should be called on image, not bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 12:44:48 +00:00
George Tasker
1454d4e659 Added a param to ::Open() to allow the programmer to specify whether opening the table should check if table exists
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-10 10:43:51 +00:00
Robin Dunn
04a429cb8a Added a mask to some of the images
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 21:25:54 +00:00
Robin Dunn
bddab5e98b Will raise the SystemExit exception now on wxGTK since wxGTK can not
save XPM files. <grumble>


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 21:15:44 +00:00
Robin Dunn
fbcadfca9c Images can now be embedded in Python source files.
Added tools to do the embedding.
Added Constructors/methods where needed.
Updated the demo to use mostly embedded images.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 21:14:03 +00:00
Robin Dunn
96bfd05319 Images can now be embedded in Python source files.
Added tools to do the embedding.
Added Constructors/methods where needed.
Updated the demo to use mostly embedded images.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 19:36:36 +00:00
Gilles Depeyrot
28af3deb9f removed case conflicting file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 18:53:17 +00:00
Robert Roebling
ce16e5d78f Added wxFileName::GetModificationTime()
for Unix.
  Don't send events when constructing a text ctrl.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 17:16:09 +00:00
Vadim Zeitlin
068cfb66c2 mingw32 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 15:37:24 +00:00
Vadim Zeitlin
d9b9876f6e fixed recursive mutexs compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 13:25:04 +00:00
Vadim Zeitlin
b5badcb5c5 fixed obsolete comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 01:27:32 +00:00
Vadim Zeitlin
7ba4fbebbc 1. fixes to wxDC deleting logic (should fix ~wxPrinterDC leak), some code
reorganized/removed
2. applied (slightly modified) wxEnhMetaFileSimpleDataObject patch


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 01:22:48 +00:00
Vadim Zeitlin
4658c44ec2 applied patch 410892 (wxCopyFile uses ::CopyFile under Win32, has overwrite parameter)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-09 00:10:21 +00:00
Vadim Zeitlin
d8c72298ec applied patch 411059 (mingw win32 api version check)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-08 23:53:12 +00:00
Vadim Zeitlin
7a56de34ab made mutexes recursive under Unix as well as under Win32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-08 22:49:09 +00:00
Vadim Zeitlin
e5aea7214d restored previously removed inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-08 22:32:17 +00:00
Ron Lee
3abb92cea8 Ported forward changes to 2.2 packaging.
Don't build/run tex2rtf for -arch builds.  It segfaults on Alpha.
Added extra (required) -dev package deps.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 16:14:05 +00:00
Gilles Depeyrot
c2cf7c0184 corrected prototypes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 14:57:36 +00:00
Gilles Depeyrot
569a2ae9ef preliminary file list for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 14:44:09 +00:00
Gilles Depeyrot
d5408e98bc correction for Mac OS X (wxEntry has a specific prototype for Mac?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 14:42:25 +00:00
Gilles Depeyrot
f3c067d2dc corrections for Mac OS X (dynamic link command, thread library, extra libraries, and name of built shared library)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 14:41:16 +00:00
Vadim Zeitlin
54081dc5c2 fixes bug 414369
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-07 00:29:08 +00:00
Václav Slavík
f515c25a2c wxImage::ConvertToMono wasn't const - fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-06 22:15:34 +00:00
Vadim Zeitlin
58d5dfc168 no changes, just resolved conflicts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-06 17:22:04 +00:00
Julian Smart
29e2c38bc5 Changed wxYield to wxYieldIfNeeded in PopupMenu, to avoid recursive wxYield assertions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-06 12:02:56 +00:00
David Webster
34f069a027 New .def file for all the image/bitmap changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-05 21:17:13 +00:00
Václav Slavík
097aeb9903 fixed typos in wxBitmap::ConvertToImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-05 16:35:18 +00:00
Julian Smart
c103ca4b4d Applied Don Spear's patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-05 15:18:42 +00:00
George Tasker
921a43c1f6 Fixes problem where maximized child windows still have a double border drawn around them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-05 12:15:14 +00:00
Václav Slavík
fec19ea9ff I moved platform specific code from wxImage to wxBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:25:06 +00:00
Václav Slavík
fd85921189 I moved platform specific code from wxImage to wxBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:15:36 +00:00
Václav Slavík
b5f01ae00e implemented wxMask::Create(bitmap, paletteEntry) for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 23:14:34 +00:00
Vadim Zeitlin
778d618acb memory leak in wxZlibOutputStream fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-04 02:57:05 +00:00
David Webster
8e8d8eeff5 InvertMask fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-03 22:44:09 +00:00
Vadim Zeitlin
33e2941913 second part of Markus' BC++ fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-03 16:07:57 +00:00
Václav Slavík
9724f75af5 enabled palette code for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 23:02:02 +00:00
Gilles Depeyrot
4c27c3c631 backed out improper casts and corrected prototypes for Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 20:22:05 +00:00
Vadim Zeitlin
47cf53ef2e merged wxLogDebug -> wxLogTrace change from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 19:32:26 +00:00
Julian Smart
9d9e5e5a3d Corrected some typos and quaint English
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 14:02:46 +00:00
David Webster
d236a959df char* cast on wxString libname blows up VC and VA. added .x_str(). Should have been wxChar* cast???
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 13:44:45 +00:00
Vadim Zeitlin
6359fa0e03 argh! patch misapplied the patch in another place as well, fixing this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 12:29:24 +00:00
Vadim Zeitlin
0326c494a9 oops... wrong patch, second try
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 12:25:51 +00:00
Vadim Zeitlin
42191a1dbf fix for clicking on the button from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 12:23:54 +00:00
David Webster
f07bb01b18 Filling out wxDC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 11:53:17 +00:00
Robin Dunn
a7fa65b96e Fixed Tim's patch so it will compile when using a Python version < 2.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 07:33:47 +00:00
Robin Dunn
e189b07018 A little tweak so the button sizes right
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 07:26:54 +00:00
Robin Dunn
1c09ae547a Added patch to wxPoint_LIST_helper from Tim Hochberg that should make
it gobs faster in certain situations.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 07:26:21 +00:00
Robin Dunn
e0672e2fc3 Added patch to wxPoint_LIST_helper from Tim Hochberg that should make
it gobs faster in certain situations.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 07:07:22 +00:00
Gilles Depeyrot
1da1216c9f corrected file name change of mimetype.cpp to mimetmac.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 06:26:36 +00:00
Robin Dunn
49875c533b Added colourselect.py, imagebrowser.py and an updated calendar.py to
wxPython/lib from Lorne White.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 05:57:32 +00:00
Robin Dunn
471825d745 updates of generated sources for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 05:44:22 +00:00
Robin Dunn
4662be5945 updates of generated sources for wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 05:34:17 +00:00
Robin Dunn
f3d9dc1d87 Other odds and ends...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 03:49:52 +00:00
Robin Dunn
1112b0c68c wxPython now creates it's own Python thread state instead of using the
one that was active when it starts up.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 03:43:04 +00:00
Robin Dunn
6bb38ab67e Added wxPython/lib/infoframe.py from Chris Fama. It contains a class
that can be used in place of wxPyOnDemandOutputWindow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 03:41:54 +00:00
Robin Dunn
22d0828959 Applied patch for building with Borland C++ (untested by me)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 03:37:08 +00:00
Robin Dunn
d74525f764 added better typemaps for wxPen*, wxBrush* and wxFont*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 03:01:13 +00:00
Robin Dunn
ad48a30eec Fix for wxHtmlPrintout getting decrefed in Python at the wrong time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9628 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-02 02:31:12 +00:00
Vadim Zeitlin
873fb06d2a typo fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-01 21:59:06 +00:00
Gilles Depeyrot
5fde6fcc9b corrections for final release of Mac OS X
applied patches proposed by Mark Newsam


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-04-01 20:42:05 +00:00
George Tasker
67bd5bad04 SendSizeEvent() method moved from wxWindow to wxFrame, as that is the only place that the code in this function applies to.
Fixed problems with MDI children being changed from min/max/restored in SetSizeEvent()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 18:46:15 +00:00
George Tasker
3cfcd50b7d SendSizeEvent() method moved from wxWindow to wxFrame, as that is the only place that the code in this function applies to.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 18:43:54 +00:00
Gilles Depeyrot
94c3c45e73 added CarbonAccessors object file for non Carbon builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 14:03:06 +00:00
Gilles Depeyrot
4c21b76f8f added CodeWarrior project for example working under Mac OS 9
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 13:56:37 +00:00
Gilles Depeyrot
c9101ef2f5 ignore CodeWarrior build directory and output files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 13:47:57 +00:00
Gilles Depeyrot
4c36ca57a1 added conditional compilation for toggle buttons (wxUSE_TOGGLEBTN)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 13:46:37 +00:00
Gilles Depeyrot
496e58550c added CarbonAccessors to non Carbon builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 13:44:33 +00:00
Gilles Depeyrot
ae54aa40bc added instructions concerning ACCESSOR_CALLS_ARE_FUNCTIONS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-31 13:43:23 +00:00
George Tasker
1ec5903769 If wxUSE_GUI was not defined, then apps using this file for their settings would not build the .RES file and link it in.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-30 13:17:47 +00:00
Vadim Zeitlin
9aaf9bed0e this should hopefully fix BC++ crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-30 00:52:21 +00:00
David Webster
23e356deb0 Blit code for masks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 23:04:38 +00:00
David Webster
b02121c3a1 Blit code for masks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 22:56:40 +00:00
Ove Kaaven
86435b1a7d Unicode compilation fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 14:09:17 +00:00
Ove Kaaven
c3396917e8 Some Unicode compilation fixes. This Unicode stuff in file functions is
always so hard to get right, it seems... I don't like that wxStat isn't
a Unicode wrapper for the real Linux libc stat(), so the caller needs to
convert it for wxStat, but not for e.g. wxRename... this is inconsistent,
so it's not surprising people don't get it right, I guess.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 14:06:43 +00:00
Ove Kaaven
d43088ee78 wchar_t byte-swapping is not necessary if __STDC_ISO_10646__ is defined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 13:19:50 +00:00
Ove Kaaven
f967115097 Unicode compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 13:08:18 +00:00
Julian Smart
46f5ad7d2c Added Inno Setup distrib files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-29 11:58:24 +00:00
Gilles Depeyrot
2c6025bce6 added __POWERPC__ define to compilation flags for Mac OS X
do not add _REENTRANT define to compilation flags for Mac OS X
disable drag and drop for Mac OS X (not yet supported)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-28 20:37:52 +00:00
David Webster
f3412ea748 Some new interfaces in common code requires an updated module definition file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-28 20:31:33 +00:00
Robin Dunn
d25f5fbb88 Finished the changes necessary to use the new event system.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-28 18:16:58 +00:00
Robin Dunn
5527476f67 Added DECLARE_LOCAL_EVENT_TYPE which doesn't use WXDLLEXPORT. This is
to prevent inconsistent linkage warnings for event types that are not
in the wx DLL, but when you are using the wx DLL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-28 18:13:26 +00:00
Robin Dunn
c9f00eebab fixed typo in a couple method names for wxPython, also some changes in
the wxPython chapter that have been sitting on my disk for some
time...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-28 17:03:23 +00:00
Robin Dunn
cf273c6718 Added code to optionally put the wxSTC on a panel instead of directly
in the notebook.  This eliminates most (all?) of the flicker and
slowdown for wxSTC when in notebooks on wxGTK.  My guess is that
wxNotebook is broken, but this is an acceptable workaround.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-27 18:56:28 +00:00
Robin Dunn
3c2ec1b8ff Remapped zoom/unzoom to Ctrl keys
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-27 17:29:56 +00:00
Robin Dunn
a7642be106 Put back some code that was commented out for testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-27 17:29:04 +00:00
Robin Dunn
f2e1c18a79 fixed bug in IMP_PYCALLBACK__BOOL2DBL2INT, for #223404 in the tracker
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 22:38:29 +00:00
Robin Dunn
8a721b35f6 fixed compile warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 22:18:00 +00:00
Robin Dunn
6e18ca6cf4 Added wxWakeUpMainThread, wxMutexGuiEnter, wxMutexGuiLeave,
wxMutexGuiLocker and wxThread_IsMain to assist with dealing with GUI
access from non-GUI threads.

wxPyOnDemandOutputWindow is now thread safe if non-GUI threads use
print, sys.stdout.write, etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 22:17:24 +00:00
Robin Dunn
c1e820a40e a fix for the last fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 22:15:33 +00:00
Robin Dunn
19cf4f8086 Removed initial startup dependency on the OpenGL DLLs so only the
glcanvasc.pyd depends on them, not wxNN_N.dll


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 21:31:04 +00:00
Robin Dunn
b075a3bbfd some little doc tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 21:19:58 +00:00
Robin Dunn
c3357374af Fix for Bug #229543
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 21:04:48 +00:00
Julian Smart
77fe02a8e9 Bug fix to Mkdirs and GetLongPath
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 15:51:02 +00:00
Julian Smart
fc71ef6e17 Added focus in/out handlers for wxTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 14:49:27 +00:00
Julian Smart
f0ce340942 Added 'full' param to wxFileName::Mkdir to make all directories in a path,
not just the last one


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 13:31:12 +00:00
Julian Smart
5d978d07a4 Corrections to the GetLongPath code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 12:55:06 +00:00
Julian Smart
05e7001c1a Attempt at improving GetLongPath
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-26 12:16:54 +00:00
Václav Slavík
08b50c2c6c wxZipFSHandler does not report non-local zip archives as openable anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-25 22:20:34 +00:00
Václav Slavík
cb332bc6b7 implemented dummy wxPalette for wxGTK, so that it no longer pops up assertion failures and wxImage and image handlers work correctly now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-25 22:20:19 +00:00
Václav Slavík
4178000933 made wxLocale::GetSystemLanguage and wxLocale::AddLanguage static;
wxLocale now converts strings according to LC_CTYPE if it contains charset information (and uses old code otherwise)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-25 22:19:44 +00:00
Václav Slavík
323af1967c modified wxLANGUAGE generating script to visibly mark automatically generated code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-25 22:19:13 +00:00
David Webster
1159a76f9c Ownerdrawn updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-23 23:30:11 +00:00
Vadim Zeitlin
45805ba322 fixed memory leak in wxZlibInputStream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-23 17:51:22 +00:00
David Webster
5afb945835 Ownerdrawn stuff. Text display done, image display next.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-22 23:23:19 +00:00
Julian Smart
9c0b55475a Fix for tip disappearing immediately under MSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-22 11:17:25 +00:00
David Webster
7172b423aa More ownerdrawn stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-22 04:41:37 +00:00
Vadim Zeitlin
d8408fc65f merged Ctrl-Space fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 23:55:35 +00:00
David Webster
23122f8c57 OwnerDrawn updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 22:30:48 +00:00
Julian Smart
75ef572207 Changed GetLong/ShortPath to allocate memory dynamically
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 22:25:32 +00:00
Vadim Zeitlin
6e6d9f9e7b patch for cleanall target in mingw makefiles (which I forgot to commit before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 19:13:09 +00:00
Vadim Zeitlin
51d673384e forgot to commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 19:11:14 +00:00
Vadim Zeitlin
ec37df5776 minor fixes to wxLocale::GetSystemLanguage(), test code for it added to the console sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 19:07:23 +00:00
George Tasker
cf1eeea343 Checked back in the change from rev 1.57 that allows UNC dirs and root dirs to be properly evaluated as to their existence under __WIN32__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 18:32:35 +00:00
Vadim Zeitlin
58ef67abc3 merged __sgi compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 14:22:19 +00:00
Vadim Zeitlin
2f3dcbbf20 fixed (?) problems with assignment operator in wxTreeItemId
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 14:04:19 +00:00
Julian Smart
9e9b65c1db Added long-filename functions & normalisation; patch to Watcom makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-21 12:34:56 +00:00
David Webster
2c4a8d17cd Ownerdrawn testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 22:45:09 +00:00
Ron Lee
ab0e718dc9 changed -dbg priority to match overrides.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 15:25:47 +00:00
David Webster
4049cc1ccd More Ownerdraw menu updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 14:26:42 +00:00
David Webster
8f70adc9c1 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 13:48:04 +00:00
David Webster
45bedfdd73 Ownerdrawn menu updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 05:46:07 +00:00
Ron Lee
7b67fc42f9 tweaked wx-config alternatives priorities.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-20 01:02:36 +00:00
Vadim Zeitlin
de8c48cf46 wxImage::Ok() now returns false for images with 0 width or height
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-19 18:27:59 +00:00
Julian Smart
fe25efa327 Small doc mod; made wxRAISED_BORDER work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-19 14:40:51 +00:00
Ron Lee
beed59982d removed (deprecated) call to dh_testversion.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-19 10:46:36 +00:00
Václav Slavík
2fa3b70778 wxHTML: fixed bug in tables rendering when rowspan was used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-18 23:34:17 +00:00
Ron Lee
afa3e1edcd Updated /debian with the latest changes from 2.2 branch.
Applied patch from 2.2 to setup.py to allow the setting
of a 'trick' wx-config for in-tree package builds.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-18 23:11:58 +00:00
Václav Slavík
01a5f47468 removed out-of-date info
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-17 23:44:35 +00:00
Vadim Zeitlin
b2dea2ab4d replaced wxLogDebugs with wxLogTrace in dnd code - the former is just too annoying and impossible to switch off
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-16 19:43:42 +00:00
Vadim Zeitlin
f4a7108f73 fixed (?) bug 407974 (arrows not working)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-16 19:37:50 +00:00
Vadim Zeitlin
789034a083 added checks to wxFont accessors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-15 19:30:53 +00:00
Robin Dunn
c9482eba5c wxGTK version of generated code for recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-15 00:52:30 +00:00
Robin Dunn
5e40f9dd0d wxGTK version of generated code for recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-15 00:36:12 +00:00
Robin Dunn
e87269a7a5 enhanced a comment ;-)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-15 00:35:30 +00:00
Robin Dunn
c856d372d1 fixed the automatic sys.stdout/sys.stderr to window redirection in wxApp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-15 00:33:33 +00:00
Jouk Jansen
672dc5a745 Committing in .
Modified Files:
 	wxWindows/src/common/dcbase.cpp

 Addec missing math.h

----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-14 10:37:49 +00:00
Robin Dunn
0569df0fc9 Changed wxFont, wxPen, wxBrush to not implicitly use the wxTheXXXList
behind the scenes, but to use normal ctor and dtors.

Exposed the wxTheXXXLists to wxPython.

Also wxTheColourDatabase and added a library module to load LOTS more
colour names into the colour database.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-14 08:05:03 +00:00
Robin Dunn
83b18bab39 A bunch of little tweaks, fixes, and additions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 23:50:43 +00:00
Václav Slavík
fe2e43661e moved splines rendering code into wxDCBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 23:38:57 +00:00
George Tasker
99b02ec0d8 Fixed the template so that the .DSP file that gets generated will actually compile (it was failing trying to build y_tab.c which does not exist until you do a command line build, and even after creating it, there were duplicate definitions). All tests I ran did not need this file to be compiled, so it is not currently built.
The wxBase(d).lib files are no placed in the wxwindows/lib directory with all the other LIB files.
The BaseDebug and BaseRelease directories (that hold all the OBJ/PCH/etc files) are now created under the src/msw directory so that if the wxBase(d).lib file is built with the IDE, and then an APP (like samples/console) is built with the command line makefiles, then all the PCH and DUMMY.OBJ files are in the expected place
The previous version of this file was trying to use the $(WX) environment variable, which was not supported.  It has been changed to use $(WXWIN) now like all other places in the program.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 22:06:59 +00:00
George Tasker
99a030f5ed Added code to the template to copy setup0.h to setup.h if setup.h does not exist (due to checkout from CVS).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 22:01:45 +00:00
George Tasker
16a7029841 Added the wxBase makefile/VC project template creations using basevc.t and vc6base.t to make src/msw/makebase.vc and wxWindows/wxBase.dsp respectively
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 22:00:45 +00:00
George Tasker
c0b2a21e09 New tmake template for generating makebase.vc for command line builds of wxBase(d).lib using VC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:59:13 +00:00
George Tasker
730cae58da Regenerated from the new vc6base.t tmake template
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:58:25 +00:00
George Tasker
b268b083fc Fixed sample so that if the DATETIME test is enabled, then <math.h> is #included so that wxBase can compile this sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:57:04 +00:00
George Tasker
3e642d8427 VC makefile for building samples/console using wxBase(d).lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:51:26 +00:00
George Tasker
0548ca8d43 Additions to support the building of wxBase(d).lib from the command line with VC.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:50:41 +00:00
George Tasker
16ce3c2f13 makefile for building wxBase using the command line. This file is generated by tmake using the makevc.t template. Builds wxBase(d).lib in the wxwindows/lib directory, and can build seperate DEBUG and RELEASE builds based on FINAL=0/1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:49:38 +00:00
George Tasker
8816486e25 Added the code to copy setup0.h to setup.h if setup.h does not exist (due to checkout from CVS). The tmake template is also being updated now for when we do the next tmake generation of the makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 21:47:58 +00:00
George Tasker
09de16e1ba Memory tracing and ODBC classes are now (optionally) available in wxBase builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 17:22:37 +00:00
George Tasker
0a36d7eb9e Semicolon was missing on the end of the WXINC line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 15:09:40 +00:00
George Tasker
099287b916 Added listdb to the list of object files that must be created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 15:06:11 +00:00
George Tasker
dffd812620 Removed the requirement that wxUSE_GUI must be 1 to get wxUSE_FILESYSTEM, wxUSE_FS_ZIP, etc...without this change, samples/console cannot be compiled.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 14:43:45 +00:00
Vadim Zeitlin
df05cdc578 fixed wxTimeSpan::Format() to behave more reasonably
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-13 13:17:46 +00:00
Vadim Zeitlin
e93bfe3c74 patch initializing the multi choice dialog with the selections array values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-12 21:54:39 +00:00
Julian Smart
e961ff7812 Bug fix for #406153
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-12 17:30:45 +00:00
Gilles Depeyrot
374349be31 removed ugly Mac OS X related hack in wxBASE configuration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-12 07:20:11 +00:00
Václav Slavík
97f18671c6 fixed all's dependencies so that the makefile generates files.lst files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-11 23:32:51 +00:00
Václav Slavík
8ea8e72a29 fixed MacOS X test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-11 23:32:32 +00:00
Václav Slavík
5acb7b3edd IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) replaced by IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9501 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-11 16:43:16 +00:00
Vadim Zeitlin
4477936a19 trying to fix wxSpinCtrl update behaviour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-10 18:01:33 +00:00
Vadim Zeitlin
e4786b9a4b fixed wxDos2UnixFilename description
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-10 17:50:46 +00:00
Vadim Zeitlin
9d8deca0bd merged HAVE_VSNPRINTF fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9494 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-10 17:48:09 +00:00
Robin Dunn
c12bc4de58 Added some simple sample apps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9492 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-10 05:07:25 +00:00
Vadim Zeitlin
56bd6aaca9 fixed wxToolBar::DeleteTool and losing the rows number on sys colour change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-10 00:10:35 +00:00
Václav Slavík
b076dc01d2 fixed parsing of tags with whitespace around = sign
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9489 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-09 23:40:36 +00:00
Vadim Zeitlin
132cb64021 merged in the fix for WM_MOVE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-09 23:20:36 +00:00
Jouk Jansen
2b577448a7 Committing in .
Excluding the sample controls to be build when using wxMotif on VMS. Something
 seems to be broken in wxMotif.

 Modified Files:
 	wxWindows/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-09 11:18:35 +00:00
Vadim Zeitlin
2ca8b884d0 added test for wxFileSystem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-09 01:05:41 +00:00
Vadim Zeitlin
13b6e33523 fixed FindOrCreatePen/Brush() for the case when the object couldn't be created successfully
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-08 18:28:43 +00:00
Vadim Zeitlin
066b00aa14 fixed (?) setup.h regeneration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-08 17:44:05 +00:00
Vadim Zeitlin
0f3f1cbc62 fixed CODE_GEN_FLAGS_CXX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-08 14:52:35 +00:00
Vadim Zeitlin
92c296a63e fixed DeviceToLogical[XY]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-07 19:14:26 +00:00
David Webster
98de692c3a Support for building samples in a port, dbg-rlse, dll-stat specifc output path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-07 18:18:18 +00:00
David Webster
b9930c63e3 SUpport for new location of module definition files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-07 15:45:16 +00:00
David Webster
872ae05561 SUpport for new location of module definition files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-07 15:41:22 +00:00
David Webster
451b2eded7 Moving OS/2 module defeintion files to /src/os2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-07 15:39:36 +00:00
David Webster
63d5e83898 Make updates for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-07 15:37:33 +00:00
Vadim Zeitlin
eb08590746 merged fix from the 2.2 branch but the test I changed seems to have disappeared - is it ok?
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-06 20:09:48 +00:00
Vadim Zeitlin
39189b9dc7 added TEST_PATHLIST (old change which I forgot to commit before)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-06 00:28:22 +00:00
Gilles Depeyrot
de1ec9c63a added Navigation Services library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-05 20:32:55 +00:00
Gilles Depeyrot
9b7d196cf4 ignore CodeWarrior build directory and output files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-05 20:16:58 +00:00
Julian Smart
015e69f36d wxFileSelector should have file name only, not path, passed to 3rd arg
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-05 16:50:58 +00:00
Stefan Csomor
90b22acaa8 corrected redraw problems with native controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9464 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-04 19:10:47 +00:00
Stefan Csomor
360a4636dd correct window class attribution (was wrong in carbon)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-04 12:49:27 +00:00
Stefan Csomor
2597135af7 changed choice to properly inherit from wxChoiceBase , added msg compatible calls to wxStaticBitmap, correct window class attribution (was wrong in carbon)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-04 12:47:34 +00:00
Stefan Csomor
56d4016a16 changed choice to properly inherit from wxChoiceBase , added msg compatible calls to wxStaticBitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9461 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-04 12:46:30 +00:00
Vadim Zeitlin
9c7a49b57b added EVT_COMMAND_SCROLL_THUMBRELEASE event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-04 00:21:59 +00:00
Vadim Zeitlin
75f4be8a9b wx-config changes merged from the 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-03 20:26:27 +00:00
Stefan Csomor
0b014ec713 mac changes : wxDC - removed doubly defined vars (inherited from base) and fixed wxPen - width scales with context and 0 width always renders one pixel wide
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-03 17:18:03 +00:00
Robert Roebling
1d261710b8 Implemented wxStaticLine under Mac. I thought I had
commited this already, actually.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9456 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-02 19:28:57 +00:00
Julian Smart
673dfcfac1 Added DisplayTextPopup to wxHtmlHelpController; fixed refresh bugs in
generic wxListCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-02 15:16:16 +00:00
Julian Smart
d3d6931427 Added test to prevent crash in LogMenuEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-02 12:49:26 +00:00
Stefan Csomor
895f5af753 final adjustements to wxToolbar to make it layout as on other platforms
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-01 06:50:39 +00:00
David Webster
8b63ae37ee Added YieldIfNeeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-01 03:25:03 +00:00
David Webster
41fe247df0 New .dll mod def file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-01 03:24:30 +00:00
Stefan Csomor
7810c95b5d added new focus behaviour (like MSW) and toolbar fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 20:48:20 +00:00
David Webster
10e4dbef5d Undo the Test commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 20:36:25 +00:00
David Webster
45190265d0 Test commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 20:35:38 +00:00
Robin Dunn
9ae9011bb4 fixed problem in wrapping of wxOGLConstraint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9447 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 19:15:15 +00:00
Vadim Zeitlin
cd093688ae fixed bug with wx-config --cflags not returning the code generation flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 18:38:34 +00:00
Stefan Csomor
59c78040cd default window creation algorithm for mac platform is changed, now a full window with titlebar is drawn as soon as the style has WX_CAPTION (before it needed WX_THICKFRAME )
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 14:31:16 +00:00
Stefan Csomor
80645074d8 toolbars are now possible in any window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9444 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 14:29:53 +00:00
Julian Smart
9ab5ef13b5 Local event array wasn't initialized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 13:58:07 +00:00
Stefan Csomor
41f38f4d59 added menubar update OnActivate for multiple frames with their own menubars, it's not perfect (menu merge) would be better, but at last something
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9441 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 13:04:19 +00:00
Stefan Csomor
c809f3be86 corrected hiding/showing of native mac controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-28 12:23:17 +00:00
Stefan Csomor
19ff2a7bd5 corrected the invalidation when resizing windows (was only invalidating the client area)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-27 23:21:48 +00:00
Stefan Csomor
b89dac7816 added calls for invalidating the dc setup on mac explicitely (needed in case of nested updates (e.g. writing a message to a text control while being in paint mode)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-27 21:38:13 +00:00
Stefan Csomor
a22be3e1fc added a call for invalidating the dc setup on mac explicitely (needed in case of nested updates (e.g. writing a message to a text control while being in paint mode)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9437 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-27 21:35:18 +00:00
Gilles Depeyrot
5b49e9eebd added CodeWarrior projects for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 22:24:42 +00:00
Robert Roebling
3752cadc84 wxMac:
Added wxControlNameStr. (second try).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 20:12:21 +00:00
Vadim Zeitlin
4817645de8 matching changes for makefile.g95
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 10:41:10 +00:00
Vadim Zeitlin
a967ef9dce applied patch 403988 (fixing MDI window menu)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 10:24:24 +00:00
Vadim Zeitlin
186ef90c55 applied patch 403898 (fixing msw/tabctrl.cpp include)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 10:21:56 +00:00
Vadim Zeitlin
12ad1f5618 applied patch 404136 which is supposed to fix BC5.5 crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 10:17:57 +00:00
Vadim Zeitlin
97ffd370f4 applied patch 403956 (gcc warning fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 10:03:12 +00:00
Gilles Depeyrot
a789c01d26 added missing method to set colour from hex value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-26 07:14:18 +00:00
Václav Slavík
f92f546c44 using wxURL now enforces linking http.o, ftp.o and sckfile.o
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-23 22:52:11 +00:00
Vadim Zeitlin
0ea48a1f23 fixed GetMargins() compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-23 20:28:54 +00:00
Stefan Csomor
22e0ea84c8 Define wxUSE_NOTEBOOK for Mac. Required ny sizer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-23 19:46:00 +00:00
Stefan Csomor
a5b7b1edc0 Dont crash wxFileDialog on Mac when calling CentreOnXXX. Do nothing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9423 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-23 19:45:00 +00:00
Václav Slavík
f222db9ce6 documented fs_zip bugfix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-23 19:00:21 +00:00
Vadim Zeitlin
ef7eaedd63 added GetMargins()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-23 16:35:50 +00:00
Václav Slavík
de0702d065 fixed FindFirst/FindNext in fs_zip, it should find all directories now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 23:43:45 +00:00
Julian Smart
0e4a6d55e9 Added PROIO_ prefix to yyparse to get it to link.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 17:46:41 +00:00
Julian Smart
173e8bbfb3 Attempted to improve tip window behaviour, but kill focus still not working in wxGTK.
wxTipWindow now has wxTipWindowView child.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9415 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 17:29:51 +00:00
Julian Smart
c9c1c60f19 wxLIST_STATE_FOCUSED -> wxLIST_STATE_SELECTED in GetItemState (typo)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 13:55:02 +00:00
Julian Smart
47210d0238 Corrected Clone return type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9412 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 12:56:29 +00:00
Julian Smart
cd66f45bfe Changed wxYield calls to wxYieldIfNeeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 12:10:02 +00:00
Julian Smart
cb2713bfa8 Added wxYieldIfNeeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-22 12:09:06 +00:00
Václav Slavík
b7aaabf86f added missing implementation of wxHashTableLong::Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 23:52:03 +00:00
Václav Slavík
1486ed877a fixed compilation problem (frame.h not included)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 23:51:39 +00:00
Robin Dunn
7a8b1590d5 some little fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 21:12:10 +00:00
Robin Dunn
211a46cf82 some little fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 20:57:57 +00:00
Stefan Csomor
331a33a1bc added carbrsrc.r to carbon resource target
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 08:51:07 +00:00
Stefan Csomor
3fd81d8740 the carbon resource tag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 08:50:16 +00:00
Stefan Csomor
8e8d3ba8e5 corrected an superfluous initfloatingwindows call in carbon
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-21 08:49:42 +00:00
Gilles Depeyrot
1fdad05332 added CodeWarrior project for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 22:24:49 +00:00
Gilles Depeyrot
ed5b981186 do not perform Gestalt tests under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 22:21:45 +00:00
Stefan Csomor
a8cc3ad1b0 added a PROIO_yyparse function in order to compile again after defines have moved to wxexpr.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 17:41:58 +00:00
Vadim Zeitlin
c3e646b47f fixed memory leak in Accept()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 16:34:23 +00:00
Václav Slavík
7e139aafe0 fixed lies in wxFileSystem docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 16:03:01 +00:00
Václav Slavík
095472c0da fixed some crashes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 16:02:26 +00:00
George Tasker
83e72d5f10 Added a #ifndef for DMPAPER_USER to define it to the value defined in VC's wingdi.h if there is no known definition (like for mingw)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 13:55:24 +00:00
Vadim Zeitlin
83a5b533e2 made wxApp::GetTopWindow() virtual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 13:39:50 +00:00
Vadim Zeitlin
205c03894b compilation fix (patch 103882)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 09:55:44 +00:00
Robin Dunn
486fd225d4 Added a SetFont method that behaves like SetLabel does with respect to
wxST_NO_AUTORESIZE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-20 06:10:38 +00:00
Vadim Zeitlin
2f10f4238a fixed wxSocket::_Wait() for worker threads in an MT program
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-19 17:22:50 +00:00
Vadim Zeitlin
6dc5fd7181 temp (?) fix for wxYield() calls from other threads
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-19 12:29:39 +00:00
George Tasker
663af052c0 Added xh_frame.obj to the list of target objects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-19 01:04:10 +00:00
Vadim Zeitlin
cd4915e2c9 some minor fixes to the docs (bugs 13271[56])
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-16 18:49:47 +00:00
Vadim Zeitlin
8b766d97fd applied patch 103798 (yy... defines moved from expr.h, wxexpr.h to wxexpr.cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-16 18:36:17 +00:00
Václav Slavík
6c5b628eee applied patch #103817 to both branches (HTML printing typo in margins code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-16 18:17:38 +00:00
Robin Dunn
9c4165adfa Copied/merged from the 2.2 branch.
Changes needed to build with new event system


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-16 08:49:41 +00:00
Robin Dunn
ce1ecc6d48 Copied/merged from the 2.2 branch.
Changes needed to build with new event system


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-16 08:40:24 +00:00
Robin Dunn
1b62f00d8e Copied/merged from the 2.2 branch.
Changes needed to build with new event system


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9374 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-16 08:19:50 +00:00
Gilles Depeyrot
7aa54cf749 added CodeWarrior project for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9373 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-15 21:53:24 +00:00
Gilles Depeyrot
03e11df547 modifications for compilation under Mac OS X
applied patches extracted from submission by Marc Newsam (tested under Mac OS 9)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-15 21:51:14 +00:00
Robin Dunn
f0c5ebdc0d Fixed bug that was giving the wrong size of wxCustomDataObjects to the receiver.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-14 19:17:30 +00:00
Vadim Zeitlin
15ba5c2731 wxADJUST_MIN definition (forgot to ci last time)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-14 18:13:23 +00:00
Vadim Zeitlin
d13d8d4e5f added wxADJUST_MINSIZE sizer flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-14 14:13:38 +00:00
Vadim Zeitlin
f41cb81efc fixed bug in wxCalendarCtrl (132199) and bug in wxDateTime::IsSameDate() this fix discovered
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 17:55:26 +00:00
Julian Smart
d52e91c980 More GTK+ 1.3.1 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 17:40:08 +00:00
Julian Smart
90fae67de9 Further __WXGTK20__ fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 15:51:11 +00:00
Jouk Jansen
392555bb0f Committing in .
Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/gtk/descrip.mms

 VMS compile issues
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 13:00:33 +00:00
Julian Smart
f9862abdc9 Tried to fix GTK+ 2.0 compilos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 12:10:54 +00:00
George Tasker
b742792c08 Beginnings of BLOB support - Do not use BLOBs yet though, as they do not work, but these changes will not affect behavor of anything unless you try to create a BLOB column 0 which will fail right now.
Formatting of source code cleaned up.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 11:42:35 +00:00
George Tasker
bf5423ea7d Beginnings of BLOB support - Do not use BLOBs yet though, as they do not work, but these changes will not affect behavor of anything unless you try to create a BLOB column 0 which will fail right now.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 11:41:02 +00:00
George Tasker
8d1e5dbf99 A temporary hDIB was not being unlocked before exiting the function where the lock was obtained
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 11:38:07 +00:00
George Tasker
e7dd6ecdd1 Fixes display of bitmaps in owner drawn controls (like menus) so that they are not clipped or dropped completely. Menu items resize appropriately with this code submitted by Ray Gilbert.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-13 11:35:45 +00:00
Gilles Depeyrot
b2f4c4b0d4 added CodeWarrior projects for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 21:41:51 +00:00
Gilles Depeyrot
3204d8e949 removed CodeWarrior projects added as ascii instead of binary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 21:37:32 +00:00
Robin Dunn
cf75c1b4fb Now uses CC_FULLOPEN if m_colourData.GetChooseFull()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 20:30:00 +00:00
George Tasker
829c421b93 Changed source files to not include Mark's old defunct e-mail address. It now only shows in the ABOUT dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 19:23:44 +00:00
Julian Smart
9bb0d1b539 Small mod
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 18:12:10 +00:00
Vadim Zeitlin
276c7463f3 fixed KDE link file reading code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 17:21:04 +00:00
Julian Smart
84c9e2f87b Changes to distribution scripts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 15:59:24 +00:00
Julian Smart
44cd54c24e Fix for unsafe use of a global pointer for focus window: now checks at destruct
time to see if we should NULL the pointer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 13:45:18 +00:00
Vadim Zeitlin
6e358ae704 fixed crash with '\' on the end of the last line
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-12 00:51:17 +00:00
Gilles Depeyrot
e70d4ce8d6 updated CodeWarrior projects for latest wxMac commits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-09 21:01:26 +00:00
Gilles Depeyrot
00f34af570 updated CodeWarrior projects for latest wxMac commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-09 20:40:42 +00:00
Ron Lee
9ad43c8b25 cleaned some old cruft out of configure.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-09 06:45:21 +00:00
Stefan Csomor
5b781a6729 updated mac sources (CW 5.3 working , CW6 still having code gen problems)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 21:13:12 +00:00
Vadim Zeitlin
1db8dc4a2b applied (slightly modified) wxToggleButton patch from John Norris and Axel Schlueter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 18:57:23 +00:00
Vadim Zeitlin
bb84929ec5 some stupid attempts to make utf8 work - it doesn't, but the code does no harm and could be useful in the future
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 18:11:36 +00:00
Vadim Zeitlin
cce442ba7c (blind) fixes for Motif compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 15:54:51 +00:00
Vadim Zeitlin
24f25c8af1 added more tests for streams and wchar_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 15:46:47 +00:00
Vadim Zeitlin
4708a349af fixed bug in Eof(), finally
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 15:44:00 +00:00
Vadim Zeitlin
fb96bc75a7 made EXPAND/COLLAPSE docs more clear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 15:26:38 +00:00
Vadim Zeitlin
f8e5ed929c removed obsolete GetEventClass
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 15:13:51 +00:00
Ron Lee
b64f0a5fc7 More mostly cross compiling related mods..
Get configure to bring in the necessary libs and object files if
the compiler can handle ole.
Added --enable-metafile option, defaults to yes but again only used
if ole is supported.
Fixed the last of the #ifdef wxUSE_NORLANDER.. tests to check if its
non-zero (it's always defined)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-08 11:19:25 +00:00
Václav Slavík
63986ba653 fix for undefined LANG_XXX constants with some compilers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-07 21:47:55 +00:00
George Tasker
0bb6242172 Radiobox control was being created with wxComboBoxNameStr instead of wxRadioBoxNameStr.
Widgets on the GAUGE tab were overlapping each other, so I slightly rearranged them to not overlap.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-07 16:27:21 +00:00
George Tasker
31334ecb03 SetBackgroundColour() and SetForegroundColour() were being called before the HWND was set for the wxGauge95, and these two functions require the HWND of the gauge. Moved the call to these two functions to be after teh HWND is set.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-07 16:12:56 +00:00
Ron Lee
c521c4947e mainly fixes for cross compiling..
- fixed vsnprintf detection for MSW
  - don't do getsockname test for mingw (and presumably for cygwin)
    as they use winsock
  - fixed broken ole2.h test, add -fvtable-thunks for gcc if we find it.

changed MAC_DIST to MACX_DIST since autoconf thinks MAC_ is a macro..


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-07 08:32:51 +00:00
Vadim Zeitlin
e1fdd3f3d9 fixed previous compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-07 02:13:22 +00:00
Julian Smart
d35b028e04 Added event sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 18:13:28 +00:00
Julian Smart
cae67e55f7 Added event sample to VC+ project file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 18:11:56 +00:00
Julian Smart
846df3e03c Added VC++ project files for event sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 18:08:26 +00:00
Julian Smart
1ddfb726b2 Updated VC++ project files for making DLL-based samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 17:50:06 +00:00
Julian Smart
32956769e9 Fixed sashwin events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 15:03:46 +00:00
Julian Smart
7a5e62674f Fixed some warnings (don't know why dialoged Makefile is being committed)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 14:23:44 +00:00
Vadim Zeitlin
ae128b358e fixed (?) mingw32/cygwin compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 00:53:56 +00:00
Vadim Zeitlin
918a745c19 regenerated all makefiles from filelist.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 00:17:09 +00:00
Vadim Zeitlin
00e6d8ab78 applied patch 103610
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 00:14:27 +00:00
Vadim Zeitlin
e800f425f2 added splash.h headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 00:11:43 +00:00
Vadim Zeitlin
c9e3527262 applied patch 103591 which should fix wxWakeUpIdle()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-06 00:04:24 +00:00
George Tasker
24e2b35da2 Added two more lines of c_str() calls for GCC compilation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-05 23:26:46 +00:00
George Tasker
da99271dcb ::Initialize() methods added to the helper classes
Changed wxT("") to wxEmptyString everywhere


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-05 13:36:33 +00:00
George Tasker
19320af45a ODBC database class documentation updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-05 13:33:43 +00:00
Gilles Depeyrot
f70ab56e16 supply the sun style dlopen etc. functions in terms of NeXTs rld_*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 21:31:51 +00:00
Gilles Depeyrot
b108e45518 helper for changing types/creators of files based on the file extension
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 21:29:20 +00:00
Gilles Depeyrot
764835a5d5 corrections for event handling changes in wxWindows
renamed Cell and CellBox to LifeCell and LifeCellBox to avoid conflict
with Classic Mac OS Toolbox type


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 20:11:49 +00:00
Gilles Depeyrot
50dacf0581 re-added CodeWarrior projects for Classic Mac OS (as binary!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 20:06:45 +00:00
Gilles Depeyrot
5ee3522ce5 removed CodeWarrior projects added as binary instead of ascii
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 20:04:58 +00:00
Gilles Depeyrot
653d24e092 added CodeWarrior projects for Classic Mac OS
ignore CodeWarrior build directory and files produced


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 20:00:39 +00:00
Gilles Depeyrot
7919906660 added Classic Mac OS and Mac OS X build instructions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 19:54:26 +00:00
Gilles Depeyrot
b4085ce66c added Mac OS X toolkit configuration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 19:53:25 +00:00
George Tasker
d3358961db More changes to use the latest wxDb/wxDbTable method enhancements
More Unicode additions


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 16:01:33 +00:00
George Tasker
9556da13ba Cleanup of formatting of text
Added Initialize() functions to a couple of the helper classes
More code changed to reflect new class methods that are now available.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 15:58:39 +00:00
George Tasker
6a71ee861c One more wxString change that I originally missed
A few more Unicode changes I missed
Made one more param in the wxDb constructor be a const (like it should have been).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 15:56:59 +00:00
George Tasker
e7e5298cca Commenting and text formatting cleanup. No source changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 15:55:15 +00:00
George Tasker
9fe17bd344 Updated docs to reflect new changes (mostly wxChar* and wxString param changes, plus a few new methods, and forms of the methods.
Documents the new wxDbConnectInf class (which used to be a struct)
A few typos from my last checkin fixed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 15:52:46 +00:00
Gilles Depeyrot
22c0b72105 ignore CodeWarrior build directory and files produced during compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-04 14:56:23 +00:00
George Tasker
1540e053dd Initial checkin of the wxFrame support added by Aleks G.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 21:44:28 +00:00
George Tasker
eacf9d88f9 More Unicode support added (though untested and still unfinished).
Changed code to demonstrate the new wxDbConnectInf class
ODBC environment handle now managed via the wxDbConnectInf class
Condensed the use of multiple wxDbConnectInf instances to one and got rid of the bogus EXTERNs of the wxDbConnectInf that were causing so many headaches and mismatched usages of them.
Other minor bug fixes - still have not foudn the reason for the crash on exit


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 17:55:00 +00:00
George Tasker
049977d042 Massive cleanup of the code.
More Unicode support added (though untested).
Added TONS of comments
Changed code to demonstrate the new wxDbConnectInf class
ODBC environment handle now managed via the wxDbConnectInf class
Fixed bug where editing a displayed record would not save if the user name was changed.
Other minor bug fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 17:52:58 +00:00
George Tasker
5cf34cf07e wxDbConnectInf is now converted to a class. Fully backward compatible with all version except the last checkin I did (changed datatypes back to what they were before for in this class). Class now has all accessors and member functions. Functions added to remove need for calling SQLAllocEnv() and SQLFreeEnv().
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 17:50:45 +00:00
George Tasker
7d8c3dbaba hstmtUpdate handle was not always being freed in all situations
General gcc changes in the Printf() statement when using wxStrings as params to Printf()
General code clean up, correcting comments, added more comments tagging where changes for ODBC 3.0 support needs to be added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 17:50:05 +00:00
George Tasker
942e67c3a3 wxDbConnectInf is now converted to a class. Fully backward compatible with all version except the last checkin I did (changed datatypes back to what they were before for in this class). Class now has all accessors and member functions. Functions added to remove need for calling SQLAllocEnv() and SQLFreeEnv().
General gcc changes in the Printf() statement when using wxStrings as params to Printf()
General code clean up, correcting comments, added more comments


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 17:48:06 +00:00
Vadim Zeitlin
28a156b14c fixed previous commit (no changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 14:53:12 +00:00
George Tasker
7335902d0f Spelling typos fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 14:29:38 +00:00
Vadim Zeitlin
0cbe5ee3a9 applied patch 103575 (more efficient wxString comparison)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 13:42:47 +00:00
Gilles Depeyrot
75e824e8bc ignore CodeWarrior build directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-03 12:14:09 +00:00
Gilles Depeyrot
1811a0927b ignore CodeWarrior build directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 21:25:08 +00:00
Gilles Depeyrot
288d4f8b91 minor corrections for CodeWarrior
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 20:48:54 +00:00
Vadim Zeitlin
03424b1b89 applied patch #103444
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 16:53:08 +00:00
Vadim Zeitlin
ffdd3c9861 added missing GetEventHandler() (patch #103561)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 15:56:30 +00:00
Jouk Jansen
343a06a58b Committing in .
Modified Files:
 	wxWindows/src/common/dynlib.cpp

 RTLD_GLOBAL is not allowed in the second argument of dlopen on True64-Unix.

----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 13:22:14 +00:00
Jouk Jansen
c8159c3d03 Committing in .
Modified Files:
 	wxWindows/configure

 Compaq's preporcessor on True64-Unix does not allow A #include with the "#"
 on another position than the first.

----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 13:19:57 +00:00
David Webster
a5a9cc2ab0 latest module definition file for OS/2 .dll build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 05:05:56 +00:00
David Webster
8546f11e49 Redfine some events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-02 05:04:27 +00:00
George Tasker
645889ad25 Huge cleanup of the code. Reformatting, spelling fixes, standardizing on wxWindows conventions, etc.
Changed the couple lines of code required to work with checkins of the new ODBC classes that use wxStrings.
Fixed a ton of memory leaks
Demo still crashes on exit though - this problem has exited for nearly a year though.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 20:24:44 +00:00
George Tasker
4fdae9972d All char, char *, and char arrays changed to use wxChar or wxString. 99% backward compatability maintained
Cleaned up code to remove duplicate blocks from multiple functions
Added better handling of failed creation of wxDbTable/wxDb objects
Moved code out of class constructors to a private function called from within the constructor
Moved destructor code to a cleanup() function so it could be called from within the constructor if the constructor failed.
Added wxDb::ModifyColumn() function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 20:21:52 +00:00
George Tasker
94613352b5 Changed a couple lines to intialize member variables correctly to match db/dbtable type changes to wxString from char *
Spelling typos fixed
All hardcoded text strings and characters now inside wxT()


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 20:17:15 +00:00
Gilles Depeyrot
548dffb11f CodeWarrior project for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 20:10:49 +00:00
Vadim Zeitlin
85664da6de added missing WXDLLEXPORT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 16:12:21 +00:00
George Tasker
ed2ec17c54 Changed declaration of TREE events from being in both treectlg and treectrl to having it just once in treebase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-02-01 15:27:16 +00:00
Vadim Zeitlin
1724ca8b5c small fix for control positions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 22:51:10 +00:00
Vadim Zeitlin
0c6b0c6668 Removed obsolete files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 22:46:29 +00:00
Vadim Zeitlin
4161828546 and another...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 17:31:15 +00:00
Vadim Zeitlin
71b9ed15f5 argh... yet another compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 17:25:56 +00:00
Vadim Zeitlin
0c85071392 another compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 17:21:59 +00:00
Vadim Zeitlin
71499aafed oops... fixed a typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 17:19:06 +00:00
Vadim Zeitlin
2e4df4bfaf 1. made compilation with WXWIN_COMPATIBILITY_EVENT_TYPES really work
2. moved ~50% of the event types in their own headers/sources from event.h/cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 17:16:40 +00:00
Vadim Zeitlin
6164f93ca2 event handling seems to work again, new sample (event) added and documented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 16:00:00 +00:00
Vadim Zeitlin
901ed91ce1 compilation warnings fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 15:58:20 +00:00
Vadim Zeitlin
ce83033f35 wxDC scaling fix patch (Derry Bryson)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 15:57:09 +00:00
George Tasker
8a16a98e59 Destructor for wxMimeTypesManager was deleting its member m_impl without checking if it was already NULL or not.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 14:50:02 +00:00
George Tasker
dca2d56ff5 Destructor for wxFileType was deleting its member m_impl without checking if it was already NULL or not.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 14:48:57 +00:00
Vadim Zeitlin
37ed3ae338 added test for vertical gauge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 12:33:16 +00:00
Vadim Zeitlin
61f04363db support for wxGA_VERTICAL in wxGauge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 12:22:04 +00:00
David Webster
402e2f7cf8 Ownerdrawn stuff for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 05:33:10 +00:00
David Webster
d8fcb5e835 Add a Get and Set for an OS/2 PS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-31 05:32:23 +00:00
Gilles Depeyrot
c0cd186f82 changed argument types (replaced long with wxCoord)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:26:23 +00:00
Gilles Depeyrot
30b7213465 corrected indentation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:22:50 +00:00
Gilles Depeyrot
e437cc535e added missing return type (implicit int no longer accepted by compilers)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:17:27 +00:00
Gilles Depeyrot
9ec3cd2d38 removed unused variables
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:15:53 +00:00
Gilles Depeyrot
36195a44c3 added test for __MACH__ for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:06:57 +00:00
Gilles Depeyrot
f58f51637f added missing return type (implicit int no longer accepted by compilers)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:02:45 +00:00
Gilles Depeyrot
3c4f84521e added tests for __MACH__ to compile under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 21:00:18 +00:00
David Webster
7c697725f1 OS/2 compile error fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 15:38:29 +00:00
George Tasker
f0ded96ffb Allow MDI children to have a non-default window style passed down to them. Previously only default frame styles were possible, even when a valid style was passed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 14:14:03 +00:00
David Webster
e464c180c4 Compile error fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 06:07:50 +00:00
David Webster
437a79a631 XPM updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-30 06:06:22 +00:00
Julian Smart
83a4ad53fa Corrected DoBlit code to use offset into mask
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 23:05:01 +00:00
George Tasker
8658ef93e3 The new SORT parameter for SelectViewType() and SelectDocumentType() sorted the displayed list, but the view/template returned as the one selected was corresponding to the template from the original unsorted list of templates.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 23:01:21 +00:00
David Webster
020a1653a4 Add wxInvertMask for OS/2 xpm processing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 21:42:53 +00:00
David Webster
c68d524366 minor fix for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 21:37:17 +00:00
David Webster
0ec0dc85ec new icc file for VA4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 21:36:49 +00:00
Vadim Zeitlin
8082a771db another fix for MDI styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 19:56:37 +00:00
David Webster
57c79232a5 OS/2 updates for XPM
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 18:52:18 +00:00
Vadim Zeitlin
47ca6bfb05 fix (?) for MDI children style problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 17:43:53 +00:00
Vadim Zeitlin
31fe72b638 modified make and .spec files to build distribution files names with version suffix (like wxFoo-major.minor.micro)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 17:39:24 +00:00
Vadim Zeitlin
d9cde669c3 1. updated docs/gtk/changes.txt for 2.2.5
2. fixed configure/Makefile to handle no-rtti/no-exceptions better
3. added missing files of internat sample to the dist
4. fixed Makefile.in for the help sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 15:26:02 +00:00
David Webster
f3cab6cf19 new .def file for OS/2 to include event changes and addition of wxDir and the DirCtrldg control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 05:50:27 +00:00
David Webster
6f38c86f45 Bitmap code, icon code and dir code updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 05:48:26 +00:00
David Webster
ec1b28a357 OS/2 updates (mostly executing MSW code)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 05:47:27 +00:00
David Webster
8bb6da4ae6 Bitmap and icon updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-29 05:46:06 +00:00
Václav Slavík
a559d70856 _T() -> wxT()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-28 23:21:20 +00:00
George Tasker
f2ab8671bf Fixed buffer overrun in call to wxStripMenuCodes()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-28 19:29:23 +00:00
George Tasker
3377b96271 Fixed an incorrect statment saying the wxLB_SORT was not support under GTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-28 16:11:20 +00:00
David Webster
403603f74f OS/2 patch about a #pragma warning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-28 15:34:19 +00:00
Julian Smart
6a097cd6c4 Correction for Mingw32
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-28 10:51:13 +00:00
Vadim Zeitlin
83a136ac4a extended RemoveLast() to take size_t parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-28 02:14:00 +00:00
Vadim Zeitlin
3794e8d6b0 readded wxEVT_HELP inadvertently deleted the last time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 23:00:10 +00:00
Gilles Depeyrot
9c1175db9e modified macintosh ifdef compilations to also test for __APPLE__
__APPLE__ is defined by the C/C++ compiler under Mac OS X


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 21:18:36 +00:00
Vadim Zeitlin
cbee8f8dc7 compatibility changes: WXWIN_COMPATIBILITY_EVENT_TYPES and DECLARE_EVENT_TABLE_ENTRY added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 20:16:02 +00:00
George Tasker
2e4c3bf87a Added wxFrame support contributed by Aleks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 14:29:01 +00:00
George Tasker
89e3037cc9 Added a check to make sure 'parent' is valid, otherwise a crash could occur
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 12:55:44 +00:00
Vadim Zeitlin
8e19f54e55 added Id cvs tag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 12:46:50 +00:00
Vadim Zeitlin
8d41cad743 wxEVT_USER_FIRST put back
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 12:46:03 +00:00
Vadim Zeitlin
6a5391afa9 fix for DoPut() from long time ago
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 12:40:57 +00:00
Vadim Zeitlin
96f6c703b1 wxEVT_USER_FIRST readded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 12:38:09 +00:00
Gilles Depeyrot
3b7003909e corrections related to event.h modifications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 10:58:29 +00:00
Ron Lee
050207ec17 Began updating 2.2 Debian build scripts for 2.3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-27 08:46:25 +00:00
George Tasker
e894bd397c plot.cpp was moved out of the generic directory to contrib, so plot.obj no longer needs to be linked
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 23:52:03 +00:00
Vadim Zeitlin
b7245f129a compilation fix for recent event changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9176 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 22:26:45 +00:00
Gilles Depeyrot
b81abd0d1d correction to maintain data array in synch with string array
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 20:59:41 +00:00
Gilles Depeyrot
6113a16ab3 corrected comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 20:16:12 +00:00
Vadim Zeitlin
0b5eceb638 dynamic event types actually work with these changes, also corrected more
event macro in the sources


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 18:58:14 +00:00
Robert Roebling
258e5c7427 Corrected typo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 18:35:23 +00:00
Robert Roebling
82a5f02c86 Updated ten thousand macros for new event type code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 17:35:36 +00:00
Julian Smart
963e36f852 Changed m_eventType to int
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-26 14:13:10 +00:00
Robert Roebling
77d4384e31 New event types for use in external libs (and from
now on actually everywhere).
  Adapted cshelp to new event types.
  Adapted wxGrid to new event types.
  Update for German translation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 18:30:30 +00:00
Robert Roebling
4c075b7090 Beautified header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 18:27:44 +00:00
Robert Roebling
0f442030c4 Prepare wxToolBarSimple for event type change.
Make wxGrid use new event types.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 18:27:01 +00:00
Robert Roebling
b578915045 Changed wxCanvas constants from XXX to wxXXX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 18:25:21 +00:00
Robert Roebling
2201e9b300 Removing obsolete ditrib files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 18:23:49 +00:00
Vadim Zeitlin
b15a4a4a26 another compile problem fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 14:56:06 +00:00
Vadim Zeitlin
eacaaf44c0 compile/link problem fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 14:33:01 +00:00
Ron Lee
c81f40e0fe Patched to enable building on Debian/Alpha
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-25 02:33:03 +00:00
Vadim Zeitlin
09fcd88955 applied wxNativeFontInfo patch #103089
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-24 17:16:04 +00:00
Vadim Zeitlin
b92fd37cb0 1. patch from Søren Erland Vestø implementing wxFTP::GetFileSize()
with my fixes to the patch
2. significantly updated/cleaned FTP tests in the sample
3. don't log FTP passwords in wxLogTrace




git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-24 16:37:04 +00:00
Vadim Zeitlin
e7fa076d94 compilation fix for new iostreams
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-24 14:51:38 +00:00
Vadim Zeitlin
a6c65e881e MIME type manager fixes described earlier on the list:
1. extended wxFileTypeInfo
2. moved handling of fallbacks into wxMimeTypesManager (instead of Impl)
3. added wxMimeTypesManager::Associate() and Unassociate()
4. Unix version only reads the files on demand => much faster startup


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-24 14:51:06 +00:00
George Tasker
52b9ca21ac Added optional parameter to SelectDocumentType() and SelectViewType() to allow the choice lists of documents/views to be alphabetically sorted if desired. Default behavior is FALSE on the sort to maintain backward compatability.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-24 11:04:30 +00:00
Václav Slavík
865a17302b synced intl.cpp and intl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 23:20:23 +00:00
Václav Slavík
fda91381cd new locales code checked in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 23:17:57 +00:00
Robert Roebling
1a8caf94ab Change required for new event types.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 18:38:42 +00:00
Vadim Zeitlin
adb21613bc fixed FindItem() to work with submenus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 17:30:22 +00:00
George Tasker
2c8c812ff3 One more function was out of alphanumeric sequence
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 15:12:08 +00:00
George Tasker
70b62288b4 Reordered some of the functions from the sequence they were listed in to make them be in alphabetical order
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 14:01:07 +00:00
Vadim Zeitlin
8e7dda219e fixed bug in parsing filenames without paths, added more/better tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-23 00:24:32 +00:00
Julian Smart
5e68f8f373 Fixed wxToolBar colour mapping problem (I hope)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-22 11:55:47 +00:00
Julian Smart
039df3032c And a 'standard colours' bitmap to help fix wxToolBar colour mapping problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-22 11:54:25 +00:00
David Webster
8ef38fd9f8 initial coding of and OS/2 XpmHandler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-21 23:00:59 +00:00
David Webster
d4714748d8 new makefile and gdiimage suport for xpm data
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-21 23:00:16 +00:00
Gilles Depeyrot
d421fbda2f CodeWarrior project for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-21 18:29:08 +00:00
Julian Smart
a576b02cb9 Remove plot.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-21 17:45:50 +00:00
Vadim Zeitlin
cb73d83f63 another attempt to fix parser compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-21 01:22:39 +00:00
Václav Slavík
93f30ee67a fixed bug #129464 (hopefully)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-20 19:50:05 +00:00
Gilles Depeyrot
de90d3e084 corrected creation of wxNORMAL_FONT for Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-20 19:35:18 +00:00
Gilles Depeyrot
3b7e6277be applied wxNativeFontInfo patch from Derry Bryson (with minor changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-20 19:30:47 +00:00
Gilles Depeyrot
1a2b91971d CodeWarrior project for Classic Mac OS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-20 19:25:35 +00:00
David Webster
937afade13 chmod is not available in VisualAge
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 22:32:22 +00:00
David Webster
0e191b5ebc remove plot.cpp from build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 22:30:50 +00:00
Vadim Zeitlin
bf62af352e removed shift/reduce conflict
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 18:46:54 +00:00
Václav Slavík
8ec77cd74c updated wxLocale documentation to reflect API changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 00:20:49 +00:00
Václav Slavík
3321fc55fc updated the script to generate pieces of TeX documentation as well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 00:18:43 +00:00
Václav Slavík
ec5d715214 fixed Farsi/Persian bug (not reflected in intl.cpp, intl.h yet due to the lock)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 00:18:15 +00:00
Václav Slavík
04b833fb81 applied pseudo-patch #103306
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 00:17:37 +00:00
Václav Slavík
429fdefcd7 moved XMLIDs counter inside GetXMLID to prevent initialization order problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-19 00:16:03 +00:00
Vadim Zeitlin
29fd317b4b added timestamping to wxLogStream
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-18 18:10:56 +00:00
Jouk Jansen
99d96a2b78 Committing in .
Modified Files:
 	wxWindows/src/common/dynlib.cpp

 VMS patch for second argument of dlopen
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-18 13:35:51 +00:00
Robert Roebling
27b1df435f This is how wxPlotWindow would look like with the
suggested event type creation.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-18 12:37:21 +00:00
Vadim Zeitlin
02718e6af4 applied file history patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 18:01:35 +00:00
Vadim Zeitlin
8c1375b922 fixed bug 128581
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 17:05:05 +00:00
Vadim Zeitlin
84028727cb tried to fix layout of label-less static box sizers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 17:00:33 +00:00
Vadim Zeitlin
237c5c0242 added RTLD_GLOBAL to dlopen flags (bug 128705)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 16:45:04 +00:00
Vadim Zeitlin
3d0145a5a3 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 16:18:49 +00:00
Vadim Zeitlin
42b1f941b0 fixed wxSplitPath() bug and added tests for it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 16:08:15 +00:00
Jouk Jansen
f2b36d323e Committing in .
Modified Files:
 	wxWindows/src/generic/descrip.mms

 removed plot.cpp reference
----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 12:43:13 +00:00
Václav Slavík
b5c01940ac Bitmaps are no longer rescaled to reflect printerPPI/screenPPI ratio. Instead, we change user scale before drawing them and then restore it back.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-17 00:31:58 +00:00
Robert Roebling
adb85931ab This way the plot events work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 23:59:03 +00:00
Vadim Zeitlin
32f3104396 patch from Roland Scholz to fix the file permissions in wxCopyFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 15:28:21 +00:00
Vadim Zeitlin
d4486ad2c2 added a note about GetPosition() not working for the events other than thumb track/release
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 13:29:10 +00:00
Robert Roebling
32f904b877 Removed plot.cpp.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 13:29:08 +00:00
Robert Roebling
85f7de5c78 Removinmg plot sample from configure.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:36:58 +00:00
Robert Roebling
ee33aa3f2b Removing plot sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:36:21 +00:00
Robert Roebling
8556b795c3 Readded wxPlotWindow as external lib.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:33:29 +00:00
Robert Roebling
67b888f0f3 Removing wxPlotWindow from configure.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:29:12 +00:00
Robert Roebling
504d911e5a Removing wxPlotWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:27:35 +00:00
Robert Roebling
835b048113 Removing wxPlotWindow from filelist.txt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:25:42 +00:00
Robert Roebling
9d75efc125 Removing wxPlotWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:24:54 +00:00
George Tasker
562159286d Changed code to use the RM environment variable (if one exists) to delete files. If one does not exist, the ERASE command is used which is what was used previously
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 11:10:35 +00:00
George Tasker
0580ae4b9b Changed code to use the RM environment variable (if one exists) to delete files. If one does not exist, the ERASE command is used which is what was used previously
Target added for building .OBJ files for .C files in DEBUG or RELEASE subdirs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 10:59:36 +00:00
George Tasker
cd8528426b Changed code to use the RM environment variable (if one exists) to delete files. If one does not exist, the ERASE command is used which is what was used previously
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 10:58:34 +00:00
George Tasker
fcc864256f Added code to create $D (debug or release) subdir to put the .OBJ files into.
Changed code to use the RM environment variable (if one exists) to delete files.  If one does not exist, the ERASE command is used which is what was used previously


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 10:57:48 +00:00
George Tasker
f4764b9ab2 Swapped the directory seperator from / to \ for VC makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 10:55:52 +00:00
George Tasker
cd31c795b0 Restructured the VC makefile to build the OBJ files in either a DEBUG or RELEASE subdir to allow concurrent debug and release builds to exist side by side.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-16 10:47:03 +00:00
Vadim Zeitlin
fddfd9e1f1 blind fix for setting selection in combobox text ctrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-15 22:03:44 +00:00
Vadim Zeitlin
e1e9ea4097 merged in the console for MIME handlers fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-15 21:50:46 +00:00
Vadim Zeitlin
c93d67707f fixed a bug in handling mailcap entries with more than one commands with tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-15 18:01:28 +00:00
George Tasker
ebf776c5b8 Fixed problem in wxDbColFor::Format() for mySQL (patch submittted directly to me from Mark Johnson) to handle SQL_C_TIMESTAMP fields, which is what mySQL uses for DATE fields.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-14 12:46:33 +00:00
George Tasker
302a1ecae3 Fixed a couple spelling typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-13 14:32:03 +00:00
Václav Slavík
88961c3eca fixed stupid bug in LCID->locale string translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-13 12:56:30 +00:00
Václav Slavík
4a377e1375 added English and English US for testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-13 12:50:10 +00:00
Václav Slavík
1af9f46981 changed internat sample so that it shows language choice dialog on startup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-12 20:31:35 +00:00
Václav Slavík
1a8319ea1a _Really_ fixed Norwegian, added Kernewek language
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-12 20:31:24 +00:00
Václav Slavík
c611452fe8 changed wxLogWarning('catalog not found') message to wxLogVerbose; wxLocale::Init now works with Windows9X, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-12 20:31:10 +00:00
Václav Slavík
77ae802305 verbose mode wxLog disabled by default even in debug mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-12 20:30:53 +00:00
Václav Slavík
7981795a89 applied patch to prevent crashing when libxml DLL doesn't contain some symbols
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-12 20:29:40 +00:00
Vadim Zeitlin
6afafc42fc allow people use modal dialogs in wxApp::OnInit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-11 22:11:54 +00:00
Vadim Zeitlin
576c608dac fix/workaround for Trim() and accented letters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-11 21:51:16 +00:00
Robert Roebling
99ba739f6a wxYield() patch from stable tree.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-11 18:54:10 +00:00
Julian Smart
10bd072488 Use wxClientDC in header window so we don't clip (because of gtk_paint_box not
being clippable). This cures the header refresh problem.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-11 18:22:32 +00:00
Vadim Zeitlin
6c49baf214 applied Derry's patch to fix scaling bug
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-11 16:26:24 +00:00
Vadim Zeitlin
a4352768d7 applied (slightly modified) patch for loading large/small icons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-11 14:58:19 +00:00
Václav Slavík
3cc8e98a96 fixed Norway languages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-10 19:51:56 +00:00
Václav Slavík
98c67f0f16 commited by mistake, removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-10 19:51:46 +00:00
Václav Slavík
d3f3e35f54 new locales code checked in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-10 18:31:26 +00:00
David Webster
a2ae327513 Needed to initialize time_t to 0 in GetTimeZone to prevent a arithmetic underflow in VA 4.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-09 23:29:09 +00:00
Julian Smart
e08d628d42 Extended ProcessTextCommand so processes SETFOCUS/KILLFOCUS; checked for valid
HWND in wxBuddyTextWndProc so if the event handler kills the HWND, it doesn't crash;
added support for disabling 3D effect in buddy window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-09 15:50:01 +00:00
Julian Smart
e3582f7f92 Extended ProcessTextCommand so processes SETFOCUS/KILLFOCUS; checked for valid
HWND in wxBuddyTextWndProc so if the event handler kills the HWND, it doesn't crash;
added support for disabling 3D effect in buddy window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-09 15:37:15 +00:00
David Webster
fb83aca503 Fixes to resolve default Client Window painting when EVT_PAINT events are captured by derived classes downstream.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-08 19:00:47 +00:00
Vadim Zeitlin
6411a32c16 fix for better European date format parsing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-08 16:48:59 +00:00
Vadim Zeitlin
93521c94f5 test all selection methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-08 13:35:16 +00:00
Vadim Zeitlin
a46a73a677 typo: return Win98, not 99, from wxGetOSDescription()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-07 17:28:23 +00:00
Robert Roebling
d76419bd54 Make wxMenuItem::GetLabel() handle escaped underscores
(which are '__') correctly.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-07 14:55:03 +00:00
Vadim Zeitlin
7daab4530c fix for gcc bug under Mac OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-06 14:31:35 +00:00
Vadim Zeitlin
421db2ada5 fixed wxStreamBuffer::SetBufferIO() (thanks to Gilles Depeyrot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-06 14:18:29 +00:00
Vadim Zeitlin
384223b34b wxDateTime::IsValid() now returns m_time != (wxLongLong)-1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-05 21:03:19 +00:00
George Tasker
54b8489125 Fixed a problem in ConvertWXArrayToC() that would assign a string to an incorrect memory location due to missing parens "(*choices)[i] = aChoices[i];"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-05 19:10:04 +00:00
Julian Smart
ca2869177e Corrected horizontal rule drawing when number of items is 1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-05 14:01:28 +00:00
Julian Smart
8036af01d8 In wxListCtrl::Find, don't decrement 'start' if already -1, or the search fails.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-05 13:35:38 +00:00
Julian Smart
0b237b676d Changed GetDocuments() to remove cast, added GetTemplates()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9052 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-05 10:50:24 +00:00
Vadim Zeitlin
da2fd5acd8 added wxArrayString::RemoveAt()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 19:42:22 +00:00
Vadim Zeitlin
6108b321fc fix for wxList copy ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 18:46:53 +00:00
Jouk Jansen
9c31977bcc Committing in .
Modified Files:
 	wxWindows/src/common/descrip.mms

 Updating VMS support

----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 15:18:52 +00:00
Vadim Zeitlin
a54a9cd3b1 added src/msw/files.lst to the list of files to generate and updated it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 12:55:56 +00:00
Vadim Zeitlin
445783deea use default timeout of 1 minute
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 12:17:47 +00:00
Vadim Zeitlin
14e5a313d1 tests for the new [de]selection grid methods (patch by Roland Scholz
<scholz@pb.izm.fhg.de>)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 11:05:41 +00:00
Vadim Zeitlin
db89aa764f fix for Centre() (thanks Derry!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-04 02:30:08 +00:00
Václav Slavík
2dc1ca847f added SAX error callback (thanks go to Robert)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-03 19:03:43 +00:00
Vadim Zeitlin
b1229561e5 test for bug with new wu-ftpd
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-03 17:16:43 +00:00
Vadim Zeitlin
b0ad200675 a fix for new wu-ftpd
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-03 17:14:28 +00:00
Vadim Zeitlin
3b94ab1836 regenerated the makefiles to include filename.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-03 17:09:00 +00:00
George Tasker
96edf638ff Added filename.obj to the target list so it gets built with VC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-03 15:37:18 +00:00
Robin Dunn
d6b30953cc yet more testing...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 20:29:57 +00:00
Robin Dunn
f045d570d3 more testing of cvs update messages...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 20:17:11 +00:00
Robin Dunn
921cf810d6 test commit...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 20:00:30 +00:00
Robin Dunn
4b78d26f11 test cvs commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 19:41:04 +00:00
Julian Smart
42bcb12b40 Added filename.cpp to .dsp files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 16:42:03 +00:00
Vadim Zeitlin
f7b4b3435b patch adding DeselectXXX() functions from Roland Scholz <scholz@pb.izm.fhg.de>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 15:35:46 +00:00
Julian Smart
d3c7cfeba9 Added line to wxMask doc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-02 07:59:43 +00:00
Václav Slavík
a4313e3b38 fixed docs of wxLocale::Init (forgotted bConvertEncoding)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-01-01 11:32:56 +00:00
Vadim Zeitlin
7124df9b59 readded back SetFullName
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-31 15:23:43 +00:00
Vadim Zeitlin
9e8d860761 implemented wxFileName::SplitPath(), wxSplitPath() now just calls it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-31 01:15:33 +00:00
Vadim Zeitlin
844f90fba6 rewrote wxFileName::Normalize(), added a few methods, general clean up,
added some tests


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-31 00:23:09 +00:00
Václav Slavík
07e285be62 fixed nonsenses in tnoneng.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-30 21:35:25 +00:00
Vadim Zeitlin
097ead306c just added some _T()s
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-30 19:36:10 +00:00
Robert Roebling
4fdfb5587f Various fixes for wxFilename.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-30 12:47:48 +00:00
Robert Roebling
a35b27b14d wxFileName II. It actually works.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-30 00:28:00 +00:00
Vadim Zeitlin
14a31d6774 merged wxStaticLine ctor fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-29 23:44:11 +00:00
David Webster
045c8df996 Added filename.cpp to build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-29 22:12:54 +00:00
David Webster
ee66f09217 include "wx/filefn.h" instead of just "filefn.h".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-29 17:39:00 +00:00
David Webster
eb53bce493 should use array delete on a wxString object (line 991) that is not an array of wxStrings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-29 17:38:03 +00:00
Vadim Zeitlin
d752a3c394 modified check listbox indicators and made them customizable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-28 14:07:00 +00:00
Robert Roebling
df5ddbca48 Added wxFileName.
Small fix for log error messages on startup.
  Added missing accessor to wxSizer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-28 00:00:32 +00:00
Vadim Zeitlin
a339970ac4 1. wxCopyFile() uses buffer (huge copy speed up)
2. OS_FILENAME macro instead of #ifdef MAC everywhere
3. test for wxCopyFile in the console sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-26 15:19:43 +00:00
Václav Slavík
a30f8da836 fixed PS bounding box computation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-24 14:01:29 +00:00
Robin Dunn
3a70a28254 More cleanup. Regenerated wxGTK code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-24 07:31:31 +00:00
Vadim Zeitlin
c7386783a6 added some error checking to wxCopyFile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-23 19:40:54 +00:00
Robin Dunn
e508a2b616 Added the wxClassInfo stuff back in to the modules that are
standalone.  This is needed so any classes defined in the module will
get hooked up with their parents and assertions like "is wxWindow"
will work.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 22:32:26 +00:00
Robin Dunn
35d60de221 wxDefaultPosition and wxDefaultSize are marked read-only.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 22:06:36 +00:00
Robert Roebling
1b2dab346d Log error messages work.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 21:17:55 +00:00
Robert Roebling
e80658dacc Some wxBook docs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 15:56:48 +00:00
Vadim Zeitlin
9f3280c9c4 motif warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 15:04:09 +00:00
Vadim Zeitlin
ef4e8ebdd4 motif compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 15:01:41 +00:00
George Tasker
b25ba5b701 Overview of the wxDb and wxDbTable classes added.
Added commentary and DEPRECATED tags to all the old wxDatabase classes directing the reader to read and use the wxDb/wxDbtable classes instead


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 14:57:26 +00:00
George Tasker
f690fb046b Removed the BOLDFACE on items that are in INDEXIT blocks, so that the items will not appear in BOLD in the index.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 14:48:33 +00:00
George Tasker
606a317805 Removed the BOLDFACE on items that are in INDEXIT blocks, so that the items will not appear in BOLD in the index.
Removed some \$ inside of a couple of prelnote blocks that cause tex2rtf to fail.  They do not seem to be needed anyway.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 13:34:13 +00:00
George Tasker
76ff52f7c9 Removed the BOLDFACE on items that are in INDEXIT blocks, so that the items will not appear in BOLD in the index.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 13:33:14 +00:00
George Tasker
63ad540d40 Program now keeps track of how many errors occured during the pass, and if any occurred, the user is notified (interactive mode) of how many occured.
All error messages are now constructed with wxStrings rather than char arrays.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 13:30:01 +00:00
George Tasker
0e6ca3948f Now uses MAX_LINE_BUFFER_SIZE constant for the array sizing of the buffer that hold lines read in
Now checks that the line being read in does not exceed MAX_LINE_BUFFER_SIZE length, avoiding a crash whenever a long line is read in from a .tex file.  An error is now generated if the line is too long, and line line is truncated at MAX_LINE_BUFFER_SIZE characters.
All error messages are now constructed with wxStrings rather than char arrays.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 13:28:16 +00:00
George Tasker
1e33e2f3ae Added MAX_LINE_BUFFER_SIZE constant instead of using a hardcoded number in the array brackets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 13:24:16 +00:00
Robin Dunn
b68dc582b8 More cleanup. Removed all wxPyDefaultXXX since they aren't needed any
more.  Regenerated wxGTK code from this morning's changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 06:51:21 +00:00
Robin Dunn
2d0f46e391 test commit, no real change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 02:16:34 +00:00
Robin Dunn
bdb9373a32 Some cleanup and a fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 00:47:36 +00:00
Robin Dunn
1e7ecb7be0 Massive code changes and cleanup to allow wxPython to be split into
multiple extension modules again.  A Python CObject is used to allow
the "export" of SWIG and other common helper functions from the wxc
module to other modules, even if they are in separate shared
libraries.  Should also be usable from 3rd party code, just include
wxPython/src/export.h

Changed the default setup so the following are built as separate
extension modules:  calendar, glcanvas, grid, html, ogl, stc, and
utils.  Will probably add more later.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-22 00:06:04 +00:00
David Webster
341366c67a Beginning of bitmap updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 22:07:50 +00:00
Julian Smart
c3c979c7b8 Modified treectrlg.cpp not to crash in HitTest if there's no m_anchor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 16:12:43 +00:00
Vadim Zeitlin
0fff366e0f fix for -1 coords in wxWindow::Centre
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 15:55:08 +00:00
David Webster
6d57cea923 ANSI 'C' fix (decs in "for" clauses no longer have any scope outside clause itself)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 13:57:53 +00:00
Julian Smart
194330c765 Added m_keyGlobal.Open()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 11:37:43 +00:00
David Webster
af673e0778 Fix for VisualAge 3.0 compile concerning wxNativeFontInfo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 04:25:07 +00:00
David Webster
eeff964ac1 Fix for the wrong painting rectangle being set.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 04:24:11 +00:00
Vadim Zeitlin
6fe190576e wxSpinCtrl now sens TEXT_UPDATED events as in wxGTK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 02:12:22 +00:00
George Tasker
58d5bf3ae2 Added code to the RIGHT CLICK popup dialog to show the type:name of the widget/dialog that was right clicked.
Added code to prompt the user for confirmation before deleting an entire DIALOG, to help avoid accidental deletions of the dialog, when the user thought they were deleting a widget.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 00:33:13 +00:00
George Tasker
e89ba6b3ca Added BOUNDING BOX selection of multiple widgets on the dialogs by left clicking and dragging the mouse while holding down the left mouse button to draw a rectangle around the widgets to be selected
Added code to the popup menus to identify which widget/dialog was right clicked
Double clicking an item in the TREE pane will bring up the EDIT PROPERTIES dialog for the widget/dialog that was double clicked.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 00:31:01 +00:00
George Tasker
c0e6654255 Added BOUNDING BOX selection of multiple widgets on the dialogs by left clicking and dragging the mouse while holding down the left mouse button to draw a rectangle around the widgets to be selected
Added code to the popup menus to identify which widget/dialog was right clicked


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-21 00:27:25 +00:00
Václav Slavík
4d5cd6e05d fixed wxTextFile::GuessType assertion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 23:06:40 +00:00
Vadim Zeitlin
98c9fc2d06 compilation fix (?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 18:26:35 +00:00
Vadim Zeitlin
080b749f7d removed SetFont() from DoDrawText
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 18:22:20 +00:00
Vadim Zeitlin
50f7d0a393 2nd part of wxRegConfig fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 17:37:55 +00:00
Vadim Zeitlin
5873607e5c wxPerl doc patches applied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 16:10:46 +00:00
Vadim Zeitlin
0354a70ce8 fix to GetAllCommands ret value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 16:06:03 +00:00
George Tasker
4b9fc37a48 Fixed bug where if the style included wxFRAME_NO_TASKBAR, not all the extended flags were set that were needed to prevent it from showing up on the taskbar were set (specifically WS_EX_TOOLWINDOW), and the frame still showed on the taskbar
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 15:18:52 +00:00
Vadim Zeitlin
09f50eb328 fix for wxRegConfig::GetNextGroup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 14:41:17 +00:00
Vadim Zeitlin
f5f4c6ce36 compilation fix for !PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 14:20:26 +00:00
Vadim Zeitlin
162437627a merged fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 14:18:00 +00:00
Vadim Zeitlin
7212f3c176 warning fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-20 14:10:50 +00:00
George Tasker
4f8fccd11a When deleting an entire dialog in DialogEditor by right clicking and choosing DELETE from the popup menu, you are presented with an ARE YOU SURE message. This prevents the tradgedy of thinking you right clicked a widget, when you actually right clicked the dialog, and then you accidentally delete your unsaved dialog.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 17:25:19 +00:00
Vadim Zeitlin
d9a50173fb wxFTP docs update and a small fix to wxString overview (Unicode *is* supported
now!)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 17:24:47 +00:00
George Tasker
4158c64a7e Left Double clicking a widget (not a dialog) in the left hand TREE pane will now pop up the EDIT PROPERTIES dialog for the widget
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 17:22:46 +00:00
Vadim Zeitlin
2e907fab47 tons of wxFTP fixes and compilation fix for wxBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 16:56:27 +00:00
Vadim Zeitlin
dda88f5eee fix for a crash in ~wxFontList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 13:52:57 +00:00
David Webster
deb63b954b Palette code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 03:10:11 +00:00
George Tasker
1378f26027 Fixed the popup menus when you right click a widget.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-19 02:00:47 +00:00
Vadim Zeitlin
76e23cdba3 compilation fixes for wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 23:49:58 +00:00
Vadim Zeitlin
7826e2dd83 wxNativeFontInfo changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 21:15:16 +00:00
Vadim Zeitlin
accb325754 fixed compilation warning about variable being clobbered by fork
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 21:00:05 +00:00
David Webster
442275372d Additions to help Fonts compile clean and add SetPS impelementation to wxRegion for OS2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 20:06:39 +00:00
David Webster
e7ffb21b6b VisualAge V3.0 does not understand lowercase, "true", "false"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 20:05:51 +00:00
David Webster
377771d93a Update to allow new wxNativeFontInfo stuff to compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 20:04:50 +00:00
Vadim Zeitlin
afaee31547 fix to parse the new GNOME .keys files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 16:16:30 +00:00
Vadim Zeitlin
fa762db4ed fixed compilation problems (mismatch between header and cpp)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 15:50:03 +00:00
David Webster
8d854fa93f Lots of OS/2 fixes mostly to do with painting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 05:34:25 +00:00
David Webster
702c190d47 OS2 Statusbar fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 05:33:30 +00:00
David Webster
5a56a532f2 Fixes mostly to do with painting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 05:32:32 +00:00
David Webster
141ddc08d6 OS2RGB def fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 05:31:33 +00:00
Vadim Zeitlin
c7ce8392e0 wxMimeTypesManager now supports creating associations as well as querying
them (MSW only, thanks to Chris Elliott)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 04:48:37 +00:00
Vadim Zeitlin
189e08b45a minor fixes for the font info patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 03:54:25 +00:00
Vadim Zeitlin
30764ab524 applied wxNativeFontInfo patch from Derry Bryson (with minor changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-18 01:00:25 +00:00
Vadim Zeitlin
a9c317d27c check the first radio button in a group
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-16 23:12:09 +00:00
Robert Roebling
47c93b637e Applied colour patch for better 8-bit support,
Improved handling of inserting controls into
    a toolbar that don't have any def width. This
    works for all controls but wxComboBox.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-16 12:27:26 +00:00
Robert Roebling
0a07a7d852 Added wxCommandEvent::IsSeection for listbox,
Applied patch for wxListBox::Set when sorting
  Added new value rounding code (corrected for
    negative values) to scrollbar and slider
  Added ...TEXT_CHANGED event to wxSpinCtrl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-16 10:02:47 +00:00
Vadim Zeitlin
186837b05e added -mt switch for Solaris/CC MT builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-15 15:22:18 +00:00
Vadim Zeitlin
9318daf2b7 *really* fixed problem with window menu translation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-14 23:23:58 +00:00
Vadim Zeitlin
ef7a25a73e merged in fix for GetValue() from the 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-14 15:48:30 +00:00
Vadim Zeitlin
beed393c67 patch for not calling wxEntryCleanup() from a DLL applied
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-13 20:38:37 +00:00
Vadim Zeitlin
aa44b26115 fix for MSWDetachWindowMenu when "&Window" string is translated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-13 16:18:26 +00:00
Vadim Zeitlin
6d14cac77d merged fix from 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-12 14:33:15 +00:00
David Webster
bdce924e12 old def file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-12 04:49:26 +00:00
David Webster
3526dff094 new def file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-12 04:48:58 +00:00
David Webster
15f03b25a6 Brush updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-12 04:47:28 +00:00
Vadim Zeitlin
730fc65465 updated version from Stephane Junique
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-11 15:26:30 +00:00
David Webster
e99762c031 Font updates for OS/2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-12-11 04:36:46 +00:00
437 changed files with 2058 additions and 378038 deletions

2058
include/wx/defs.h Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +0,0 @@
.emacs.desktop
MANIFEST
build
build.local
dist
licence
temp
update.log

View File

@@ -1,271 +0,0 @@
Building wxPython on Unix or Unix-like Systems
----------------------------------------------
The basic steps for building wxPython for Unix or Unix-like systems
are:
1. Compile and/or install glib and gtk+
2. Compile and/or install wxGTK
3. Compile and install wxPython
We'll go into more detail of each of these steps below, but first a
few bits of background information on tools.
I use a tool called SWIG (http://www.swig.org) to help generate the
C++ sources used in the wxPython extension module. However you don't
need to have SWIG unless you want to modify the *.i files. If you do
you'll want to have version 1.1-883 of SWIG and you'll need to change
a flag in the setup.py script as described below.
I use the new Python Distutils tool to build wxPython. It is included
with Python 2.0, but if you want to use Python 1.5.2 or 1.6 then
you'll need to download and install Distutils 1.0 from
http://www.python.org/sigs/distutils-sig/
I usually use RedHat Linux when working on the wxGTK version of
wxPython, but I occasionally build and test on Solaris and I hope to
be able to add some other platforms soon. The compiler I use is
whatever comes with the current version of RedHat I am using. I find
that there are less portability problems with the RPMs if I don't try
using the latest and greatest compilers all the time. On the other
platforms I usually stick with as recent a version of GCC that I can
find pre-built for that platform.
Okay, now on the the fun stuff...
1. Compile and/or install glib and gtk+
---------------------------------------
A. First of all, check and see if you've already got glib/gtk+ on your
system, all the Linux distributions I know of come with it, at
least as an option. Look for libglib.* and libgtk.* in your system's
standard library directories. You'll also need the headers and
config scripts in order to build things that use glib/gtk. Try
running gtk-config:
gtk-config --version
If you have version 1.2.5 or better then you're all set. You can
skip to step #2.
B. If your system has a binary package mechanism, (RPMs, debs,
whatever...) check and see if binaries for glib abd gtk+ are
available. Be sure to get the runtime library package as well as
the development package, if they are separate. Install them with
your package tool, and skip to step #2.
C. If all else fails, you can get the source code for glib and gtk+ at
http://www.gtk.org/. Fetch the latest of each in the 1.2.x
series. Compile and install each of them like this:
gzip -d [package].tar.gz | tar xvf -
cd [package]
./configure
make
make install
The last step will probably have to be done as root. Also, if your
system needs anything done to update the dynamic loader for shared
libraries, (such as running ldconfig on Linux) then do it after
each library is installed.
2. Compile and/or install wxGTK
-------------------------------
A. You can find the sources and RPMs for wxGTK at
ftp://wesley.informatik.uni-freiburg.de/pub/linux/wxxt/source/, or
just follow the download links from http://wxwindows.org/. You can
also check out a current snapshot of the sources from the CVS
server. (Some information about annonymous CVS access is at
http://wxwindows.org/cvs.htm.) The advantage of using CVS is that
you can easily update as soon as the developers check in new
sources or fixes. The advantage of using a released version is
that it usually has had more testing done. You can decide which
method is best for you.
B. You'll usually want to use a version of wxGTK that has the same
version number as the wxPython sources you are using. (Another
advantage of using CVS is that you'll get both at the same time.)
C. If using the RPMs be sure to get both the wxGTK and wxGTK-devel
RPMs (at a minimum) and then install them as root.
rpm -Uhv wxGTK-2.2.2-0.i386.rpm wxGTK-devel-2.2.2-0.i386.rpm
D. If using the sources (either from the tarball or from CVS) then
configure it like this:
cd wxWindows # or whatever your top-level directory is called
mkdir build
cd build
../configure --with-gtk
There are gobs and gobs of options for the configure script, run
../configure --help to see them all. I'll describe some that I find
useful here.
If you have OpenGL or compatible libraries installed, then add the
--with-opengl flag.
If you are on Solaris and are using a recent version of GCC, then
you'll probably want to add the --enable-permissive flag so the
compiler won't barf on your broken X11 header files.
To make a debugging version of wxGTK, add the --enable-debug flag.
This sets the -g flag for the compiler and also activates some
special debugging code in wxWindows by defining the __WXDEBUG__
macro. You'll get some extra asserts, failure logging, etc.
To make a static library and not make a shared library, use the
--disable-shared and --enable-static flags.
E. Now just compile and install. You need to use GNU make, so if your
system has something else get GNU make and build and install it and
use it instead of your system's default make command.
make
make install
The last step will probably have to be done as root. Also, if your
system needs anything done to update the dynamic loader for shared
libraries, (such as running ldconfig on Linux) then do it now.
F. You can test your build by changing to one of the directories under
build/samples or build/demos, running make and then running the
executable that is built.
3. Compile and install wxPython
-------------------------------
A. You have the same options (and same advantages/disadvantages) for
getting the wxPython source, either a released snapshot or from
CVS. The released version file is named wxPython-[version].tar.gz
and is available at http://wxpython.org/download.php. If you want
to use CVS you'll find wxPython in the wxWindows CVS tree (see
above) in the wxWindows/wxPython directory.
B. As mentioned previouslly, wxPython is built with the standard
Python Distutils tool. If you are using Python 2.0 or later you
are all set, otherwise you need to download and install Distutils
1.0 from http://www.python.org/sigs/distutils-sig/.
On Unix systems Distutils figures out what commands and flags to
use for the compiler and linker by looking in the Makefile that was
used to build Python itself. Most of the time this works okay. If
it doesn't, there doesn't seem to be a way to override the values
that Distutils uses without hacking either Distutils itself, or
Python's Makefile. (Complain to the distutils-sig about this
please.) For example, on my Solaris system I had to edit
/usr/local/lib/python1.5/config/Makefile and replace
LDSHARED=ld -G
with
LDSHARED=gcc -G
This particular problem has been fixed in Python 1.6 and beyond,
but there may be similar issues on other platforms.
While we're on the subject of how Python was built... Since
wxPython is a C++ extension some platforms and/or compilers will
require that the Python executable was linked with the C++ linker
in order for everything to work correctly. If you build and
install Python yourself then this is easy to take care of,
otherwise you may have to mess with binary packages or bribe your
system administrator...
In my case on Solaris wxPython applications would core dump on
exit. The core file indicated that the fault happened after
_exit() was called and the run-time was trying to execute cleanup
code. After relinking the Python executable the problem went away.
To build Python to link with the C++ linker do this:
cd Python-2.0 # wherever the root of the source tree is
rm python # in case it's still there from an old build
make LINKCC=g++ # or whatever your C++ command is
make install
C. Change to the root wxPython directory and look at the setup.py
file. This is the script that configures and defines all the
information that Distutils needs to build wxPython. There are some
options near the begining of the script that you may want or need
to change based on your system and what options you have selected
up to this point, (sources from tar.gz or from CVS, etc.) You can
either change these flags directly in setup.py or supply them on
the command-line.
BUILD_GLCANVAS Set to zero if you don't want to build the
Open GL canvas extension module. If you don't
have OpenGL or compatible libraries then you'll
need to set this to zero.
BUILD_OGL Set to zero if you don't want to build the
Object Graphics Library extension module.
BUILD_STC Set to zero if you don't want to build the
wxStyledTextCtrl (the Scintilla wrapper)
extension module.
USE_SWIG If you have edited any of the *.i files you
will need to set this flag to non-zero so SWIG
will be executed to regenerate the wrapper C++
and shadow python files.
IN_CVS_TREE If you are using the CVS version of the
wxWindows and wxPython sources then you will
need to set this flag to non-zero. This is
needed because some source files from the
wxWindows tree are copied to be under the
wxPython tree in order to keep Distutils happy.
With this flag set then setup.py will
automatically keep these copied sources up to
date if the original version is ever updated.
If you are using the tar.gz version of the
Python sources then these copied sources are
already present in your source tree.
D. To build and install wxPython you simply need to execute the
setup.py script. If you have more than one version of Python
installed, be sure to execute setup.py with the version you want to
build wxPython for. Depending on the permissions on your
site-packages directory you may need to be root to run the install
command.
python setup.py build
python setup.py install
E. At this point you should be able to change into the wxPython/demo
directory and run the demo:
python demo.py
F. If you would like to make a test build that doesn't overwrite the
installed version of wxPython you can do so with this command
instead of the install command above:
python setup.py build_ext --inplace
This will build the wxPython package in the local wxPython
directory instead of installing it under your Python installation.
To run using this test version just add the base wxPython source
directory to the PYTHONPATH:
export PYTHONPATH=~/projects/wxWindows/wxPython
# or whatever is required for your shell
cd ~/projects/wxWindows/wxPython/demo
python demo.py
That's all folks!
-----------------
robin@alldunn.com

View File

@@ -1,281 +0,0 @@
Building wxPython on Win32
--------------------------
Building wxPython for use on win32 systems is a fairly simple process
consisting of just a few steps. However depending on where you get
your sources from and what your desired end result is, there are
several permutations of those steps. At a high level the basic steps
are:
1. Get the wxWindows sources
2. Build the wxWindows DLL
3. Get the wxPython sources
4. Build and Install wxPython
We'll go into more detail of each of these steps below, but first a
few bits of background information on tools.
I use a tool called SWIG (http://www.swig.org) to help generate the
C++ sources used in the wxPython extension module. However you don't
need to have SWIG unless you want to modify the *.i files. If you do
you'll want to have version 1.1-883 of SWIG and you'll need to change
a flag in the setup.py script as described below.
I use the new Python Distutils tool to build wxPython. It is included
with Python 2.0, but if you want to use Python 1.5.2 or 1.6 then
you'll need to download and install Distutils 1.0 from
http://www.python.org/sigs/distutils-sig/
I use Microsoft Visual C++ 6.0 (5.0 with the service packs should work
also) to compile the wxPython C++ sources. Since I am using Distutils
it should be easier now to build with other win32 compilers such as
the free mingw32 or Borland compilers, but I havn't tried them yet.
If anybody wants to try it I'll take any required patches for the
setup script and for these instructions.
And now on to the fun stuff...
1. Get the wxWindows sources
----------------------------
A. There are a few possible ways to get sources for wxWindows. You
can download a released version from http://wxwindows.org/ or you
can get current development sources from the CVS server. (Some
information about annonymous CVS access is at
http://wxwindows.org/cvs.htm.) The advantage of using CVS is that
you can easily update as soon as the developers check in new
sources or fixes. The advantage of using a released version is
that it usually has had more testing done. You can decide which
method is best for you.
B. You'll usually want to use wxWindows sources that have the same
version number as the wxPython sources you are using. (Another
advantage of using CVS is that you'll get both at the same time.)
NOTE: There probably isn't going to be an official 2.2.2 release
for wxMSW so I have taken a snapshot of my workspace and made it
available at http://alldunn.com/wxPython/dist/others/
C. Once you get the sources be sure to put them in a path without a
space in it (i.e., NOT c:\Program Files\wx) and set an environment
variable named WXWIN to this directory. For example:
mkdir \wx2
cd \wx2
unzip wxMSW-2.2.2.zip
set WXWIN=c:\wx2
You'll probably want to add that last line to your autoexec.bat or
System Properties depending on the type of system you are on.
D. Change to the wx2\include\wx\msw directory and copy setup0.h to
setup.h and then edit setup.h. This is how you control which parts
of wxWindows are compiled into or left out of the build, simply by
turning options on or off. At a minimum you should set the
following:
wxUSE_NEW_GRID 1
wxUSE_GLOBAL_MEMORY_OPERATORS 0
wxUSE_LIBTIFF 1
wxUSE_GLCANVAS 1
wxDIALOG_UNIT_COMPATIBILITY 0
I also turn off the following as they are not currently used in
wxPython. There are probably others that can be turned off to
help save space, but I havn't investigated all the potential
configurations yet. Please note that wxPython doesn't (yet) check
these flags for its own build, so if you turn off something that
wxPython expects then you'll get link errors later on.
wxUSE_DIALUP_MANAGER 0
wxUSE_DYNLIB_CLASS 0
wxUSE_DOC_VIEW_ARCHITECTURE 0
wxUSE_MDI_ARCHITECTURE 0
wxUSE_PLOT 0
wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
2. Build the wxWindows DLL
---------------------------
A. Although MSVC project files are provided I always use the makefiles
to build wxWindows because by default the flags are compatible with
Python, (and I make sure they stay that way.) You would have to
edit the project files a bit to make it work otherwise.
B. There are three different types of wxWindows DLLs that can be
produced by the VC makefile simply by providing a flag on the nmake
command-line, I call the three types DEBUG, FINAL, and HYBRID.
(The last one is brand new, you'll need my version of the 2.2.2
sources to get the HYBRID capability.) Here are some more details:
DEBUG Specified with "FINAL=0" and produces a DLL named
wx[version]d.dll. This DLL is compiled with full
debugging information and with the __WXDEBUG__ set which
enables some debugging-only code in wxWindows such as
assertions and failure log messages. The /MDd flag is
used which means that it is linked with the debugging
version of the C runtime library and also that you must
use the debugging version of Python, (python_d.exe and
pythonXX_d.dll) which also means that all extensions
loaded by Python should also have the _d in the name.
With this option you can use the MSVC debugger to trace
though the Python interpreter, as well as the code for the
wxPython extension and the wxWindows DLL.
FINAL Specified with "FINAL=1" and produces a DLL named
wx[version].dll. This DLL is compiled with optimizations
turned on and without debugging information and without
__WXDEBUG__. The /MD flag is used which means that you
can use this version with the standard python.exe. This
is the version that I use when making the binary installer
for win32.
HYBRID Specified with "FINAL=hybrid" and produces a DLL named
wx[version]h.dll. This DLL is almost the same as the
DEBUG version except the /MD flag is used which means that
you can use the standard python.exe but you still get the
debugging info and the __WXDEBUG__ code enabled. With the
debugger you can trace through the the code for the
wxPython extension and the wxWindows DLL, but not the
Python interpreter. You might use this version when you
want to deploy a wxPython app with the __WXDEBUG__ code
enabled. I use this mode most of the time during
development simply because it's easier than having to
remember to type python_d all the time.
Since different DLL names and object file directories are used you
can build all three types if you like.
C. Change to the wx2\src\msw directory and type the following command,
using the value for FINAL that you want:
nmake -f makefile.vc dll pch USE_GLCANVAS=1 FINAL=hybrid
Your machine will then crunch away for possibly a long time,
depending on your hardware, and when it's done you should have a
DLL and some library files in \wx2\lib.
D. You'll either need to add \wx2\lib to the PATH or copy the DLL file
to a directory already on the PATH so the DLL can be found at runtime.
E. You can test your build by changing to one of the directories under
\wx2\samples or \wx2\demos and typing (using the right FINAL flag):
nmake -f makefile.vc FINAL=hybrid WXUSINGDLL=1
and then executing the resulting .exe file.
3. Get the wxPython sources
---------------------------
A. You have the same options (and same advantages/disadvantages) for
getting the wxPython source, either a released snapshot or from
CVS. The released version file is named wxPython-[version].tar.gz
and is available at http://wxpython.org/download.php. You can use
WinZip to unpack it if you don't have tar and gzip. If you want to
use CVS you'll find wxPython in the wxWindows CVS tree (see above)
in the wxWindows/wxPython directory.
4. Build and Install wxPython
-----------------------------
A. As mentioned previouslly, wxPython is built with the standard
Python Distutils tool. If you are using Python 2.0c1 or later you
are all set, otherwise you need to download and install Distutils
1.0 from http://www.python.org/sigs/distutils-sig/.
B. Change to the root wxPython directory and look at the setup.py
file. This is the script that configures and defines all the
information that Distutils needs to build wxPython. There are some
options near the begining of the script that you may want or need
to change based on what options you have selected up to this point,
(type of DLL built, sources from tar.gz or from CVS, etc.) You can
either change these flags directly in setup.py or supply them on
the command-line.
BUILD_GLCANVAS Set to zero if you don't want to build the
Open GL canvas extension module.
BUILD_OGL Set to zero if you don't want to build the
Object Graphics Library extension module.
BUILD_STC Set to zero if you don't want to build the
wxStyledTextCtrl (the Scintilla wrapper)
extension module.
USE_SWIG If you have edited any of the *.i files you
will need to set this flag to non-zero so SWIG
will be executed to regenerate the wrapper C++
and shadow python files.
IN_CVS_TREE If you are using the CVS version of the
wxWindows and wxPython sources then you will
need to set this flag to non-zero. This is
needed because some source files from the
wxWindows tree are copied to be under the
wxPython tree in order to keep Distutils happy.
With this flag set then setup.py will
automatically keep these copied sources up to
date if the original version is ever updated.
If you are using the tar.gz version of the
Python sources then these copied sources are
already present in your source tree.
C. To build and install wxPython you simply need to execute the
setup.py script. If you have more than one version of Python
installed, be sure to execute setup.py with the version you want to
build wxPython for.
Depending on what kind of wxWindows DLL you built there are
different command-line parameters you'll want to pass to setup (in
addition to possibly one or more of the above):
FINAL: python setup.py install
DEBUG: python setup.py build --debug install
HYBRID: python setup.py HYBRID=1 install
D. At this point you should be able to change into the wxPython\demo
directory and run the demo:
python demo.py
E. If you would like to make a test build that doesn't overwrite the
installed version of wxPython you can do so with one of these
commands instead of the install command above:
FINAL: python setup.py build_ext --inplace
DEBUG: python setup.py build_ext --debug --inplace
HYBRID: python setup.py HYBRID=1 build_ext --inplace
This will build the wxPython package in the local wxPython
directory instead of installing it under your Python installation.
To run using this test version just add the base wxPython source
directory to the PYTHONPATH:
set PYTHONPATH=c:\wx2\wxPython
cd c:\wx2\wxPython\demo
python demo.py
That's all folks!
-----------------
robin@alldunn.com

View File

@@ -1,757 +0,0 @@
CHANGES.txt for wxPython
----------------------------------------------------------------------
2.3b1
-----
New typemaps for wxString when compiling for Python 2.0 and beyond
that allow Unicode objects to be passed as well as String objects. If
a Unicode object is passed PyString_AsStringAndSize is used to convert
it to a wxString using the default encoding.
Fixed the generic buttons so tool tips work for them.
Fixed a bug in the demo's tree control.
Added a listbox to the listbox demo that shows how to find items with
a patching prefix as keys are typed.
Added code to the wxListCtrl demo to show how to get text from a
column in report mode.
Added code to the toolbar demo to clear the long help from the status
bar after 2 seconds.
Added wxJoystick.
Fixed wxTimer so it can be used as described in the docs, either with
a Notify method in a subclass, or sending an event to a wxEvtHandler
object, (usually a window.)
Added wxNotifyEvent.Allow()
Fixed GOBS of reference leaks.
New in 2.2.2
------------
Significantly changed how the wxStyledtextCtrl code that wraps
Scintilla is implemented. Most of it is now automatically generated
from an interface definition file provided by Scintilla. This means
that it will be much easier to stay in sync with new Scintilla
releases, but also means that some of the method and identifier names
have changed. See wxPython/demo/data/stc.h for a copy of the C++
interface from which the Python interface is generated. There is now
some inline documentation in that file that should really help explain
how things work.
I am now using the Python Distutils to build wxPython and to make some
of the distribution files. (See http://www.python.org/sigs/distutils-sig/)
This means no more messing with my kludgy build.py/Makefile hack,
builds will be more consistent with other Python extensions that also
use Distutils, and will hopefully make wxPython easier to build for
platforms where there have been troubles before. If you are building
wxPython for Python 1.5.2 or for 1.6, then you will need to get and
install version 1.0 of Distutils from the website above. If you are
using Python 2.0 then you already have it.
Added wxInputStream and the wxFileSystem family of classes,
contributed by Joerg Baumann.
Added wxProcess and support for it to wxExecute. wxProcess lets you
get notified when an asyncronous child process terminates, and also to
get input/output streams for the child process's stdout, stderr and
stdin.
Removed the old python sizers.
Added __add__, __sub__ and __cmp__ (equality check only) for wxPoint
and wxRealPoint.
Changed the build to make one big extension module instead of one for
the core and each contrib. This allowed me to do away with the
libwxPyHelpers.so on unix systems.
Lots of little fixes here and there.
Some hacks on wxGTK to try and make the AutoComplete listbox in the
wxStyledTextCtrl to behave better. It's still not as nice as on
wxMSW, but at least it's a bit more usable now.
New in 2.2.1
------------
Various tweaks, fixes, missing methods, etc.
Added example use of wxTaskBarIcon to the demo.
New in 2.2.0
------------
Added wxLog and friends.
Added wxFrame.ShowFullScreen for MSW.
Added PyShellWindow to the wxPython.lib package.
New in 2.1.16
-------------
Added an attribute named labelDelta to the generic buttons that
specifies how far to offset the label when the button is in the
depressed state.
Added wxTipProvider and friends. See the demo for an example.
wxGrid can now change the cell highlight colour.
Added wxDragImage.
Fixed printing on wxGTK.
Added wxDateTime, wxTimeSpan, and wxDateSpan to wxPython.utils.
Added wxCalendarCtrl.
WARNING: A while back I asked what should be done about the Magic
Method Names. (Methods that are automatically turned into event
handlers by virtue of their name.) The consensus was that it is more
confusing to have them than to try and expand them to have greater
coverage. I am finally getting around to removing the code that
generates the event binding. This means that if you are using any of
the following method names without a EVT_* call that you need to
modify your code to add the EVT_* to hook the event to the method.
OnChar
OnSize
OnEraseBackground
OnSysColourChanged
OnInitDialog
OnPaint
OnIdle
OnActivate
OnMenuHighlight
OnCloseWindow
OnScroll
Added wxSpinCtrl.
New in 2.1.15
-------------
Fixed wxTreeCtrl.HitTest to return both the tree item as well as the
flags that clairify where the click was in relation to the item.
Fixed thread state problem in wxTreeCtrl.GetBoundingBox and
GetSelections.
Fixed some problems in OGL. Also wxShape.SetClientData and
.GetClientData can now deal with Python objects.
Added wxListCtrl.SortItems and changed the demo to show how to use it.
Plugged a memory leak.
Wrapped the new wxGrid and friends. The old wxGrid class is no longer
available. There are some incompatibilities, and unfortunately the
new classes are not documented yet, (however the methods are more
consistent with each other now so you may be able to guess pretty
good...)
Updated filebrowsebutton.py and calendar.py with changes from their
authors. There is now a FileBrowseButtonWithHistory class (what a
mouthful!) and wxCalendar has printing support.
Added ActiveXWrapper to the library, and some good demos of it too.
It works great for embedding a COM (a.k.a OCX, a.k.a ActiveX) control
in a window and calling its methods. It actually creates a new class
on the fly that derives from wxWindow, the COM CoClass and others
needed to make it all work. The resulting class can be instantiated
just like wxWindow, used in sizers, etc. It also responds to all COM
method calls, properties, etc., and if the class or a mix-in has
matching method names, then the COM events will be propogated back to
them.
Created a typemap that allows a string to be used for parameters
expecting a wxColour type. The string is either a colour name as
defined in the wxColourDatabase, or a colour spec of the form
"#RRGGBB". See the wxStyledTextCtrl demo for an example.
I almost forgot to mention the wxStyledTextCtrl! Yes, the
wxStyledTextCtrl is finally in wxPython!! (And the crowd goes
wild...) There's no documentaTion yet (the crowd boos and hisses...)
but I've included a very readable source file in the
wxPython/demo/data directory, a couple fairly good examples, and you
can also refer to the Scintilla documentaion at
http://www.scintilla.org/ScintillaDoc.html to help fill in the gaps
until the docs are done. (The croud murmers contentedly as the tool
provider smiles convincingly and removes his flame-proof suit.)
What's new in 2.1.13
--------------------
Skipped a version number to match what has been released for wxGTK.
Updated wxMVCTree and added a demo for it, also fixed layout on GTK
and some flicker problems.
Added a wrapper class for the Visualization ToolKit (or VTK) in the
wxPython.lib.vtk module. (http://www.kitware.com/)
Fixed wxTreeCtrl.SetItemImage and GetItemImage to recognise the new
"which" parameter.
Added wxPython.lib.spashscreen from Mike Fletcher.
Added wxPython.lib.filebrowsebutton also from Mike Fletcher.
Renamed wxTreeCtrl.GetParent to GetItemParent to avoid a name clash
with wxWindow.GetParent.
Added wxIntersectRect to compute the intersection of two wxRect's.
It is used like this:
intersect = wxIntersectRect(rect1, rect2)
If r1 and r2 don't intersect then None is returned, otherwise the
rectangle representing the intersection is returned.
Some bug fixes for Clipboard and Drag-n-Drop.
Rotated text!!! WooHoo! (See wxDC.DrawRotatedText())
Added a set of Generic Buttons to the library. These are simple
window classes that look and act like native buttons, but you can have
a bit more control over them. The bezel width can be set in addition
to colours, fonts, etc. There is a ToggleButton as well as Bitmap
versions too. They should also serve as a good example of how to
create your own classes derived from wxControl.
The C++ wxToolBar classes have been redone, and so have the wxPython
wrappers. There have been slight modifications to some of the methods
but shouldn't impact anybody too much. I took the opportunity to add
support for setting user data on each toolbar tool. The new AddTool
methods look like this:
def AddTool(ID,
bitmap,
pushedBitmap = wxNullBitmap,
toggle = FALSE,
clientData = NULL,
shortHelpString = "",
longHelpString = "")
def AddSimpleTool(ID,
bitmap,
shortHelpString = "",
longHelpString = "",
toggle=FALSE)
There are also coresponding InsertTool and InsertSimpleTool methods
that additionally take an integer position as the first parameter.
Added a wrapper for the new PCX and TIFF ImageHandlers.
wxRect now simulates attributes named left, right, top and bottom.
Removed all non wx stuff from the glcanvas module since DA's PyOpenGL
is better and compatible with the wxGLCanvas. You can get it at
http://starship.python.net:9673/crew/da/Code/PyOpenGL.
Added some missing EVT_ functions.
Added Dirk Holtwic's editor classes to the wxPython.lib.editor
package.
Changed all the "LIST" parameter names to "choices" to match the docs.
More fixes for the wxFloatBar, and it now works on wxGTK even better
than wxMSW! (The feat is accomplished by using the wxTB_DOCKABLE
style flag instead of trying to float it ourselves.)
What's new in 2.1.11
--------------------
Skipped a few version numbers so wxMSW, wxGTK and wxPython are all
syncronized.
wxImage.SetData now makes a copy of the image data before giving it to
wxImage. I mistakenly thought that wxImage would copy the data
itself.
Fixed wxMSW's notebook so the pages get their size set as they are
being added. This should remove the need for our
wxNotebook.ResizeChildren hack.
wxPanels now support AutoLayout, and wxNotebooks and wxSplitterWindows
no longer tell their children to Layout() themselves. This will
probably only effect you if you have a wxWindow with AutoLayout inside
a notebook or splitter. If so, either change it to a wxPanel or add
an EVT_SIZE handler that calls Layout().
Fixed deadlock problem that happened when using threads.
Added new HTML printing classes.
Added wxWindow.GetHandle
Apparently wxMouseEvent.Position has been depreciated in wxWindows as
it is no longer available by default. You can use GetPositionTuple
(returning a tuple with x,y) instead, or GetPosition (returning a
wxPoint.)
Added wxPostEvent function that allows events to be posted and then
processed later. This is a thread-safe way to interact with the GUI
thread from other threads.
Added Clipboard and Drag-and-Drop classes.
Added wxFontEnumerator.
Many updates to wxMenu, wxMenuBar.
wxPyEvent and wxPyCommandEvent derived classes now give you the actual
Python object in the event handler instead of a new shadow.
Added a Calendar widget from Lorne White to the library.
Made some fixes to the wxFloatbar. It still has some troubles on
wxGTK...
Added an MVC tree control from Bryn Keller to the library.
What's new in 2.1.5
-------------------
This is a quick bug-fix release to take care of a few nasties that
crept in at the last minute before 2.1.4 was called done. No new
major features.
What's new in 2.1.4
--------------------
This release is NOT syncronized with a snapshot release of wxGTK or
wxMSW. For MSW this isn't much of a problem since you can get the
binaries from the web site. For other platforms you'll have to build
wxGTK from CVS. (See http://web.ukonline.co.uk/julian.smart/wxwin/cvs.htm)
To get the same set of sources from CVS that I used, checkout using
the wxPy-2-1-4 tag.
Now back to what's new...
Much more support for event-less callbacks and add-on modules.
Created add-on module with wxOGL classes.
Added wxWindow.GetChildren(). Be careful of this. It returns a *copy*
of the list of the window's children. While you are using the list if
anything changes in the real list (a child is deleted, etc.) then the
list you are holding will suddenly have window references to garbage
memory and your app will likely crash. But if you are careful it works
great!
Added a bunch of new and missing methods to wxTreeCrtl. The
SortChildren method is now supported, but currently only for the
default sort order.
Added typemaps for wxSize, wxPoint, wxRealPoint, and wxRect that allow
either the actual objects or Python sequence values to be used. For
example, the following are equivallent:
win = wxWindow(parent, size = wxSize(100, 100))
win = wxWindow(parent, size = (100, 100))
Super-charged the wxHtml module. You can now create your own tag
handlers and also have access to the parser and cell classes. There
is a tag handler in the library at wxPython.lib.wxpTag that
understands the WXP tag and is able to place wxPython windows on HTML
pages. See the demo for an example.
A bunch of the methods of wxMenuBar were previously ifdef'd out for
wxGTK. Added them back in since the methods exist now.
Wrapped the wxHtmlHelpController and related classes.
Wrapped the C++ versions of wxSizer and friends. The Python-only
versions are still in the library, but depreciated. (You will get a
warning message if you try to use them, but the warning can be
disabled.) The usage of the C++ versions is slightly different, and
the functionality of wxBorderSizer is now part of wxBoxSizer. I have
added a few methods to wxSizer to try and make the transition as
smooth as possible, I combined all Add methods into a single method
that handles all cases, added an AddMany method, etc. One step I did
not take was to make the default value of flag in the Add method be
wxGROW. This would have made it more backward compatible, but less
portable to and from wxWin C++ code. Please see the docs and demo for
further details.
Added wxPyEvent and wxPyCommandEvent classes, derived from wxEvent and
wxCommandEvent. Each of them has SetPyData and GetPyData methods that
accept or return a single Python object. You can use these classes
directly or derive from them to create your own types of event objects
that can pass through the wxWindows event system without loosing their
Python parts (as long as they are stored with SetPyData.) Stay tuned
for more info and examples in future releases.
Added wxPython.lib.grids as an example of how to derive a new sizer
from the C++ sizers. In this module you will find wxGridSizer and
wxFlexGridSizer. wxGridSizer arrainges its items in a grid in which
all the widths and heights are the same. wxFlexgridSizer allows
different widths and heights, and you can also specify rows and/or
columns that are growable. See the demo for a couple examples for how
to use them.
Added the wxValidator class, and created a class named wxPyValidator
that should be used for the base class of any Python validators. See
the demo for an example. Please note that you MUST implement a Clone
method in your validator classes because of the way some things work
in the underlying C++ library. I did not add wxTextValidator because
of some issues of how it transfers data to and from a wxString, which
in wxPython is automatically translated to and from Python strings, so
there would never be a concrete wxString that would hang around long
enough for the validator to do its job. On the other hand, it should
be real easy to duplicate the functionality of wxTextValidator in a
pure Python class derived from wxPyValidator.
I've finally added a feature that has been on my list for close to two
years! Ever wondered what that zero is for when you create your app
object? Well now you can leave it out or explicitly set it to a true
value. This value now controls what is to be done with sys.stdout and
sys.stderr. A false value leaves them alone, and a true value sets
them to an instance of wxPyOnDemandOutputWindow. (On windows the
default is true, on unix platforms the default is false.) This class
creates a frame containing a wxTextCtrl as soon as anything is written
to sys.stdout or sys.stderr. If you close the window it will come
back again the next time something is written. (You can call
app.RestoreStdio to turn this off.) If you would rather that the stdio be
redirected to a file, you can provide a second parameter to your app
object's constructor that is a filename. If you want to use your own
class instead of wxPyOnDemandOutputWindow you can either implement
RedirectStdio() in you app class or change the value of
wxApp.outputWindowClass like this:
class MyApp(wxApp):
outputWindowClass = MyClass
def OnInit(self):
frame = MyFrame()
self.SetTopWindow(frame)
return true
Please see the implementation of wxPyOnDemandOutputWindow and wxApp in
wx.py for more details. A few words of caution: if you are running
your app in a debugger, changing sys.stdout and sys.stderr is likely
to really screw things up.
Added wxCaret. Unfortunately it's author has still not documented it
in the wxWindows docs...
Some new 3rd party contributions in wxPython.lib. PyShell, in
shell.py is an interesting implementaion of an interactive Python
shell in wxWindows. floatbar.py has a class derived from wxToolBar
that can sense mouse drags and then reparent itself into another
frame. Moving the new frame close to where it came from puts the tool
bar back into the original parent. (Unfortunately there is currently
a bug in wxGTK's wxFrame.SetToolBar so the FloatBar has some
problems...)
What's new in 2.1b3
--------------------
This release is syncronized with release 2.1 snapshot 9 of wxWindows.
Switched to using SWIG from CVS (see http://swig.cs.uchicago.edu/cvs.html)
for some of the new features and such. Also they have encorporated my
patches so there is really no reason to stick with the current (very
old) release... This version of SWIG gives the following new
features:
1. Keyword arguments. You no longer have to specify all the
parameters with defaults to a method just to specify a
non-default value on the end. You can now do this instead:
win = wxWindow(parent, -1, style = mystyle)
2. There is now an an equivalence between Python's None and C++'s
NULL. This means that any methods that might return NULL will
now return None and you can use none where wxWindows might be
expecting NULL. This makes things much more snake-ish.
There is a new build system based on a new Python program instead of
raw makefiles. Now wxPython builds are virtually the same on MSW or
Unix systems. See the end of this file for new build instructions and
see distrib/build.py for more details.
wxDC.Bilt now includes the useMask parameter, and has been split into
two different versions. wxDC.BlitXY is like what was there before and
takes raw coordinants and sizes, and the new wxDC.Blit is for the new
interface using wxPoints and a wxSize.
What's new in 2.1b2
--------------------
Added the missing wxWindow.GetUpdateRegion() method.
Made a new change in SWIG (update your patches everybody) that
provides a fix for global shadow objects that get an exception in
their __del__ when their extension module has already been deleted.
It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
line 496 if you want to do it by hand.
It is now possible to run through MainLoop more than once in any one
process. The cleanup that used to happen as MainLoop completed (and
prevented it from running again) has been delayed until the wxc module
is being unloaded by Python.
I fixed a bunch of stuff in the C++ version of wxGrid so it wouldn't
make wxPython look bad.
wxWindow.PopupMenu() now takes a wxPoint instead of x,y. Added
wxWindow.PopupMenuXY to be consistent with some other methods.
Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
You can now provide your own app.MainLoop method. See
wxPython/demo/demoMainLoop.py for an example and some explaination.
Got the in-place-edit for the wxTreeCtrl fixed and added some demo
code to show how to use it.
Put the wxIcon constructor back in for GTK as it now has one that
matches MSW's.
Added wxGrid.GetCells
Added wxSystemSettings static methods as functions with names like
wxSystemSettings_GetSystemColour.
Removed wxPyMenu since using menu callbacks have been depreciated in
wxWindows. Use wxMenu and events instead.
Added alternate wxBitmap constructor (for MSW only) as
wxBitmapFromData(data, type, width, height, depth = 1)
Added a helper function named wxPyTypeCast that can convert shadow
objects of one type into shadow objects of another type. (Like doing
a down-cast.) See the implementation in wx.py for some docs.
Fixed wxImage GetData and SetData to properly use String objects for
data transfer.
Added access methods to wxGridEvent.
New Makefile/Setup files supporting multiple dynamic extension modules
for unix systems.
Fixes for the wxGLCanvas demo to work around a strange bug in gtk.
SWIG support routines now compiled separately instead of being bundled
in wx.cpp.
What's new in 2.1b1
--------------------
Fixed wxComboBox.SetSelection so that it actually sets the selected
item. (Actually just removed it from wxPython and let it default to
wxChoice.SetSelection which was already doing the right thing.)
Added the Printing Framework.
Switched back to using the wxWindows DLL for the pre-built Win32
version. The problem was needing to reinitialize static class info
data after loading each extension module.
Lots of little tweaks and additions to reflect changes to various
wxWindows classes.
Fixed a bug with attaching objects to tree items. Actually was a
symptom of a larger problem with not obtaining the interpreter lock
when doing any Py_DECREFs.
wxSizer and friends. Sizers are layout tools that manage a colection
of windows and sizers. Different types of sizers apply different
types of layout algorithms. You saw it here first! These classes are
not even in the wxWindows C++ library yet!
What's new in 2.0b9
-------------------
Bug fix for ListCtrl in test4.py (Was a missing file... DSM!)
Bug fix for occassional GPF on Win32 systems upon termination of a
wxPython application.
Added wxListBox.GetSelections returning selections as a Tuple.
Added a wxTreeItemData that is able to hold any Python object and be
associated with items in a wxTreeCtrl. Added test pytree.py to show
this feature off.
Added wxSafeYield function.
OpenGL Canvas can be optionally compiled in to wxPython.
Awesome new Demo Framework for showing off wxPython and for learning
how it all works.
The pre-built Win32 version is no longer distributing the wxWindows
DLL. It is statically linked with the wxWindows library instead.
Added a couple missing items from the docs.
Added wxImage, wxImageHandler, wxPNGHandler, wxJPEGHandler,
wxGIFHandler and wxBMPHandler.
Added new methods to wxTextCtrl.
Fixed some problems with how SWIG was wrapping some wxTreeCtrl
methods.
What's new in 2.0b8
-------------------
Support for using Python threads in wxPython apps.
Several missing methods from various classes.
Various bug fixes.
What's new in 2.0b7
-------------------
Added DLG_PNT and DLG_SZE convienience methods to wxWindow class.
Added missing constructor and other methods for wxMenuItem.
What's new in 2.0b6
-------------------
Just a quickie update to fix the self-installer to be compatible with
Python 1.5.2b2's Registry settings.
What's new in 2.0b5
-------------------
Well obviously the numbering scheme has changed. I did this to
reflect the fact that this truly is the second major revision of
wxPython, (well the third actually if you count the one I did for
wxWindows 1.68 and then threw away...) and also that it is associated
with the 2.0 version of wxWindows.
I have finally started documenting wxPython. There are several pages
in the wxWindows documentation tree specifically about wxPython, and I
have added notes within the class references about where and how wxPython
diverges from wxWindows.
Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
window handle. If you can get the window handle into the python code,
it should just work... More news on this later.
Added wxImageList, wxToolTip.
Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
wxRegConfig class.
As usual, some bug fixes, tweaks, etc.
What's new in 0.5.3
-------------------
Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
Various cleanup, tweaks, minor additions, etc. to maintain
compatibility with the current wxWindows.
What's new in 0.5.0
-------------------
Changed the import semantics from "from wxPython import *" to "from
wxPython.wx import *" This is for people who are worried about
namespace pollution, they can use "from wxPython import wx" and then
prefix all the wxPython identifiers with "wx."
Added wxTaskbarIcon for wxMSW.
Made the events work for wxGrid.
Added wxConfig.
Added wxMiniFrame for wxGTK.
Changed many of the args and return values that were pointers to gdi
objects to references to reflect changes in the wxWindows API.
Other assorted fixes and additions.
What's new in 0.4.2
-------------------
wxPython on wxGTK works!!! Both dynamic and static on Linux and
static on Solaris have been tested. Many thanks go to Harm
<H.v.d.Heijden@phys.tue.nl> for his astute detective work on tracking
down a nasty DECREF bug. Okay so I have to confess that it was just a
DSM (Dumb Stupid Mistake) on my part but it was nasty none the less
because the behavior was so different on different platforms.
The dynamicly loaded module on Solaris is still segfaulting, so it
must have been a different issue all along...
What's New in 0.4
-----------------
1. Worked on wxGTK compatibility. It is partially working. On a
Solaris/Sparc box wxPython is working but only when it is statically
linked with the Python interpreter. When built as a dyamically loaded
extension module, things start acting weirdly and it soon seg-faults.
And on Linux both the statically linked and the dynamically linked
version segfault shortly after starting up.
2. Added Toolbar, StatusBar and SplitterWindow classes.
3. Varioius bug fixes, enhancements, etc.
----------------------------------------------------------------------

View File

@@ -1,92 +0,0 @@
include *.txt
include my_distutils.py
## include my_install_data.py
include licence/*.txt
include demo/*.py
include demo/bitmaps/*.bmp
include demo/bitmaps/*.ico
include demo/bitmaps/*.gif
include demo/bitmaps/*.png
include demo/bitmaps/*.jpg
include demo/README.txt
include demo/*.xml
include demo/data/*.png
include demo/data/*.htm
include demo/data/*.html
include demo/data/*.bmp
include demo/data/*.txt
include demo/data/*.i
include demo/data/*.h
include demo/data/*.py
include wxPython/lib/*.py
include wxPython/lib/*.txt
include wxPython/lib/editor/*.py
include wxPython/lib/editor/*.txt
exclude wxPython/*
exclude tests
exclude SWIG
include src/*.i
include src/*.py
include src/*.cpp
include src/*.c
include src/*.h
include src/*.ico
include src/*.rc
include src/msw/*.cpp
include src/msw/*.h
include src/msw/*.py
include src/gtk/*.cpp
include src/gtk/*.h
include src/gtk/*.py
# src/motif/*.cpp
# src/motif/*.h
# src/motif/*.py
include contrib/glcanvas/*.i
include contrib/glcanvas/*.py
include contrib/glcanvas/*.cpp
include contrib/glcanvas/*.c
include contrib/glcanvas/*.h
include contrib/glcanvas/msw/*.cpp
include contrib/glcanvas/msw/*.h
include contrib/glcanvas/msw/*.py
include contrib/glcanvas/gtk/*.cpp
include contrib/glcanvas/gtk/*.h
include contrib/glcanvas/gtk/*.py
include contrib/ogl/*.txt
include contrib/ogl/*.i
include contrib/ogl/*.py
include contrib/ogl/*.cpp
include contrib/ogl/*.c
include contrib/ogl/*.h
include contrib/ogl/contrib/include/wx/ogl/*.h
include contrib/ogl/contrib/src/ogl/*.cpp
include contrib/stc/*.txt
include contrib/stc/*.i
include contrib/stc/*.py
include contrib/stc/*.cpp
include contrib/stc/*.c
include contrib/stc/*.h
include contrib/stc/*.cpp
include contrib/stc/*.py
include contrib/stc/contrib/include/wx/stc/*.h
include contrib/stc/contrib/src/stc/*.h
include contrib/stc/contrib/src/stc/*.cpp
include contrib/stc/contrib/src/stc/*.txt
include contrib/stc/contrib/src/stc/*.py
include contrib/stc/contrib/src/stc/*.in
include contrib/stc/contrib/src/stc/scintilla/include/*.h
include contrib/stc/contrib/src/stc/scintilla/include/*.iface
include contrib/stc/contrib/src/stc/scintilla/src/*.h
include contrib/stc/contrib/src/stc/scintilla/src/*.cxx

View File

@@ -1,85 +0,0 @@
wxPython README
---------------
Welcome to the wonderful world of wxPython!
Once you have installed the wxPython extension module, you can try it
out by going to the [install dir]\wxPython\demo directory and typing:
python demo.py
There are also some other sample files there for you to play with and
learn from.
If you selected to install the documentation then point your browser
to [install dir]\wxPython\docs\index.htm and you will then be looking
at the docs for wxWindows. For the most part you can use the C++ docs
as most classes and methods are used identically. Where there are
differences they are documented with a "wxPython Note."
On Win32 systems the binary self-installer creates a program group on
the Start Menu that contains a link to running the demo and a link to
the help file. To help you save disk space I'm now using Microsoft's
HTML Help format. If your system doesn't know what to do with the help
file, you can install the HTML Help Viewer as part of IE 4+, NT
Service Pack 4+, or the HTML Workshop at
http://msdn.microsoft.com/workshop/author/htmlhelp/download.asp.
For some features, the latest common controls library from microsoft
is required. You can get this by installing IE 5.0 or Office 2000.
You can also get it independently from here:
http://download.microsoft.com/download/platformsdk/Comctl32/5.80.2614.3600/W9XNT4/EN-US/50comupd.exe
Windows 95 users may also need the WinSock 2.0 and OpenGL libraries.
These can be found at these sites:
http://www.microsoft.com/windows95/downloads/contents/wuadmintools/s_wunetworkingtools/w95sockets2/default.asp
http://www.opengl.org/Downloads/Downloads.html
Getting Help
------------
Since wxPython is a blending of multiple technologies, help comes from
multiple sources. See the http://wxPython.org/ for details on various
sources of help, but probably the best source is the wxPython-users
mail list. You can view the archive or subscribe by going to
http://lists.sourceforge.net/mailman/listinfo/wxpython-users
Or you can send mail directly to the list using this address:
wxpython-users@lists.sourceforge.net
Other Info
----------
Please also see the following files in this directory:
CHANGES.txt Information about new features, fixes, etc. in
each release.
BUILD.unix.txt Instructions for building wxPython on various
Unix-like platforms.
BUILD.win32.txt Instructions for building wxPython on Windows.
licence/* Text of the wxWindows license.
-----------------
Robin Dunn
robin@alldunn.com

View File

@@ -1,6 +0,0 @@
Some minor tweaks were made to these files to allow wxPython to build
with Python 1.6. Just put these in your swig_lib/python dir and
you'll be all set. These are from SWIG 1.1-810, (yes, I am a bit
behind.)

View File

@@ -1,32 +0,0 @@
#include <string.h>
#include <stdlib.h>
/* Definitions for Windows/Unix exporting */
#if defined(__WIN32__)
# if defined(_MSC_VER)
# define SWIGEXPORT(a) __declspec(dllexport) a
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
#else
# define SWIGEXPORT(a) a
#endif
#include "Python.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void SWIG_MakePtr(char *, void *, char *);
extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
extern char *SWIG_GetPtr(char *, void **, char *);
extern char *SWIG_GetPtrObj(PyObject *, void **, char *);
extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
extern PyObject *SWIG_newvarlink(void);
#ifdef __cplusplus
}
#endif

View File

@@ -1,561 +0,0 @@
//
// SWIG Typemap library
// Dave Beazley
// May 5, 1997
//
// Python implementation
//
// This library provides standard typemaps for modifying SWIG's behavior.
// With enough entries in this file, I hope that very few people actually
// ever need to write a typemap.
//
// Disclaimer : Unless you really understand how typemaps work, this file
// probably isn't going to make much sense.
//
#ifdef AUTODOC
%section "Typemap Library (Python)",info,after,pre,nosort,skip=1,chop_left=3,chop_right=0,chop_top=0,chop_bottom=0
%text %{
%include typemaps.i
The SWIG typemap library provides a language independent mechanism for
supporting output arguments, input values, and other C function
calling mechanisms. The primary use of the library is to provide a
better interface to certain C function--especially those involving
pointers.
%}
#endif
// ------------------------------------------------------------------------
// Pointer handling
//
// These mappings provide support for input/output arguments and common
// uses for C/C++ pointers.
// ------------------------------------------------------------------------
// INPUT typemaps.
// These remap a C pointer to be an "INPUT" value which is passed by value
// instead of reference.
#ifdef AUTODOC
%subsection "Input Methods"
%text %{
The following methods can be applied to turn a pointer into a simple
"input" value. That is, instead of passing a pointer to an object,
you would use a real value instead.
int *INPUT
short *INPUT
long *INPUT
unsigned int *INPUT
unsigned short *INPUT
unsigned long *INPUT
unsigned char *INPUT
float *INPUT
double *INPUT
To use these, suppose you had a C function like this :
double fadd(double *a, double *b) {
return *a+*b;
}
You could wrap it with SWIG as follows :
%include typemaps.i
double fadd(double *INPUT, double *INPUT);
or you can use the %apply directive :
%include typemaps.i
%apply double *INPUT { double *a, double *b };
double fadd(double *a, double *b);
%}
#endif
%typemap(python,in) double *INPUT(double temp)
{
temp = PyFloat_AsDouble($source);
$target = &temp;
}
%typemap(python,in) float *INPUT(float temp)
{
temp = (float) PyFloat_AsDouble($source);
$target = &temp;
}
%typemap(python,in) int *INPUT(int temp)
{
temp = (int) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) short *INPUT(short temp)
{
temp = (short) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) long *INPUT(long temp)
{
temp = (long) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) unsigned int *INPUT(unsigned int temp)
{
temp = (unsigned int) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) unsigned short *INPUT(unsigned short temp)
{
temp = (unsigned short) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) unsigned long *INPUT(unsigned long temp)
{
temp = (unsigned long) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) unsigned char *INPUT(unsigned char temp)
{
temp = (unsigned char) PyInt_AsLong($source);
$target = &temp;
}
%typemap(python,in) signed char *INPUT(signed char temp)
{
temp = (unsigned char) PyInt_AsLong($source);
$target = &temp;
}
// OUTPUT typemaps. These typemaps are used for parameters that
// are output only. The output value is appended to the result as
// a list element.
#ifdef AUTODOC
%subsection "Output Methods"
%text %{
The following methods can be applied to turn a pointer into an "output"
value. When calling a function, no input value would be given for
a parameter, but an output value would be returned. In the case of
multiple output values, they are returned in the form of a Python tuple.
int *OUTPUT
short *OUTPUT
long *OUTPUT
unsigned int *OUTPUT
unsigned short *OUTPUT
unsigned long *OUTPUT
unsigned char *OUTPUT
float *OUTPUT
double *OUTPUT
A Python List can also be returned by using L_OUTPUT instead of OUTPUT.
For example, suppose you were trying to wrap the modf() function in the
C math library which splits x into integral and fractional parts (and
returns the integer part in one of its parameters).K:
double modf(double x, double *ip);
You could wrap it with SWIG as follows :
%include typemaps.i
double modf(double x, double *OUTPUT);
or you can use the %apply directive :
%include typemaps.i
%apply double *OUTPUT { double *ip };
double modf(double x, double *ip);
The Python output of the function would be a tuple containing both
output values.
%}
#endif
// Helper function for List output
%{
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
if (!target) {
target = o;
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
PyList_Append(target, o2);
Py_XDECREF(o2);
}
PyList_Append(target,o);
Py_XDECREF(o);
}
return target;
}
%}
// Force the argument to be ignored.
%typemap(python,ignore) int *L_OUTPUT(int temp),
short *L_OUTPUT(short temp),
long *L_OUTPUT(long temp),
unsigned int *L_OUTPUT(unsigned int temp),
unsigned short *L_OUTPUT(unsigned short temp),
unsigned long *L_OUTPUT(unsigned long temp),
unsigned char *L_OUTPUT(unsigned char temp),
signed char *L_OUTPUT(signed char temp),
float *L_OUTPUT(float temp),
double *L_OUTPUT(double temp)
{
$target = &temp;
}
%typemap(python,argout) int *L_OUTPUT,
short *L_OUTPUT,
long *L_OUTPUT,
unsigned int *L_OUTPUT,
unsigned short *L_OUTPUT,
unsigned long *L_OUTPUT,
unsigned char *L_OUTPUT,
signed char *L_OUTPUT
{
PyObject *o;
o = PyInt_FromLong((long) (*$source));
l_output_helper($target,o);
}
%typemap(python,argout) float *L_OUTPUT,
double *L_OUTPUT
{
PyObject *o;
o = PyFloat_FromDouble((double) (*$source));
$target = l_output_helper($target,o);
}
// These typemaps contributed by Robin Dunn
//----------------------------------------------------------------------
//
// T_OUTPUT typemap (and helper function) to return multiple argouts as
// a tuple instead of a list.
//
// Author: Robin Dunn
//----------------------------------------------------------------------
%{
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
target = o;
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
if (!PyTuple_Check(target)) {
o2 = target;
target = PyTuple_New(1);
PyTuple_SetItem(target, 0, o2);
}
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o2 = target;
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
Py_DECREF(o3);
}
return target;
}
%}
// Force the argument to be ignored.
%typemap(python,ignore) int *T_OUTPUT(int temp),
short *T_OUTPUT(short temp),
long *T_OUTPUT(long temp),
unsigned int *T_OUTPUT(unsigned int temp),
unsigned short *T_OUTPUT(unsigned short temp),
unsigned long *T_OUTPUT(unsigned long temp),
unsigned char *T_OUTPUT(unsigned char temp),
float *T_OUTPUT(float temp),
double *T_OUTPUT(double temp)
{
$target = &temp;
}
%typemap(python,argout) int *T_OUTPUT,
short *T_OUTPUT,
long *T_OUTPUT,
unsigned int *T_OUTPUT,
unsigned short *T_OUTPUT,
unsigned long *T_OUTPUT,
unsigned char *T_OUTPUT
{
PyObject *o;
o = PyInt_FromLong((long) (*$source));
$target = t_output_helper($target, o);
}
%typemap(python,argout) float *T_OUTPUT,
double *T_OUTPUT
{
PyObject *o;
o = PyFloat_FromDouble((double) (*$source));
$target = t_output_helper($target, o);
}
// Set the default output typemap
#ifdef OUTPUT_LIST
%typemap(python,ignore) int *OUTPUT = int *L_OUTPUT;
%typemap(python,ignore) short *OUTPUT = short *L_OUTPUT;
%typemap(python,ignore) long *OUTPUT = long *L_OUTPUT;
%typemap(python,ignore) unsigned *OUTPUT = unsigned *L_OUTPUT;
%typemap(python,ignore) unsigned short *OUTPUT = unsigned short *L_OUTPUT;
%typemap(python,ignore) unsigned long *OUTPUT = unsigned long *L_OUTPUT;
%typemap(python,ignore) unsigned char *OUTPUT = unsigned char *L_OUTPUT;
%typemap(python,ignore) signed char *OUTPUT = signed char *L_OUTPUT;
%typemap(python,ignore) double *OUTPUT = double *L_OUTPUT;
%typemap(python,ignore) float *OUTPUT = float *L_OUTPUT;
%typemap(python,argout) int *OUTPUT = int *L_OUTPUT;
%typemap(python,argout) short *OUTPUT = short *L_OUTPUT;
%typemap(python,argout) long *OUTPUT = long *L_OUTPUT;
%typemap(python,argout) unsigned *OUTPUT = unsigned *L_OUTPUT;
%typemap(python,argout) unsigned short *OUTPUT = unsigned short *L_OUTPUT;
%typemap(python,argout) unsigned long *OUTPUT = unsigned long *L_OUTPUT;
%typemap(python,argout) unsigned char *OUTPUT = unsigned char *L_OUTPUT;
%typemap(python,argout) signed char *OUTPUT = signed char *L_OUTPUT;
%typemap(python,argout) double *OUTPUT = double *L_OUTPUT;
%typemap(python,argout) float *OUTPUT = float *L_OUTPUT;
#else
%typemap(python,ignore) int *OUTPUT = int *T_OUTPUT;
%typemap(python,ignore) short *OUTPUT = short *T_OUTPUT;
%typemap(python,ignore) long *OUTPUT = long *T_OUTPUT;
%typemap(python,ignore) unsigned *OUTPUT = unsigned *T_OUTPUT;
%typemap(python,ignore) unsigned short *OUTPUT = unsigned short *T_OUTPUT;
%typemap(python,ignore) unsigned long *OUTPUT = unsigned long *T_OUTPUT;
%typemap(python,ignore) unsigned char *OUTPUT = unsigned char *T_OUTPUT;
%typemap(python,ignore) signed char *OUTPUT = signed char *T_OUTPUT;
%typemap(python,ignore) double *OUTPUT = double *T_OUTPUT;
%typemap(python,ignore) float *OUTPUT = float *T_OUTPUT;
%typemap(python,argout) int *OUTPUT = int *T_OUTPUT;
%typemap(python,argout) short *OUTPUT = short *T_OUTPUT;
%typemap(python,argout) long *OUTPUT = long *T_OUTPUT;
%typemap(python,argout) unsigned *OUTPUT = unsigned *T_OUTPUT;
%typemap(python,argout) unsigned short *OUTPUT = unsigned short *T_OUTPUT;
%typemap(python,argout) unsigned long *OUTPUT = unsigned long *T_OUTPUT;
%typemap(python,argout) unsigned char *OUTPUT = unsigned char *T_OUTPUT;
%typemap(python,argout) signed char *OUTPUT = signed char *T_OUTPUT;
%typemap(python,argout) double *OUTPUT = double *T_OUTPUT;
%typemap(python,argout) float *OUTPUT = float *T_OUTPUT;
#endif
// INOUT
// Mappings for an argument that is both an input and output
// parameter
#ifdef AUTODOC
%subsection "Input/Output Methods"
%text %{
The following methods can be applied to make a function parameter both
an input and output value. This combines the behavior of both the
"INPUT" and "OUTPUT" methods described earlier. Output values are
returned in the form of a Python tuple. To return a Python list,
using L_INOUT instead.
int *INOUT
short *INOUT
long *INOUT
unsigned int *INOUT
unsigned short *INOUT
unsigned long *INOUT
unsigned char *INOUT
float *INOUT
double *INOUT
For example, suppose you were trying to wrap the following function :
void neg(double *x) {
*x = -(*x);
}
You could wrap it with SWIG as follows :
%include typemaps.i
void neg(double *INOUT);
or you can use the %apply directive :
%include typemaps.i
%apply double *INOUT { double *x };
void neg(double *x);
Unlike C, this mapping does not directly modify the input value (since
this makes no sense in Python). Rather, the modified input value shows
up as the return value of the function. Thus, to apply this function
to a Python variable you might do this :
x = neg(x)
Note : previous versions of SWIG used the symbol 'BOTH' to mark
input/output arguments. This is still supported, but will be slowly
phased out in future releases.
%}
#endif
%typemap(python,in) int *INOUT = int *INPUT;
%typemap(python,in) short *INOUT = short *INPUT;
%typemap(python,in) long *INOUT = long *INPUT;
%typemap(python,in) unsigned *INOUT = unsigned *INPUT;
%typemap(python,in) unsigned short *INOUT = unsigned short *INPUT;
%typemap(python,in) unsigned long *INOUT = unsigned long *INPUT;
%typemap(python,in) unsigned char *INOUT = unsigned char *INPUT;
%typemap(python,in) float *INOUT = float *INPUT;
%typemap(python,in) double *INOUT = double *INPUT;
%typemap(python,argout) int *INOUT = int *OUTPUT;
%typemap(python,argout) short *INOUT = short *OUTPUT;
%typemap(python,argout) long *INOUT = long *OUTPUT;
%typemap(python,argout) unsigned *INOUT = unsigned *OUTPUT;
%typemap(python,argout) unsigned short *INOUT = unsigned short *OUTPUT;
%typemap(python,argout) unsigned long *INOUT = unsigned long *OUTPUT;
%typemap(python,argout) unsigned char *INOUT = unsigned char *OUTPUT;
%typemap(python,argout) float *INOUT = float *OUTPUT;
%typemap(python,argout) double *INOUT = double *OUTPUT;
%typemap(python,in) int *T_INOUT = int *INPUT;
%typemap(python,in) short *T_INOUT = short *INPUT;
%typemap(python,in) long *T_INOUT = long *INPUT;
%typemap(python,in) unsigned *T_INOUT = unsigned *INPUT;
%typemap(python,in) unsigned short *T_INOUT = unsigned short *INPUT;
%typemap(python,in) unsigned long *T_INOUT = unsigned long *INPUT;
%typemap(python,in) unsigned char *T_INOUT = unsigned char *INPUT;
%typemap(python,in) float *T_INOUT = float *INPUT;
%typemap(python,in) double *T_INOUT = double *INPUT;
%typemap(python,argout) int *T_INOUT = int *T_OUTPUT;
%typemap(python,argout) short *T_INOUT = short *T_OUTPUT;
%typemap(python,argout) long *T_INOUT = long *T_OUTPUT;
%typemap(python,argout) unsigned *T_INOUT = unsigned *T_OUTPUT;
%typemap(python,argout) unsigned short *T_INOUT = unsigned short *T_OUTPUT;
%typemap(python,argout) unsigned long *T_INOUT = unsigned long *T_OUTPUT;
%typemap(python,argout) unsigned char *T_INOUT = unsigned char *T_OUTPUT;
%typemap(python,argout) float *T_INOUT = float *T_OUTPUT;
%typemap(python,argout) double *T_INOUT = double *T_OUTPUT;
%typemap(python,in) int *L_INOUT = int *INPUT;
%typemap(python,in) short *L_INOUT = short *INPUT;
%typemap(python,in) long *L_INOUT = long *INPUT;
%typemap(python,in) unsigned *L_INOUT = unsigned *INPUT;
%typemap(python,in) unsigned short *L_INOUT = unsigned short *INPUT;
%typemap(python,in) unsigned long *L_INOUT = unsigned long *INPUT;
%typemap(python,in) unsigned char *L_INOUT = unsigned char *INPUT;
%typemap(python,in) float *L_INOUT = float *INPUT;
%typemap(python,in) double *L_INOUT = double *INPUT;
%typemap(python,argout) int *L_INOUT = int *L_OUTPUT;
%typemap(python,argout) short *L_INOUT = short *L_OUTPUT;
%typemap(python,argout) long *L_INOUT = long *L_OUTPUT;
%typemap(python,argout) unsigned *L_INOUT = unsigned *L_OUTPUT;
%typemap(python,argout) unsigned short *L_INOUT = unsigned short *L_OUTPUT;
%typemap(python,argout) unsigned long *L_INOUT = unsigned long *L_OUTPUT;
%typemap(python,argout) unsigned char *L_INOUT = unsigned char *L_OUTPUT;
%typemap(python,argout) float *L_INOUT = float *L_OUTPUT;
%typemap(python,argout) double *L_INOUT = double *L_OUTPUT;
// Backwards compatibility
%typemap(python,in) int *BOTH = int *INOUT;
%typemap(python,in) short *BOTH = short *INOUT;
%typemap(python,in) long *BOTH = long *INOUT;
%typemap(python,in) unsigned *BOTH = unsigned *INOUT;
%typemap(python,in) unsigned short *BOTH = unsigned short *INOUT;
%typemap(python,in) unsigned long *BOTH = unsigned long *INOUT;
%typemap(python,in) unsigned char *BOTH = unsigned char *INOUT;
%typemap(python,in) float *BOTH = float *INOUT;
%typemap(python,in) double *BOTH = double *INOUT;
%typemap(python,argout) int *BOTH = int *INOUT;
%typemap(python,argout) short *BOTH = short *INOUT;
%typemap(python,argout) long *BOTH = long *INOUT;
%typemap(python,argout) unsigned *BOTH = unsigned *INOUT;
%typemap(python,argout) unsigned short *BOTH = unsigned short *INOUT;
%typemap(python,argout) unsigned long *BOTH = unsigned long *INOUT;
%typemap(python,argout) unsigned char *BOTH = unsigned char *INOUT;
%typemap(python,argout) float *BOTH = float *INOUT;
%typemap(python,argout) double *BOTH = double *INOUT;
%typemap(python,in) int *T_BOTH = int *T_INOUT;
%typemap(python,in) short *T_BOTH = short *T_INOUT;
%typemap(python,in) long *T_BOTH = long *T_INOUT;
%typemap(python,in) unsigned *T_BOTH = unsigned *T_INOUT;
%typemap(python,in) unsigned short *T_BOTH = unsigned short *T_INOUT;
%typemap(python,in) unsigned long *T_BOTH = unsigned long *T_INOUT;
%typemap(python,in) unsigned char *T_BOTH = unsigned char *T_INOUT;
%typemap(python,in) float *T_BOTH = float *T_INOUT;
%typemap(python,in) double *T_BOTH = double *T_INOUT;
%typemap(python,argout) int *T_BOTH = int *T_INOUT;
%typemap(python,argout) short *T_BOTH = short *T_INOUT;
%typemap(python,argout) long *T_BOTH = long *T_INOUT;
%typemap(python,argout) unsigned *T_BOTH = unsigned *T_INOUT;
%typemap(python,argout) unsigned short *T_BOTH = unsigned short *T_INOUT;
%typemap(python,argout) unsigned long *T_BOTH = unsigned long *T_INOUT;
%typemap(python,argout) unsigned char *T_BOTH = unsigned char *T_INOUT;
%typemap(python,argout) float *T_BOTH = float *T_INOUT;
%typemap(python,argout) double *T_BOTH = double *T_INOUT;
// --------------------------------------------------------------------
// Special types
//
// --------------------------------------------------------------------
#ifdef AUTODOC
%subsection "Special Methods"
%text %{
The typemaps.i library also provides the following mappings :
PyObject *
When a PyObject * appears as either an input value or return
value of a function, SWIG passes it through unmodified. Thus,
if you want to write a C function that operates on PyObjects,
it is easy to write. For example :
%include typemaps.i
PyObject *spam(PyObject *obj1, int n);
Unlike normal Python wrapper functions, These functions can
use any combination of parameters that you wish.
%}
#endif
// If a PyObject * appears as either an argument or a function return
// value, simply pass it straight through.
%typemap(python,in) PyObject * {
$target = $source;
}
%typemap(python,out) PyObject * {
$target = $source;
}

View File

@@ -1,53 +0,0 @@
#!/bin/sh
if [ "$1" = "15" ]; then
PYVER=1.5
shift
elif [ "$1" = "20" ]; then
PYVER=2.0
shift
fi
SETUP="python$PYVER -u setup.py"
FLAGS="USE_SWIG=1 IN_CVS_TREE=1"
OTHERFLAGS=""
# "c" --> clean
if [ "$1" = "c" ]; then
shift
CMD="$SETUP $FLAGS $OTHERFLAGS clean"
OTHERCMD="rm -f wxPython/*.so"
# "i" --> install
elif [ "$1" = "i" ]; then
shift
CMD="$SETUP build $OTHERFLAGS install"
# "s" --> source dist
elif [ "$1" = "s" ]; then
shift
CMD="$SETUP $OTHERFLAGS sdist"
# "r" --> rpm dist
elif [ "$1" = "r" ]; then
shift
CMD="$SETUP $OTHERFLAGS bdist_rpm"
# (no command arg) --> normal build for development
else
CMD="$SETUP $FLAGS $OTHERFLAGS build_ext --inplace $*"
fi
echo $CMD
$CMD
if [ "$OTHERCMD" != "" ]; then
echo $OTHERCMD
$OTHERCMD
fi

View File

@@ -1,62 +0,0 @@
@echo off
setlocal
set FLAGS=USE_SWIG=1 IN_CVS_TREE=1
rem Use non-default python?
iff "%1" == "15" .or. "%1" == "20" then
set SETUP=c:\tools\python%1%\python.exe -u setup.py
shift
else
set SETUP=python -u setup.py
endiff
rem "c" --> clean
iff "%1" == "c" then
shift
set CMD=%SETUP% %FLAGS% clean
set OTHERCMD=del wxPython\*.pyd
rem just remove the *.pyd's
elseiff "%1" == "d" then
shift
set CMD=del wxPython\*.pyd
rem "i" --> install
elseiff "%1" == "i" then
shift
set CMD=%SETUP% build install
rem "s" --> source dist
elseiff "%1" == "s" then
shift
set CMD=%SETUP sdist
rem "f" --> FINAL
elseiff "%1" == "f" then
shift
set CMD=%SETUP% %FLAGS% FINAL=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
rem "h" --> HYBRID
elseiff "%1" == "h" then
shift
set CMD=%SETUP% %FLAGS% HYBRID=1 build_ext --inplace %1 %2 %3 %4 %5 %6 %7 %8 %9
rem (no command arg) --> normal build for development
else
set CMD=%SETUP% %FLAGS% HYBRID=0 build_ext --inplace --debug %1 %2 %3 %4 %5 %6 %7 %8 %9
endiff
echo %CMD%
%CMD%
iff "%OTHERCMD%" != "" then
echo %OTHERCMD%
%OTHERCMD%
endiff

View File

@@ -1 +0,0 @@
update.log

View File

@@ -1,3 +0,0 @@
These sub directories contain add-on modules that are not part of the
core wxPython, either because of licensing issues, optional code in
wxWindows, contrib code in wxWindows, or whatever.

View File

@@ -1,14 +0,0 @@
*.exp
*.lib
*.obj
*.pch
Makefile
Makefile.pre
Setup
build.local
config.c
glcanvas.h
glcanvasc.ilk
glcanvasc.pyd
sedscript

View File

@@ -1,128 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: glcanvas.i
// Purpose: SWIG definitions for the OpenGL wxWindows classes
//
// Author: Robin Dunn
//
// Created: 15-Mar-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module glcanvas
%{
#include "helpers.h"
#include <wx/glcanvas.h>
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%extern windows.i
%extern windows2.i
%extern windows3.i
%extern frames.i
%extern _defs.i
%extern misc.i
%extern gdi.i
%extern controls.i
%extern events.i
%{
#if defined(__WXMSW__)
static wxString wxPyEmptyStr("");
static wxPoint wxPyDefaultPosition(-1, -1);
static wxSize wxPyDefaultSize(-1, -1);
#endif
%}
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
class wxPalette;
class wxWindow;
class wxSize;
class wxPoint;
class wxGLCanvas;
//---------------------------------------------------------------------------
class wxGLContext {
public:
wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette = wxNullPalette);
~wxGLContext();
void SetCurrent();
void SetColour(const char *colour);
void SwapBuffers();
#ifdef __WXGTK__
void SetupPixelFormat();
void SetupPalette(const wxPalette& palette);
wxPalette CreateDefaultPalette();
wxPalette* GetPalette();
#endif
wxWindow* GetWindow();
};
//---------------------------------------------------------------------------
%typemap(python, in) int *attribList (int *temp) {
int i;
if (PySequence_Check($source)) {
int size = PyObject_Length($source);
temp = new int[size+1]; // (int*)malloc((size + 1) * sizeof(int));
for (i = 0; i < size; i++) {
temp[i] = PyInt_AsLong(PySequence_GetItem($source, i));
}
temp[size] = 0;
$target = temp;
}
}
%typemap(python, freearg) int *attribList
{
delete [] $source;
}
class wxGLCanvas : public wxScrolledWindow {
public:
wxGLCanvas(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize, long style = 0,
const char* name = "GLCanvas",
int *attribList = NULL,
const wxPalette& palette = wxNullPalette);
%pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
void SetCurrent();
void SetColour(const char *colour);
void SwapBuffers();
wxGLContext* GetContext();
};
//---------------------------------------------------------------------------
%init %{
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

View File

@@ -1,2 +0,0 @@
*~
_glcanvas.cpp

File diff suppressed because it is too large Load Diff

View File

@@ -1,123 +0,0 @@
# This file was created automatically by SWIG.
import glcanvasc
from misc import *
from misc2 import *
from windows import *
from gdi import *
from clip_dnd import *
from events import *
from streams import *
from mdi import *
from frames import *
from stattool import *
from controls import *
from controls2 import *
from windows2 import *
from cmndlgs import *
from windows3 import *
from image import *
from printfw import *
from sizers import *
from filesys import *
from utils import *
import wx
class wxGLContextPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,glcanvasc=glcanvasc):
if self.thisown == 1 :
glcanvasc.delete_wxGLContext(self)
def SetCurrent(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
return val
def SetColour(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
return val
def SwapBuffers(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
return val
def SetupPixelFormat(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetupPixelFormat,(self,) + _args, _kwargs)
return val
def SetupPalette(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetupPalette,(self,) + _args, _kwargs)
return val
def CreateDefaultPalette(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_CreateDefaultPalette,(self,) + _args, _kwargs)
if val: val = wxPalettePtr(val) ; val.thisown = 1
return val
def GetPalette(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_GetPalette,(self,) + _args, _kwargs)
if val: val = wxPalettePtr(val)
return val
def GetWindow(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def __repr__(self):
return "<C wxGLContext instance at %s>" % (self.this,)
class wxGLContext(wxGLContextPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)
self.thisown = 1
class wxGLCanvasPtr(wxScrolledWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def SetCurrent(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
return val
def SetColour(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
return val
def SwapBuffers(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
return val
def GetContext(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
if val: val = wxGLContextPtr(val)
return val
def __repr__(self):
return "<C wxGLCanvas instance at %s>" % (self.this,)
class wxGLCanvas(wxGLCanvasPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
self.thisown = 1
#wx._StdWindowCallbacks(self)
#-------------- FUNCTION WRAPPERS ------------------
#-------------- VARIABLE WRAPPERS ------------------

View File

@@ -1 +0,0 @@
*~

File diff suppressed because it is too large Load Diff

View File

@@ -1,109 +0,0 @@
# This file was created automatically by SWIG.
import glcanvasc
from misc import *
from misc2 import *
from windows import *
from gdi import *
from clip_dnd import *
from events import *
from streams import *
from mdi import *
from frames import *
from stattool import *
from controls import *
from controls2 import *
from windows2 import *
from cmndlgs import *
from windows3 import *
from image import *
from printfw import *
from sizers import *
from filesys import *
from utils import *
import wx
class wxGLContextPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,glcanvasc=glcanvasc):
if self.thisown == 1 :
glcanvasc.delete_wxGLContext(self)
def SetCurrent(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetCurrent,(self,) + _args, _kwargs)
return val
def SetColour(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SetColour,(self,) + _args, _kwargs)
return val
def SwapBuffers(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_SwapBuffers,(self,) + _args, _kwargs)
return val
def GetWindow(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLContext_GetWindow,(self,) + _args, _kwargs)
if val: val = wxWindowPtr(val)
return val
def __repr__(self):
return "<C wxGLContext instance at %s>" % (self.this,)
class wxGLContext(wxGLContextPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(glcanvasc.new_wxGLContext,_args,_kwargs)
self.thisown = 1
class wxGLCanvasPtr(wxScrolledWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def SetCurrent(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_SetCurrent,(self,) + _args, _kwargs)
return val
def SetColour(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_SetColour,(self,) + _args, _kwargs)
return val
def SwapBuffers(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_SwapBuffers,(self,) + _args, _kwargs)
return val
def GetContext(self, *_args, **_kwargs):
val = apply(glcanvasc.wxGLCanvas_GetContext,(self,) + _args, _kwargs)
if val: val = wxGLContextPtr(val)
return val
def __repr__(self):
return "<C wxGLCanvas instance at %s>" % (self.this,)
class wxGLCanvas(wxGLCanvasPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(glcanvasc.new_wxGLCanvas,_args,_kwargs)
self.thisown = 1
#wx._StdWindowCallbacks(self)
#-------------- FUNCTION WRAPPERS ------------------
#-------------- VARIABLE WRAPPERS ------------------

View File

@@ -1,24 +0,0 @@
/* Definitions for Windows/Unix exporting */
#if defined(__WIN32__)
# if defined(_MSC_VER)
# define SWIGEXPORT(a) __declspec(dllexport) a
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
#else
# define SWIGEXPORT(a) a
#endif
#ifdef __cplusplus
extern "C"
#endif
SWIGEXPORT(void) initglcanvasc() {
}

View File

@@ -1,6 +0,0 @@
Makefile
contrib
oglc.exp
oglc.ilk
oglc.pch
oglc.pyd

View File

@@ -1,7 +0,0 @@
Since OGL is not always bundled with distributions of wxWindows, in
order for it to be a standard part of wxPython I need to bundle it
here. The contents of the contrib directory are copies of the
relevant parts of the main contrib directory in wxWindows. The
build.py script in this directory will also build the needed files
from there, so you no longer have to worry about aquiring and building
additional libraries beyond wxWindows itself.

View File

@@ -1,63 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: _ogldefs.i
// Purpose: SWIG definitions for the wxWindows Object Graphics Library
//
// Author: Robin Dunn
//
// Created: 27-Aug-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------
class wxOGLConstraint;
class wxBitmapShape;
class wxDiagram;
class wxDrawnShape;
class wxCircleShape;
class wxCompositeShape;
class wxDividedShape;
class wxDivisionShape;
class wxEllipseShape;
class wxLineShape;
class wxPolygonShape;
class wxRectangleShape;
class wxPseudoMetaFile;
class wxShape;
class wxShapeCanvas;
class wxShapeEvtHandler;
class wxTextShape;
class wxControlPoint;
class wxPyOGLConstraint;
class wxPyBitmapShape;
class wxPyDiagram;
class wxPyDrawnShape;
class wxPyCircleShape;
class wxPyCompositeShape;
class wxPyDividedShape;
class wxPyDivisionShape;
class wxPyEllipseShape;
class wxPyLineShape;
class wxPyPolygonShape;
class wxPyRectangleShape;
class wxPyPseudoMetaFile;
class wxPyShape;
class wxPyShapeCanvas;
class wxPyShapeEvtHandler;
class wxPyTextShape;
class wxPyControlPoint;
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

View File

@@ -1,36 +0,0 @@
wxShapeCanvas = wxPyShapeCanvas
wxShapeEvtHandler = wxPyShapeEvtHandler
wxShape = wxPyShape
wxRectangleShape = wxPyRectangleShape
wxBitmapShape = wxPyBitmapShape
wxDrawnShape = wxPyDrawnShape
wxCompositeShape = wxPyCompositeShape
wxDividedShape = wxPyDividedShape
wxDivisionShape = wxPyDivisionShape
wxEllipseShape = wxPyEllipseShape
wxCircleShape = wxPyCircleShape
wxLineShape = wxPyLineShape
wxPolygonShape = wxPyPolygonShape
wxTextShape = wxPyTextShape
wxControlPoint = wxPyControlPoint
# Stuff these names into the wx namespace so wxPyConstructObject can find them
import wx
wx.wxPyShapeCanvasPtr = wxPyShapeCanvasPtr
wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
wx.wxPyShapePtr = wxPyShapePtr
wx.wxPyRectangleShapePtr = wxPyRectangleShapePtr
wx.wxPyBitmapShapePtr = wxPyBitmapShapePtr
wx.wxPyDrawnShapePtr = wxPyDrawnShapePtr
wx.wxPyCompositeShapePtr = wxPyCompositeShapePtr
wx.wxPyDividedShapePtr = wxPyDividedShapePtr
wx.wxPyDivisionShapePtr = wxPyDivisionShapePtr
wx.wxPyEllipseShapePtr = wxPyEllipseShapePtr
wx.wxPyCircleShapePtr = wxPyCircleShapePtr
wx.wxPyLineShapePtr = wxPyLineShapePtr
wx.wxPyPolygonShapePtr = wxPyPolygonShapePtr
wx.wxPyTextShapePtr = wxPyTextShapePtr
wx.wxShapeRegionPtr = wxShapeRegionPtr
wx.wxOGLConstraintPtr = wxOGLConstraintPtr
wx.wxControlPointPtr = wxPyControlPointPtr

View File

@@ -1,801 +0,0 @@
/*
* FILE : contrib/ogl/ogl.cpp
*
* This file was automatically generated by :
* Simplified Wrapper and Interface Generator (SWIG)
* Version 1.1 (Build 883)
*
* Portions Copyright (c) 1995-1998
* The University of Utah and The Regents of the University of California.
* Permission is granted to distribute this file in any manner provided
* this notice remains intact.
*
* Do not make changes to this file--changes will be lost!
*
*/
#define SWIGCODE
/* Implementation : PYTHON */
#define SWIGPYTHON
#include <string.h>
#include <stdlib.h>
/* Definitions for Windows/Unix exporting */
#if defined(__WIN32__)
# if defined(_MSC_VER)
# define SWIGEXPORT(a) __declspec(dllexport) a
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
#else
# define SWIGEXPORT(a) a
#endif
#include "Python.h"
#ifdef __cplusplus
extern "C" {
#endif
extern void SWIG_MakePtr(char *, void *, char *);
extern void SWIG_RegisterMapping(char *, char *, void *(*)(void *));
extern char *SWIG_GetPtr(char *, void **, char *);
extern char *SWIG_GetPtrObj(PyObject *, void **, char *);
extern void SWIG_addvarlink(PyObject *, char *, PyObject *(*)(void), int (*)(PyObject *));
extern PyObject *SWIG_newvarlink(void);
#ifdef __cplusplus
}
#endif
#define SWIG_init initoglc
#define SWIG_name "oglc"
#include "helpers.h"
#include "oglhelpers.h"
static PyObject* l_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
if (!target) {
target = o;
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
if (!PyList_Check(target)) {
o2 = target;
target = PyList_New(0);
PyList_Append(target, o2);
Py_XDECREF(o2);
}
PyList_Append(target,o);
Py_XDECREF(o);
}
return target;
}
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
PyObject* o2;
PyObject* o3;
if (!target) {
target = o;
} else if (target == Py_None) {
Py_DECREF(Py_None);
target = o;
} else {
if (!PyTuple_Check(target)) {
o2 = target;
target = PyTuple_New(1);
PyTuple_SetItem(target, 0, o2);
}
o3 = PyTuple_New(1);
PyTuple_SetItem(o3, 0, o);
o2 = target;
target = PySequence_Concat(o2, o3);
Py_DECREF(o2);
Py_DECREF(o3);
}
return target;
}
static char* wxStringErrorMsg = "string type is required for parameter";
extern "C" SWIGEXPORT(void) initoglbasicc();
extern "C" SWIGEXPORT(void) initoglshapesc();
extern "C" SWIGEXPORT(void) initoglshapes2c();
extern "C" SWIGEXPORT(void) initoglcanvasc();
#ifdef __cplusplus
extern "C" {
#endif
static PyObject *_wrap_wxOGLInitialize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLInitialize",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
wxOGLInitialize();
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject *_wrap_wxOGLCleanUp(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxOGLCleanUp",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
wxOGLCleanUp();
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyMethodDef oglcMethods[] = {
{ "wxOGLCleanUp", (PyCFunction) _wrap_wxOGLCleanUp, METH_VARARGS | METH_KEYWORDS },
{ "wxOGLInitialize", (PyCFunction) _wrap_wxOGLInitialize, METH_VARARGS | METH_KEYWORDS },
{ NULL, NULL }
};
#ifdef __cplusplus
}
#endif
/*
* This table is used by the pointer type-checker
*/
static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxAcceleratorTable","_class_wxAcceleratorTable",0},
{ "_wxEvent","_class_wxEvent",0},
{ "_class_wxActivateEvent","_wxActivateEvent",0},
{ "_signed_long","_long",0},
{ "_wxMenuEvent","_class_wxMenuEvent",0},
{ "_class_wxProcessEvent","_wxProcessEvent",0},
{ "_class_wxJPEGHandler","_wxJPEGHandler",0},
{ "_class_wxFSFile","_wxFSFile",0},
{ "_wxPyBitmapDataObject","_class_wxPyBitmapDataObject",0},
{ "_wxBitmapDataObject","_class_wxBitmapDataObject",0},
{ "_class_wxPyCommandEvent","_wxPyCommandEvent",0},
{ "_wxBMPHandler","_class_wxBMPHandler",0},
{ "_wxImage","_class_wxImage",0},
{ "_wxFlexGridSizer","_class_wxFlexGridSizer",0},
{ "_wxWindowDisabler","_class_wxWindowDisabler",0},
{ "_class_wxDateTime","_wxDateTime",0},
{ "_wxPrintQuality","_wxCoord",0},
{ "_wxPrintQuality","_int",0},
{ "_wxPrintQuality","_signed_int",0},
{ "_wxPrintQuality","_unsigned_int",0},
{ "_wxPrintQuality","_wxWindowID",0},
{ "_wxPrintQuality","_uint",0},
{ "_wxPrintQuality","_EBool",0},
{ "_wxPrintQuality","_size_t",0},
{ "_wxPrintQuality","_time_t",0},
{ "_class_wxCustomDataObject","_wxCustomDataObject",0},
{ "_wxSpinCtrl","_class_wxSpinCtrl",0},
{ "_wxFontData","_class_wxFontData",0},
{ "_class_wxRegionIterator","_wxRegionIterator",0},
{ "_class_wxPyTextDropTarget","_wxPyTextDropTarget",0},
{ "_class_wxMenuBar","_wxMenuBar",0},
{ "_class_wxPyTreeItemData","_wxPyTreeItemData",0},
{ "_class_wxStaticBoxSizer","_wxStaticBoxSizer",0},
{ "_class_wxEvtHandler","_wxEvtHandler",0},
{ "_wxPaintEvent","_class_wxPaintEvent",0},
{ "_wxGIFHandler","_class_wxGIFHandler",0},
{ "_wxPySizer","_class_wxPySizer",0},
{ "_wxInternetFSHandler","_class_wxInternetFSHandler",0},
{ "_wxPyCompositeShape","_class_wxPyCompositeShape",0},
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_wxPyProcess","_class_wxPyProcess",0},
{ "_wxPyTreeCtrl","_class_wxPyTreeCtrl",0},
{ "_wxImageHandler","_class_wxImageHandler",0},
{ "_class_wxPyRectangleShape","_wxPyRectangleShape",0},
{ "_wxLog","_class_wxLog",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxToolTip","_class_wxToolTip",0},
{ "_wxPNGHandler","_class_wxPNGHandler",0},
{ "_class_wxOGLConstraint","_wxOGLConstraint",0},
{ "_class_wxColourData","_wxColourData",0},
{ "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
{ "_wxPrinter","_class_wxPrinter",0},
{ "_wxPseudoMetaFile","_class_wxPseudoMetaFile",0},
{ "_class_wxArrowHead","_wxArrowHead",0},
{ "_wxPen","_class_wxPen",0},
{ "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
{ "_class_wxNotebookSizer","_wxNotebookSizer",0},
{ "_byte","_unsigned_char",0},
{ "_wxDataObject","_class_wxDataObject",0},
{ "_class_wxPyFontEnumerator","_wxPyFontEnumerator",0},
{ "_wxStaticBox","_class_wxStaticBox",0},
{ "_wxPyDataObjectSimple","_class_wxPyDataObjectSimple",0},
{ "_wxPyDropSource","_class_wxPyDropSource",0},
{ "_wxChoice","_class_wxChoice",0},
{ "_wxSlider","_class_wxSlider",0},
{ "_wxNotebookEvent","_class_wxNotebookEvent",0},
{ "_wxPyPrintout","_class_wxPyPrintout",0},
{ "_wxShapeRegion","_class_wxShapeRegion",0},
{ "_long","_unsigned_long",0},
{ "_long","_signed_long",0},
{ "_wxImageList","_class_wxImageList",0},
{ "_wxDataObjectSimple","_class_wxDataObjectSimple",0},
{ "_wxDropFilesEvent","_class_wxDropFilesEvent",0},
{ "_wxBitmapButton","_class_wxBitmapButton",0},
{ "_wxSashWindow","_class_wxSashWindow",0},
{ "_class_wxSizer","_wxSizer",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxPrintDialogData","_wxPrintDialogData",0},
{ "_wxGridSizer","_class_wxGridSizer",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_class_wxClipboard","_wxClipboard",0},
{ "_class_wxGauge","_wxGauge",0},
{ "_class_wxSashEvent","_wxSashEvent",0},
{ "_wxDC","_class_wxDC",0},
{ "_wxSizerItem","_class_wxSizerItem",0},
{ "_class_wxBitmapDataObject","_wxBitmapDataObject",0},
{ "_wxListEvent","_class_wxListEvent",0},
{ "_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0},
{ "_wxProgressDialog","_class_wxProgressDialog",0},
{ "_class_wxBMPHandler","_wxBMPHandler",0},
{ "_wxPrintPreview","_class_wxPrintPreview",0},
{ "_class_wxFlexGridSizer","_wxFlexGridSizer",0},
{ "_wxSpinEvent","_class_wxSpinEvent",0},
{ "_wxSashLayoutWindow","_class_wxSashLayoutWindow",0},
{ "_wxPyBitmapShape","_class_wxPyBitmapShape",0},
{ "_class_wxPyEllipseShape","_wxPyEllipseShape",0},
{ "_size_t","_wxCoord",0},
{ "_size_t","_wxPrintQuality",0},
{ "_size_t","_time_t",0},
{ "_size_t","_unsigned_int",0},
{ "_size_t","_int",0},
{ "_size_t","_wxWindowID",0},
{ "_size_t","_uint",0},
{ "_class_wxRealPoint","_wxRealPoint",0},
{ "_wxNavigationKeyEvent","_class_wxNavigationKeyEvent",0},
{ "_wxPNMHandler","_class_wxPNMHandler",0},
{ "_wxWindowCreateEvent","_class_wxWindowCreateEvent",0},
{ "_wxLogGui","_class_wxLogGui",0},
{ "_class_wxPyShapeEvtHandler","_wxPyShapeEvtHandler",0},
{ "_class_wxMenuItem","_wxMenuItem",0},
{ "_class_wxPaintEvent","_wxPaintEvent",0},
{ "_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0},
{ "_class_wxStatusBar","_wxStatusBar",0},
{ "_class_wxGIFHandler","_wxGIFHandler",0},
{ "_class_wxPySizer","_wxPySizer",0},
{ "_class_wxPyCompositeShape","_wxPyCompositeShape",0},
{ "_wxPyPolygonShape","_class_wxPyPolygonShape",0},
{ "_class_wxPostScriptDC","_wxPostScriptDC",0},
{ "_wxPanel","_class_wxPanel",0},
{ "_wxInitDialogEvent","_class_wxInitDialogEvent",0},
{ "_wxCheckBox","_class_wxCheckBox",0},
{ "_class_wxPyTreeCtrl","_wxPyTreeCtrl",0},
{ "_wxPyEvent","_class_wxPyEvent",0},
{ "_wxTextCtrl","_class_wxTextCtrl",0},
{ "_class_wxMask","_wxMask",0},
{ "_wxTextDataObject","_class_wxTextDataObject",0},
{ "_class_wxKeyEvent","_wxKeyEvent",0},
{ "_class_wxToolTip","_wxToolTip",0},
{ "_class_wxPNGHandler","_wxPNGHandler",0},
{ "_wxFileConfig","_class_wxFileConfig",0},
{ "_wxColour","_class_wxColour",0},
{ "_class_wxDialog","_wxDialog",0},
{ "_wxBusyCursor","_class_wxBusyCursor",0},
{ "_wxPageSetupDialog","_class_wxPageSetupDialog",0},
{ "_class_wxPrinter","_wxPrinter",0},
{ "_class_wxFileDataObject","_wxFileDataObject",0},
{ "_wxIdleEvent","_class_wxIdleEvent",0},
{ "_class_wxUpdateUIEvent","_wxUpdateUIEvent",0},
{ "_wxToolBar","_class_wxToolBar",0},
{ "_class_wxDataObject","_wxDataObject",0},
{ "_wxCaret","_class_wxCaret",0},
{ "_wxStaticLine","_class_wxStaticLine",0},
{ "_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0},
{ "_wxBrush","_class_wxBrush",0},
{ "_wxMiniFrame","_class_wxMiniFrame",0},
{ "_class_wxNotebookEvent","_wxNotebookEvent",0},
{ "_class_wxPyPrintout","_wxPyPrintout",0},
{ "_wxDataFormat","_class_wxDataFormat",0},
{ "_class_wxDataObjectSimple","_wxDataObjectSimple",0},
{ "_class_wxSashWindow","_wxSashWindow",0},
{ "_wxShowEvent","_class_wxShowEvent",0},
{ "_class_wxPyDivisionShape","_wxPyDivisionShape",0},
{ "_uint","_wxCoord",0},
{ "_uint","_wxPrintQuality",0},
{ "_uint","_time_t",0},
{ "_uint","_size_t",0},
{ "_uint","_unsigned_int",0},
{ "_uint","_int",0},
{ "_uint","_wxWindowID",0},
{ "_wxChar","_char",0},
{ "_wxPyValidator","_class_wxPyValidator",0},
{ "_class_wxEvent","_wxEvent",0},
{ "_wxCheckListBox","_class_wxCheckListBox",0},
{ "_wxSplitterEvent","_class_wxSplitterEvent",0},
{ "_wxRect","_class_wxRect",0},
{ "_wxCommandEvent","_class_wxCommandEvent",0},
{ "_wxPyShapeCanvas","_class_wxPyShapeCanvas",0},
{ "_wxSizeEvent","_class_wxSizeEvent",0},
{ "_class_wxLogWindow","_wxLogWindow",0},
{ "_class_wxImage","_wxImage",0},
{ "_wxPoint","_class_wxPoint",0},
{ "_class_wxWindowDisabler","_wxWindowDisabler",0},
{ "_class_wxSashLayoutWindow","_wxSashLayoutWindow",0},
{ "_class_wxPyBitmapShape","_wxPyBitmapShape",0},
{ "_class_wxButton","_wxButton",0},
{ "_wxRadioBox","_class_wxRadioBox",0},
{ "_class_wxSpinCtrl","_wxSpinCtrl",0},
{ "_class_wxFontData","_wxFontData",0},
{ "_class_wxPNMHandler","_wxPNMHandler",0},
{ "_wxBoxSizer","_class_wxBoxSizer",0},
{ "_class_wxZipFSHandler","_wxZipFSHandler",0},
{ "_char","_wxChar",0},
{ "_wxBitmap","_class_wxBitmap",0},
{ "_wxPrintDialog","_class_wxPrintDialog",0},
{ "_wxPyControlPoint","_class_wxPyControlPoint",0},
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxTimerEvent","_class_wxTimerEvent",0},
{ "_wxPyTimer","_class_wxPyTimer",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxColourDialog","_class_wxColourDialog",0},
{ "_wxPrintData","_class_wxPrintData",0},
{ "_class_wxInternetFSHandler","_wxInternetFSHandler",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_class_wxNotifyEvent","_wxNotifyEvent",0},
{ "_wxMessageDialog","_class_wxMessageDialog",0},
{ "_class_wxValidator","_wxValidator",0},
{ "_class_wxPyEvent","_wxPyEvent",0},
{ "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
{ "_wxConfig","_class_wxConfig",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_class_wxFileConfig","_wxFileConfig",0},
{ "_class_wxPyDrawnShape","_wxPyDrawnShape",0},
{ "_class_wxBusyCursor","_wxBusyCursor",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
{ "_wxListItem","_class_wxListItem",0},
{ "_class_wxPseudoMetaFile","_wxPseudoMetaFile",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
{ "_class_wxMemoryFSHandler","_wxMemoryFSHandler",0},
{ "_class_wxShapeRegion","_wxShapeRegion",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
{ "_EBool","_int",0},
{ "_EBool","_wxWindowID",0},
{ "_class_wxRegion","_wxRegion",0},
{ "_class_wxDataFormat","_wxDataFormat",0},
{ "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
{ "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
{ "_class_wxPreviewFrame","_wxPreviewFrame",0},
{ "_wxStaticText","_class_wxStaticText",0},
{ "_wxFont","_class_wxFont",0},
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
{ "_wxCloseEvent","_class_wxCloseEvent",0},
{ "_class_wxSplitterEvent","_wxSplitterEvent",0},
{ "_wxProcessEvent","_class_wxProcessEvent",0},
{ "_wxNotebook","_class_wxNotebook",0},
{ "_wxFSFile","_class_wxFSFile",0},
{ "_unsigned_long","_long",0},
{ "_class_wxRect","_wxRect",0},
{ "_class_wxDC","_wxDC",0},
{ "_wxScrollWinEvent","_class_wxScrollWinEvent",0},
{ "_wxPyCircleShape","_class_wxPyCircleShape",0},
{ "_class_wxPyShapeCanvas","_wxPyShapeCanvas",0},
{ "_wxGenericDragImage","_class_wxGenericDragImage",0},
{ "_class_wxProgressDialog","_wxProgressDialog",0},
{ "_wxQueryNewPaletteEvent","_class_wxQueryNewPaletteEvent",0},
{ "_wxPyInputStream","_class_wxPyInputStream",0},
{ "_wxPyApp","_class_wxPyApp",0},
{ "_class_wxWindowCreateEvent","_wxWindowCreateEvent",0},
{ "_class_wxOutputStream","_wxOutputStream",0},
{ "_wxLogTextCtrl","_class_wxLogTextCtrl",0},
{ "_wxMDIParentFrame","_class_wxMDIParentFrame",0},
{ "_class_wxTreeEvent","_wxTreeEvent",0},
{ "_class_wxDirDialog","_wxDirDialog",0},
{ "_wxTimeSpan","_class_wxTimeSpan",0},
{ "_wxPyLineShape","_class_wxPyLineShape",0},
{ "_wxFocusEvent","_class_wxFocusEvent",0},
{ "_wxMaximizeEvent","_class_wxMaximizeEvent",0},
{ "_class_wxTimerEvent","_wxTimerEvent",0},
{ "_class_wxPyTimer","_wxPyTimer",0},
{ "_class_wxSpinButton","_wxSpinButton",0},
{ "_class_wxPyPolygonShape","_wxPyPolygonShape",0},
{ "_wxAcceleratorEntry","_class_wxAcceleratorEntry",0},
{ "_class_wxPanel","_wxPanel",0},
{ "_class_wxCheckBox","_wxCheckBox",0},
{ "_wxComboBox","_class_wxComboBox",0},
{ "_wxRadioButton","_class_wxRadioButton",0},
{ "_class_wxMessageDialog","_wxMessageDialog",0},
{ "_signed_int","_wxCoord",0},
{ "_signed_int","_wxPrintQuality",0},
{ "_signed_int","_EBool",0},
{ "_signed_int","_wxWindowID",0},
{ "_signed_int","_int",0},
{ "_class_wxTextCtrl","_wxTextCtrl",0},
{ "_class_wxListItemAttr","_wxListItemAttr",0},
{ "_wxLayoutConstraints","_class_wxLayoutConstraints",0},
{ "_class_wxTextDataObject","_wxTextDataObject",0},
{ "_wxMenu","_class_wxMenu",0},
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
{ "_wxArrowHead","_class_wxArrowHead",0},
{ "_WXTYPE","_wxDateTime_t",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},
{ "_wxFileDialog","_class_wxFileDialog",0},
{ "_class_wxDropTarget","_wxDropTarget",0},
{ "_class_wxCaret","_wxCaret",0},
{ "_class_wxMDIClientWindow","_wxMDIClientWindow",0},
{ "_class_wxBrush","_wxBrush",0},
{ "_wxTipProvider","_class_wxTipProvider",0},
{ "_unsigned_short","_wxDateTime_t",0},
{ "_unsigned_short","_WXTYPE",0},
{ "_unsigned_short","_short",0},
{ "_class_wxWindow","_wxWindow",0},
{ "_class_wxLogStderr","_wxLogStderr",0},
{ "_wxSplitterWindow","_class_wxSplitterWindow",0},
{ "_wxDateSpan","_class_wxDateSpan",0},
{ "_class_wxStaticText","_wxStaticText",0},
{ "_wxPrintDialogData","_class_wxPrintDialogData",0},
{ "_class_wxFont","_wxFont",0},
{ "_wxClipboard","_class_wxClipboard",0},
{ "_class_wxPyValidator","_wxPyValidator",0},
{ "_class_wxCloseEvent","_wxCloseEvent",0},
{ "_wxSashEvent","_class_wxSashEvent",0},
{ "_wxBusyInfo","_class_wxBusyInfo",0},
{ "_class_wxMenuEvent","_wxMenuEvent",0},
{ "_wxPaletteChangedEvent","_class_wxPaletteChangedEvent",0},
{ "_wxJoystick","_class_wxJoystick",0},
{ "_class_wxPyBitmapDataObject","_wxPyBitmapDataObject",0},
{ "_class_wxPyCircleShape","_wxPyCircleShape",0},
{ "_wxClientDC","_class_wxClientDC",0},
{ "_wxMouseEvent","_class_wxMouseEvent",0},
{ "_class_wxGenericDragImage","_wxGenericDragImage",0},
{ "_wxListCtrl","_class_wxListCtrl",0},
{ "_wxSingleChoiceDialog","_class_wxSingleChoiceDialog",0},
{ "_wxPyDividedShape","_class_wxPyDividedShape",0},
{ "_class_wxPoint","_wxPoint",0},
{ "_class_wxPyInputStream","_wxPyInputStream",0},
{ "_wxRealPoint","_class_wxRealPoint",0},
{ "_class_wxRadioBox","_wxRadioBox",0},
{ "_class_wxBoxSizer","_wxBoxSizer",0},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_wxMemoryDC","_class_wxMemoryDC",0},
{ "_wxPyTextDataObject","_class_wxPyTextDataObject",0},
{ "_class_wxPrintDialog","_wxPrintDialog",0},
{ "_wxPyFileSystemHandler","_class_wxPyFileSystemHandler",0},
{ "_class_wxPyControlPoint","_wxPyControlPoint",0},
{ "_wxPaintDC","_class_wxPaintDC",0},
{ "_class_wxWindowDC","_wxWindowDC",0},
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPostScriptDC","_class_wxPostScriptDC",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
{ "_class_wxPyProcess","_wxPyProcess",0},
{ "_class_wxImageHandler","_wxImageHandler",0},
{ "_wxPyShape","_class_wxPyShape",0},
{ "_wxScrolledWindow","_class_wxScrolledWindow",0},
{ "_class_wxLog","_wxLog",0},
{ "_wxTreeItemId","_class_wxTreeItemId",0},
{ "_unsigned_char","_byte",0},
{ "_class_wxMenu","_wxMenu",0},
{ "_wxControl","_class_wxControl",0},
{ "_class_wxListBox","_wxListBox",0},
{ "_unsigned_int","_wxCoord",0},
{ "_unsigned_int","_wxPrintQuality",0},
{ "_unsigned_int","_time_t",0},
{ "_unsigned_int","_size_t",0},
{ "_unsigned_int","_uint",0},
{ "_unsigned_int","_wxWindowID",0},
{ "_unsigned_int","_int",0},
{ "_wxIcon","_class_wxIcon",0},
{ "_wxDialog","_class_wxDialog",0},
{ "_class_wxListItem","_wxListItem",0},
{ "_class_wxPen","_wxPen",0},
{ "_class_wxFileDialog","_wxFileDialog",0},
{ "_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0},
{ "_wxConfigBase","_class_wxConfigBase",0},
{ "_short","_wxDateTime_t",0},
{ "_short","_WXTYPE",0},
{ "_short","_unsigned_short",0},
{ "_short","_signed_short",0},
{ "_class_wxStaticBox","_wxStaticBox",0},
{ "_wxLayoutAlgorithm","_class_wxLayoutAlgorithm",0},
{ "_wxPyTextShape","_class_wxPyTextShape",0},
{ "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
{ "_class_wxPyDropSource","_wxPyDropSource",0},
{ "_class_wxScrollEvent","_wxScrollEvent",0},
{ "_wxJoystickEvent","_class_wxJoystickEvent",0},
{ "_class_wxChoice","_wxChoice",0},
{ "_class_wxSlider","_wxSlider",0},
{ "_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxBitmapButton","_wxBitmapButton",0},
{ "_wxFileSystemHandler","_class_wxFileSystemHandler",0},
{ "_wxPyTipProvider","_class_wxPyTipProvider",0},
{ "_wxFrame","_class_wxFrame",0},
{ "_wxPCXHandler","_class_wxPCXHandler",0},
{ "_class_wxGridSizer","_wxGridSizer",0},
{ "_wxPyDivisionShape","_class_wxPyDivisionShape",0},
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
{ "_class_wxNotebook","_wxNotebook",0},
{ "_wxJPEGHandler","_class_wxJPEGHandler",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},
{ "_wxWindowID","_time_t",0},
{ "_wxWindowID","_size_t",0},
{ "_wxWindowID","_EBool",0},
{ "_wxWindowID","_uint",0},
{ "_wxWindowID","_int",0},
{ "_wxWindowID","_signed_int",0},
{ "_wxWindowID","_unsigned_int",0},
{ "_class_wxScrollWinEvent","_wxScrollWinEvent",0},
{ "_class_wxSizerItem","_wxSizerItem",0},
{ "_int","_wxCoord",0},
{ "_int","_wxPrintQuality",0},
{ "_int","_time_t",0},
{ "_int","_size_t",0},
{ "_int","_EBool",0},
{ "_int","_uint",0},
{ "_int","_wxWindowID",0},
{ "_int","_unsigned_int",0},
{ "_int","_signed_int",0},
{ "_class_wxMouseEvent","_wxMouseEvent",0},
{ "_wxPyCommandEvent","_class_wxPyCommandEvent",0},
{ "_wxLogWindow","_class_wxLogWindow",0},
{ "_class_wxListEvent","_wxListEvent",0},
{ "_class_wxPrintPreview","_wxPrintPreview",0},
{ "_wxDateTime_t","_unsigned_short",0},
{ "_wxDateTime_t","_short",0},
{ "_wxDateTime_t","_WXTYPE",0},
{ "_class_wxSpinEvent","_wxSpinEvent",0},
{ "_class_wxQueryNewPaletteEvent","_wxQueryNewPaletteEvent",0},
{ "_wxDateTime","_class_wxDateTime",0},
{ "_time_t","_wxCoord",0},
{ "_time_t","_wxPrintQuality",0},
{ "_time_t","_unsigned_int",0},
{ "_time_t","_int",0},
{ "_time_t","_wxWindowID",0},
{ "_time_t","_uint",0},
{ "_time_t","_size_t",0},
{ "_class_wxNavigationKeyEvent","_wxNavigationKeyEvent",0},
{ "_wxLogNull","_class_wxLogNull",0},
{ "_wxButton","_class_wxButton",0},
{ "_wxZipFSHandler","_class_wxZipFSHandler",0},
{ "_class_wxPyApp","_wxPyApp",0},
{ "_wxSize","_class_wxSize",0},
{ "_wxRegionIterator","_class_wxRegionIterator",0},
{ "_class_wxPyTextDataObject","_wxPyTextDataObject",0},
{ "_class_wxLogTextCtrl","_wxLogTextCtrl",0},
{ "_class_wxLogGui","_wxLogGui",0},
{ "_class_wxMDIParentFrame","_wxMDIParentFrame",0},
{ "_wxPyTreeItemData","_class_wxPyTreeItemData",0},
{ "_wxStaticBoxSizer","_class_wxStaticBoxSizer",0},
{ "_class_wxTimeSpan","_wxTimeSpan",0},
{ "_class_wxPyFileSystemHandler","_wxPyFileSystemHandler",0},
{ "_class_wxPyLineShape","_wxPyLineShape",0},
{ "_class_wxPaintDC","_wxPaintDC",0},
{ "_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0},
{ "_class_wxPyFileDropTarget","_wxPyFileDropTarget",0},
{ "_class_wxInitDialogEvent","_wxInitDialogEvent",0},
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_class_wxPyShape","_wxPyShape",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxTreeItemId","_wxTreeItemId",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
{ "_class_wxControl","_wxControl",0},
{ "_wxStaticBitmap","_class_wxStaticBitmap",0},
{ "_wxPyDrawnShape","_class_wxPyDrawnShape",0},
{ "_class_wxIcon","_wxIcon",0},
{ "_class_wxColour","_wxColour",0},
{ "_class_wxScreenDC","_wxScreenDC",0},
{ "_class_wxPageSetupDialog","_wxPageSetupDialog",0},
{ "_wxPalette","_class_wxPalette",0},
{ "_class_wxIdleEvent","_wxIdleEvent",0},
{ "_class_wxConfigBase","_wxConfigBase",0},
{ "_wxCoord","_int",0},
{ "_wxCoord","_signed_int",0},
{ "_wxCoord","_unsigned_int",0},
{ "_wxCoord","_wxWindowID",0},
{ "_wxCoord","_uint",0},
{ "_wxCoord","_EBool",0},
{ "_wxCoord","_size_t",0},
{ "_wxCoord","_time_t",0},
{ "_wxCoord","_wxPrintQuality",0},
{ "_wxEraseEvent","_class_wxEraseEvent",0},
{ "_wxDataObjectComposite","_class_wxDataObjectComposite",0},
{ "_class_wxJoystickEvent","_wxJoystickEvent",0},
{ "_class_wxTipProvider","_wxTipProvider",0},
{ "_class_wxMiniFrame","_wxMiniFrame",0},
{ "_wxFontDialog","_class_wxFontDialog",0},
{ "_wxMemoryFSHandler","_class_wxMemoryFSHandler",0},
{ "_wxRegion","_class_wxRegion",0},
{ "_class_wxSplitterWindow","_wxSplitterWindow",0},
{ "_wxPreviewFrame","_class_wxPreviewFrame",0},
{ "_wxSizer","_class_wxSizer",0},
{ "_class_wxDateSpan","_wxDateSpan",0},
{ "_wxFileSystem","_class_wxFileSystem",0},
{ "_class_wxShowEvent","_wxShowEvent",0},
{ "_class_wxPyTipProvider","_wxPyTipProvider",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_wxTIFFHandler","_class_wxTIFFHandler",0},
{ "_wxDiagram","_class_wxDiagram",0},
{ "_wxPyDropTarget","_class_wxPyDropTarget",0},
{ "_wxActivateEvent","_class_wxActivateEvent",0},
{ "_wxGauge","_class_wxGauge",0},
{ "_class_wxCheckListBox","_wxCheckListBox",0},
{ "_class_wxBusyInfo","_wxBusyInfo",0},
{ "_class_wxJoystick","_wxJoystick",0},
{ "_class_wxCommandEvent","_wxCommandEvent",0},
{ "_class_wxClientDC","_wxClientDC",0},
{ "_class_wxSizeEvent","_wxSizeEvent",0},
{ "_class_wxListCtrl","_wxListCtrl",0},
{ "_class_wxPyDividedShape","_wxPyDividedShape",0},
{ "_wxPyEllipseShape","_class_wxPyEllipseShape",0},
{ "_wxCustomDataObject","_class_wxCustomDataObject",0},
{ "_class_wxLogNull","_wxLogNull",0},
{ "_class_wxSize","_wxSize",0},
{ "_class_wxBitmap","_wxBitmap",0},
{ "_class_wxMemoryDC","_wxMemoryDC",0},
{ "_wxPyTextDropTarget","_class_wxPyTextDropTarget",0},
{ "_wxMenuBar","_class_wxMenuBar",0},
{ "_wxOutputStream","_class_wxOutputStream",0},
{ "_wxTreeEvent","_class_wxTreeEvent",0},
{ "_wxDirDialog","_class_wxDirDialog",0},
{ "_wxPyShapeEvtHandler","_class_wxPyShapeEvtHandler",0},
{ "_wxEvtHandler","_class_wxEvtHandler",0},
{ "_wxMenuItem","_class_wxMenuItem",0},
{ "_class_wxScrollBar","_wxScrollBar",0},
{ "_class_wxColourDialog","_wxColourDialog",0},
{ "_class_wxPrintData","_wxPrintData",0},
{ "_wxPyRectangleShape","_class_wxPyRectangleShape",0},
{ "_class_wxScrolledWindow","_wxScrolledWindow",0},
{ "_wxListItemAttr","_class_wxListItemAttr",0},
{ "_class_wxTextEntryDialog","_wxTextEntryDialog",0},
{ "_class_wxConfig","_wxConfig",0},
{ "_wxKeyEvent","_class_wxKeyEvent",0},
{ "_wxMoveEvent","_class_wxMoveEvent",0},
{ "_wxOGLConstraint","_class_wxOGLConstraint",0},
{ "_wxColourData","_class_wxColourData",0},
{ "_wxPageSetupDialogData","_class_wxPageSetupDialogData",0},
{ "_class_wxPalette","_wxPalette",0},
{ "_wxFileDataObject","_class_wxFileDataObject",0},
{ "_class_wxQueryLayoutInfoEvent","_wxQueryLayoutInfoEvent",0},
{ "_wxNotebookSizer","_class_wxNotebookSizer",0},
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0},
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
{ "_class_wxPyTextShape","_wxPyTextShape",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_class_wxFontDialog","_wxFontDialog",0},
{ "_wxWindow","_class_wxWindow",0},
{ "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
{ "_wxLogStderr","_class_wxLogStderr",0},
{ "_class_wxFileSystemHandler","_wxFileSystemHandler",0},
{ "_class_wxFileSystem","_wxFileSystem",0},
{ "_class_wxFrame","_wxFrame",0},
{ "_class_wxDiagram","_wxDiagram",0},
{0,0,0}};
static PyObject *SWIG_globals;
#ifdef __cplusplus
extern "C"
#endif
SWIGEXPORT(void) initoglc() {
PyObject *m, *d;
SWIG_globals = SWIG_newvarlink();
m = Py_InitModule("oglc", oglcMethods);
d = PyModule_GetDict(m);
PyDict_SetItemString(d,"KEY_SHIFT", PyInt_FromLong((long) KEY_SHIFT));
PyDict_SetItemString(d,"KEY_CTRL", PyInt_FromLong((long) KEY_CTRL));
PyDict_SetItemString(d,"ARROW_NONE", PyInt_FromLong((long) ARROW_NONE));
PyDict_SetItemString(d,"ARROW_END", PyInt_FromLong((long) ARROW_END));
PyDict_SetItemString(d,"ARROW_BOTH", PyInt_FromLong((long) ARROW_BOTH));
PyDict_SetItemString(d,"ARROW_MIDDLE", PyInt_FromLong((long) ARROW_MIDDLE));
PyDict_SetItemString(d,"ARROW_START", PyInt_FromLong((long) ARROW_START));
PyDict_SetItemString(d,"ARROW_HOLLOW_CIRCLE", PyInt_FromLong((long) ARROW_HOLLOW_CIRCLE));
PyDict_SetItemString(d,"ARROW_FILLED_CIRCLE", PyInt_FromLong((long) ARROW_FILLED_CIRCLE));
PyDict_SetItemString(d,"ARROW_ARROW", PyInt_FromLong((long) ARROW_ARROW));
PyDict_SetItemString(d,"ARROW_SINGLE_OBLIQUE", PyInt_FromLong((long) ARROW_SINGLE_OBLIQUE));
PyDict_SetItemString(d,"ARROW_DOUBLE_OBLIQUE", PyInt_FromLong((long) ARROW_DOUBLE_OBLIQUE));
PyDict_SetItemString(d,"ARROW_METAFILE", PyInt_FromLong((long) ARROW_METAFILE));
PyDict_SetItemString(d,"ARROW_POSITION_END", PyInt_FromLong((long) ARROW_POSITION_END));
PyDict_SetItemString(d,"ARROW_POSITION_START", PyInt_FromLong((long) ARROW_POSITION_START));
PyDict_SetItemString(d,"CONTROL_POINT_VERTICAL", PyInt_FromLong((long) CONTROL_POINT_VERTICAL));
PyDict_SetItemString(d,"CONTROL_POINT_HORIZONTAL", PyInt_FromLong((long) CONTROL_POINT_HORIZONTAL));
PyDict_SetItemString(d,"CONTROL_POINT_DIAGONAL", PyInt_FromLong((long) CONTROL_POINT_DIAGONAL));
PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_TO", PyInt_FromLong((long) CONTROL_POINT_ENDPOINT_TO));
PyDict_SetItemString(d,"CONTROL_POINT_ENDPOINT_FROM", PyInt_FromLong((long) CONTROL_POINT_ENDPOINT_FROM));
PyDict_SetItemString(d,"CONTROL_POINT_LINE", PyInt_FromLong((long) CONTROL_POINT_LINE));
PyDict_SetItemString(d,"FORMAT_NONE", PyInt_FromLong((long) FORMAT_NONE));
PyDict_SetItemString(d,"FORMAT_CENTRE_HORIZ", PyInt_FromLong((long) FORMAT_CENTRE_HORIZ));
PyDict_SetItemString(d,"FORMAT_CENTRE_VERT", PyInt_FromLong((long) FORMAT_CENTRE_VERT));
PyDict_SetItemString(d,"FORMAT_SIZE_TO_CONTENTS", PyInt_FromLong((long) FORMAT_SIZE_TO_CONTENTS));
PyDict_SetItemString(d,"LINE_ALIGNMENT_HORIZ", PyInt_FromLong((long) LINE_ALIGNMENT_HORIZ));
PyDict_SetItemString(d,"LINE_ALIGNMENT_VERT", PyInt_FromLong((long) LINE_ALIGNMENT_VERT));
PyDict_SetItemString(d,"LINE_ALIGNMENT_TO_NEXT_HANDLE", PyInt_FromLong((long) LINE_ALIGNMENT_TO_NEXT_HANDLE));
PyDict_SetItemString(d,"LINE_ALIGNMENT_NONE", PyInt_FromLong((long) LINE_ALIGNMENT_NONE));
PyDict_SetItemString(d,"SHADOW_NONE", PyInt_FromLong((long) SHADOW_NONE));
PyDict_SetItemString(d,"SHADOW_LEFT", PyInt_FromLong((long) SHADOW_LEFT));
PyDict_SetItemString(d,"SHADOW_RIGHT", PyInt_FromLong((long) SHADOW_RIGHT));
PyDict_SetItemString(d,"OP_CLICK_LEFT", PyInt_FromLong((long) OP_CLICK_LEFT));
PyDict_SetItemString(d,"OP_CLICK_RIGHT", PyInt_FromLong((long) OP_CLICK_RIGHT));
PyDict_SetItemString(d,"OP_DRAG_LEFT", PyInt_FromLong((long) OP_DRAG_LEFT));
PyDict_SetItemString(d,"OP_DRAG_RIGHT", PyInt_FromLong((long) OP_DRAG_RIGHT));
PyDict_SetItemString(d,"OP_ALL", PyInt_FromLong((long) OP_ALL));
PyDict_SetItemString(d,"ATTACHMENT_MODE_NONE", PyInt_FromLong((long) ATTACHMENT_MODE_NONE));
PyDict_SetItemString(d,"ATTACHMENT_MODE_EDGE", PyInt_FromLong((long) ATTACHMENT_MODE_EDGE));
PyDict_SetItemString(d,"ATTACHMENT_MODE_BRANCHING", PyInt_FromLong((long) ATTACHMENT_MODE_BRANCHING));
PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_NORMAL", PyInt_FromLong((long) BRANCHING_ATTACHMENT_NORMAL));
PyDict_SetItemString(d,"BRANCHING_ATTACHMENT_BLOB", PyInt_FromLong((long) BRANCHING_ATTACHMENT_BLOB));
PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_VERTICALLY", PyInt_FromLong((long) gyCONSTRAINT_CENTRED_VERTICALLY));
PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_HORIZONTALLY", PyInt_FromLong((long) gyCONSTRAINT_CENTRED_HORIZONTALLY));
PyDict_SetItemString(d,"gyCONSTRAINT_CENTRED_BOTH", PyInt_FromLong((long) gyCONSTRAINT_CENTRED_BOTH));
PyDict_SetItemString(d,"gyCONSTRAINT_LEFT_OF", PyInt_FromLong((long) gyCONSTRAINT_LEFT_OF));
PyDict_SetItemString(d,"gyCONSTRAINT_RIGHT_OF", PyInt_FromLong((long) gyCONSTRAINT_RIGHT_OF));
PyDict_SetItemString(d,"gyCONSTRAINT_ABOVE", PyInt_FromLong((long) gyCONSTRAINT_ABOVE));
PyDict_SetItemString(d,"gyCONSTRAINT_BELOW", PyInt_FromLong((long) gyCONSTRAINT_BELOW));
PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_TOP", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_TOP));
PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_BOTTOM", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_BOTTOM));
PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_LEFT", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_LEFT));
PyDict_SetItemString(d,"gyCONSTRAINT_ALIGNED_RIGHT", PyInt_FromLong((long) gyCONSTRAINT_ALIGNED_RIGHT));
PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_TOP", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_TOP));
PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_BOTTOM", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_BOTTOM));
PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_LEFT", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_LEFT));
PyDict_SetItemString(d,"gyCONSTRAINT_MIDALIGNED_RIGHT", PyInt_FromLong((long) gyCONSTRAINT_MIDALIGNED_RIGHT));
PyDict_SetItemString(d,"DIVISION_SIDE_NONE", PyInt_FromLong((long) DIVISION_SIDE_NONE));
PyDict_SetItemString(d,"DIVISION_SIDE_LEFT", PyInt_FromLong((long) DIVISION_SIDE_LEFT));
PyDict_SetItemString(d,"DIVISION_SIDE_TOP", PyInt_FromLong((long) DIVISION_SIDE_TOP));
PyDict_SetItemString(d,"DIVISION_SIDE_RIGHT", PyInt_FromLong((long) DIVISION_SIDE_RIGHT));
PyDict_SetItemString(d,"DIVISION_SIDE_BOTTOM", PyInt_FromLong((long) DIVISION_SIDE_BOTTOM));
initoglbasicc();
initoglshapesc();
initoglshapes2c();
initoglcanvasc();
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
SWIG_RegisterMapping(_swig_mapping[i].n1,_swig_mapping[i].n2,_swig_mapping[i].pcnv);
}
}

View File

@@ -1,167 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: ogl.i
// Purpose: SWIG definitions for the wxWindows Object Graphics Library
//
// Author: Robin Dunn
//
// Created: 30-June-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module ogl
%{
#include "helpers.h"
#include "oglhelpers.h"
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%import windows.i
%extern _defs.i
%extern misc.i
%extern gdi.i
%include _ogldefs.i
%import oglbasic.i
%import oglshapes.i
%import oglshapes2.i
%import oglcanvas.i
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
enum {
KEY_SHIFT,
KEY_CTRL,
ARROW_NONE,
ARROW_END,
ARROW_BOTH,
ARROW_MIDDLE,
ARROW_START,
ARROW_HOLLOW_CIRCLE,
ARROW_FILLED_CIRCLE,
ARROW_ARROW,
ARROW_SINGLE_OBLIQUE,
ARROW_DOUBLE_OBLIQUE,
ARROW_METAFILE,
ARROW_POSITION_END,
ARROW_POSITION_START,
CONTROL_POINT_VERTICAL,
CONTROL_POINT_HORIZONTAL,
CONTROL_POINT_DIAGONAL,
CONTROL_POINT_ENDPOINT_TO,
CONTROL_POINT_ENDPOINT_FROM,
CONTROL_POINT_LINE,
FORMAT_NONE,
FORMAT_CENTRE_HORIZ,
FORMAT_CENTRE_VERT,
FORMAT_SIZE_TO_CONTENTS,
LINE_ALIGNMENT_HORIZ,
LINE_ALIGNMENT_VERT,
LINE_ALIGNMENT_TO_NEXT_HANDLE,
LINE_ALIGNMENT_NONE,
SHADOW_NONE,
SHADOW_LEFT,
SHADOW_RIGHT,
// SHAPE_BASIC,
// SHAPE_RECTANGLE,
// SHAPE_ELLIPSE,
// SHAPE_POLYGON,
// SHAPE_CIRCLE,
// SHAPE_LINE,
// SHAPE_DIVIDED_RECTANGLE,
// SHAPE_COMPOSITE,
// SHAPE_CONTROL_POINT,
// SHAPE_DRAWN,
// SHAPE_DIVISION,
// SHAPE_LABEL_OBJECT,
// SHAPE_BITMAP,
// SHAPE_DIVIDED_OBJECT_CONTROL_POINT,
// OBJECT_REGION,
OP_CLICK_LEFT,
OP_CLICK_RIGHT,
OP_DRAG_LEFT,
OP_DRAG_RIGHT,
OP_ALL,
ATTACHMENT_MODE_NONE,
ATTACHMENT_MODE_EDGE,
ATTACHMENT_MODE_BRANCHING,
BRANCHING_ATTACHMENT_NORMAL,
BRANCHING_ATTACHMENT_BLOB,
gyCONSTRAINT_CENTRED_VERTICALLY,
gyCONSTRAINT_CENTRED_HORIZONTALLY,
gyCONSTRAINT_CENTRED_BOTH,
gyCONSTRAINT_LEFT_OF,
gyCONSTRAINT_RIGHT_OF,
gyCONSTRAINT_ABOVE,
gyCONSTRAINT_BELOW,
gyCONSTRAINT_ALIGNED_TOP,
gyCONSTRAINT_ALIGNED_BOTTOM,
gyCONSTRAINT_ALIGNED_LEFT,
gyCONSTRAINT_ALIGNED_RIGHT,
gyCONSTRAINT_MIDALIGNED_TOP,
gyCONSTRAINT_MIDALIGNED_BOTTOM,
gyCONSTRAINT_MIDALIGNED_LEFT,
gyCONSTRAINT_MIDALIGNED_RIGHT,
DIVISION_SIDE_NONE,
DIVISION_SIDE_LEFT,
DIVISION_SIDE_TOP,
DIVISION_SIDE_RIGHT,
DIVISION_SIDE_BOTTOM,
};
//---------------------------------------------------------------------------
void wxOGLInitialize();
void wxOGLCleanUp();
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
%{
extern "C" SWIGEXPORT(void) initoglbasicc();
extern "C" SWIGEXPORT(void) initoglshapesc();
extern "C" SWIGEXPORT(void) initoglshapes2c();
extern "C" SWIGEXPORT(void) initoglcanvasc();
%}
%init %{
initoglbasicc();
initoglshapesc();
initoglshapes2c();
initoglcanvasc();
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//----------------------------------------------------------------------
// And this gets appended to the shadow class file.
//----------------------------------------------------------------------
%pragma(python) include="_oglextras.py";
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------

View File

@@ -1,165 +0,0 @@
# This file was created automatically by SWIG.
import oglc
from misc import *
from misc2 import *
from windows import *
from gdi import *
from clip_dnd import *
from events import *
from streams import *
from mdi import *
from frames import *
from stattool import *
from controls import *
from controls2 import *
from windows2 import *
from cmndlgs import *
from windows3 import *
from image import *
from printfw import *
from sizers import *
from filesys import *
from utils import *
from oglbasic import *
from oglshapes import *
from oglshapes2 import *
from oglcanvas import *
import wx
#-------------- FUNCTION WRAPPERS ------------------
wxOGLInitialize = oglc.wxOGLInitialize
wxOGLCleanUp = oglc.wxOGLCleanUp
#-------------- VARIABLE WRAPPERS ------------------
KEY_SHIFT = oglc.KEY_SHIFT
KEY_CTRL = oglc.KEY_CTRL
ARROW_NONE = oglc.ARROW_NONE
ARROW_END = oglc.ARROW_END
ARROW_BOTH = oglc.ARROW_BOTH
ARROW_MIDDLE = oglc.ARROW_MIDDLE
ARROW_START = oglc.ARROW_START
ARROW_HOLLOW_CIRCLE = oglc.ARROW_HOLLOW_CIRCLE
ARROW_FILLED_CIRCLE = oglc.ARROW_FILLED_CIRCLE
ARROW_ARROW = oglc.ARROW_ARROW
ARROW_SINGLE_OBLIQUE = oglc.ARROW_SINGLE_OBLIQUE
ARROW_DOUBLE_OBLIQUE = oglc.ARROW_DOUBLE_OBLIQUE
ARROW_METAFILE = oglc.ARROW_METAFILE
ARROW_POSITION_END = oglc.ARROW_POSITION_END
ARROW_POSITION_START = oglc.ARROW_POSITION_START
CONTROL_POINT_VERTICAL = oglc.CONTROL_POINT_VERTICAL
CONTROL_POINT_HORIZONTAL = oglc.CONTROL_POINT_HORIZONTAL
CONTROL_POINT_DIAGONAL = oglc.CONTROL_POINT_DIAGONAL
CONTROL_POINT_ENDPOINT_TO = oglc.CONTROL_POINT_ENDPOINT_TO
CONTROL_POINT_ENDPOINT_FROM = oglc.CONTROL_POINT_ENDPOINT_FROM
CONTROL_POINT_LINE = oglc.CONTROL_POINT_LINE
FORMAT_NONE = oglc.FORMAT_NONE
FORMAT_CENTRE_HORIZ = oglc.FORMAT_CENTRE_HORIZ
FORMAT_CENTRE_VERT = oglc.FORMAT_CENTRE_VERT
FORMAT_SIZE_TO_CONTENTS = oglc.FORMAT_SIZE_TO_CONTENTS
LINE_ALIGNMENT_HORIZ = oglc.LINE_ALIGNMENT_HORIZ
LINE_ALIGNMENT_VERT = oglc.LINE_ALIGNMENT_VERT
LINE_ALIGNMENT_TO_NEXT_HANDLE = oglc.LINE_ALIGNMENT_TO_NEXT_HANDLE
LINE_ALIGNMENT_NONE = oglc.LINE_ALIGNMENT_NONE
SHADOW_NONE = oglc.SHADOW_NONE
SHADOW_LEFT = oglc.SHADOW_LEFT
SHADOW_RIGHT = oglc.SHADOW_RIGHT
OP_CLICK_LEFT = oglc.OP_CLICK_LEFT
OP_CLICK_RIGHT = oglc.OP_CLICK_RIGHT
OP_DRAG_LEFT = oglc.OP_DRAG_LEFT
OP_DRAG_RIGHT = oglc.OP_DRAG_RIGHT
OP_ALL = oglc.OP_ALL
ATTACHMENT_MODE_NONE = oglc.ATTACHMENT_MODE_NONE
ATTACHMENT_MODE_EDGE = oglc.ATTACHMENT_MODE_EDGE
ATTACHMENT_MODE_BRANCHING = oglc.ATTACHMENT_MODE_BRANCHING
BRANCHING_ATTACHMENT_NORMAL = oglc.BRANCHING_ATTACHMENT_NORMAL
BRANCHING_ATTACHMENT_BLOB = oglc.BRANCHING_ATTACHMENT_BLOB
gyCONSTRAINT_CENTRED_VERTICALLY = oglc.gyCONSTRAINT_CENTRED_VERTICALLY
gyCONSTRAINT_CENTRED_HORIZONTALLY = oglc.gyCONSTRAINT_CENTRED_HORIZONTALLY
gyCONSTRAINT_CENTRED_BOTH = oglc.gyCONSTRAINT_CENTRED_BOTH
gyCONSTRAINT_LEFT_OF = oglc.gyCONSTRAINT_LEFT_OF
gyCONSTRAINT_RIGHT_OF = oglc.gyCONSTRAINT_RIGHT_OF
gyCONSTRAINT_ABOVE = oglc.gyCONSTRAINT_ABOVE
gyCONSTRAINT_BELOW = oglc.gyCONSTRAINT_BELOW
gyCONSTRAINT_ALIGNED_TOP = oglc.gyCONSTRAINT_ALIGNED_TOP
gyCONSTRAINT_ALIGNED_BOTTOM = oglc.gyCONSTRAINT_ALIGNED_BOTTOM
gyCONSTRAINT_ALIGNED_LEFT = oglc.gyCONSTRAINT_ALIGNED_LEFT
gyCONSTRAINT_ALIGNED_RIGHT = oglc.gyCONSTRAINT_ALIGNED_RIGHT
gyCONSTRAINT_MIDALIGNED_TOP = oglc.gyCONSTRAINT_MIDALIGNED_TOP
gyCONSTRAINT_MIDALIGNED_BOTTOM = oglc.gyCONSTRAINT_MIDALIGNED_BOTTOM
gyCONSTRAINT_MIDALIGNED_LEFT = oglc.gyCONSTRAINT_MIDALIGNED_LEFT
gyCONSTRAINT_MIDALIGNED_RIGHT = oglc.gyCONSTRAINT_MIDALIGNED_RIGHT
DIVISION_SIDE_NONE = oglc.DIVISION_SIDE_NONE
DIVISION_SIDE_LEFT = oglc.DIVISION_SIDE_LEFT
DIVISION_SIDE_TOP = oglc.DIVISION_SIDE_TOP
DIVISION_SIDE_RIGHT = oglc.DIVISION_SIDE_RIGHT
DIVISION_SIDE_BOTTOM = oglc.DIVISION_SIDE_BOTTOM
#-------------- USER INCLUDE -----------------------
wxShapeCanvas = wxPyShapeCanvas
wxShapeEvtHandler = wxPyShapeEvtHandler
wxShape = wxPyShape
wxRectangleShape = wxPyRectangleShape
wxBitmapShape = wxPyBitmapShape
wxDrawnShape = wxPyDrawnShape
wxCompositeShape = wxPyCompositeShape
wxDividedShape = wxPyDividedShape
wxDivisionShape = wxPyDivisionShape
wxEllipseShape = wxPyEllipseShape
wxCircleShape = wxPyCircleShape
wxLineShape = wxPyLineShape
wxPolygonShape = wxPyPolygonShape
wxTextShape = wxPyTextShape
wxControlPoint = wxPyControlPoint
# Stuff these names into the wx namespace so wxPyConstructObject can find them
import wx
wx.wxPyShapeCanvasPtr = wxPyShapeCanvasPtr
wx.wxPyShapeEvtHandlerPtr = wxPyShapeEvtHandlerPtr
wx.wxPyShapePtr = wxPyShapePtr
wx.wxPyRectangleShapePtr = wxPyRectangleShapePtr
wx.wxPyBitmapShapePtr = wxPyBitmapShapePtr
wx.wxPyDrawnShapePtr = wxPyDrawnShapePtr
wx.wxPyCompositeShapePtr = wxPyCompositeShapePtr
wx.wxPyDividedShapePtr = wxPyDividedShapePtr
wx.wxPyDivisionShapePtr = wxPyDivisionShapePtr
wx.wxPyEllipseShapePtr = wxPyEllipseShapePtr
wx.wxPyCircleShapePtr = wxPyCircleShapePtr
wx.wxPyLineShapePtr = wxPyLineShapePtr
wx.wxPyPolygonShapePtr = wxPyPolygonShapePtr
wx.wxPyTextShapePtr = wxPyTextShapePtr
wx.wxShapeRegionPtr = wxShapeRegionPtr
wx.wxOGLConstraintPtr = wxOGLConstraintPtr
wx.wxControlPointPtr = wxPyControlPointPtr

File diff suppressed because it is too large Load Diff

View File

@@ -1,401 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: oglbasic.i
// Purpose: SWIG definitions for the wxWindows Object Graphics Library
//
// Author: Robin Dunn
//
// Created: 3-Sept-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module oglbasic
%{
#include "helpers.h"
#include "oglhelpers.h"
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%import windows.i
%extern _defs.i
%extern misc.i
%extern gdi.i
%include _ogldefs.i
//%extern oglcanvas.i
%pragma(python) code = "import wx"
%pragma(python) code = "from oglcanvas import wxPyShapeCanvasPtr"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
class wxShapeRegion {
public:
wxShapeRegion();
//~wxShapeRegion();
void SetText(const wxString& s);
void SetFont(wxFont *f);
void SetMinSize(double w, double h);
void SetSize(double w, double h);
void SetPosition(double x, double y);
void SetProportions(double x, double y);
void SetFormatMode(int mode);
void SetName(const wxString& s);
void SetColour(const wxString& col);
wxString GetText();
wxFont *GetFont();
void GetMinSize(double *OUTPUT, double *OUTPUT);
void GetProportion(double *OUTPUT, double *OUTPUT);
void GetSize(double *OUTPUT, double *OUTPUT);
void GetPosition(double *OUTPUT, double *OUTPUT);
int GetFormatMode();
wxString GetName();
wxString GetColour();
wxColour *GetActualColourObject();
wxList& GetFormattedText();
wxString GetPenColour();
int GetPenStyle();
void SetPenStyle(int style);
void SetPenColour(const wxString& col);
wxPen *GetActualPen();
double GetWidth();
double GetHeight();
void ClearText();
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyShapeEvtHandler,wxShapeEvtHandler);
%}
class wxPyShapeEvtHandler {
public:
wxPyShapeEvtHandler(wxPyShapeEvtHandler *prev = NULL,
wxPyShape *shape = NULL);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShapeEvtHandler)"
%addmethods {
void Destroy() { delete self; }
}
void SetShape(wxPyShape *sh);
wxPyShape *GetShape();
void SetPreviousHandler(wxPyShapeEvtHandler* handler);
wxPyShapeEvtHandler* GetPreviousHandler();
wxPyShapeEvtHandler* CreateNewCopy();
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyShape, wxShape);
%}
class wxPyShape : public wxPyShapeEvtHandler {
public:
// wxPyShape(wxPyShapeCanvas *can = NULL); abstract base class...
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShape)"
%addmethods {
void Destroy() { delete self; }
}
void GetBoundingBoxMax(double *OUTPUT, double *OUTPUT);
void GetBoundingBoxMin(double *OUTPUT, double *OUTPUT);
bool GetPerimeterPoint(double x1, double y1,
double x2, double y2,
double *OUTPUT, double *OUTPUT);
wxPyShapeCanvas *GetCanvas();
void SetCanvas(wxPyShapeCanvas *the_canvas);
void AddToCanvas(wxPyShapeCanvas *the_canvas, wxPyShape *addAfter = NULL);
void InsertInCanvas(wxPyShapeCanvas *the_canvas);
void RemoveFromCanvas(wxPyShapeCanvas *the_canvas);
double GetX();
double GetY();
void SetX(double x);
void SetY(double y);
wxPyShape *GetParent();
void SetParent(wxPyShape *p);
wxPyShape *GetTopAncestor();
// wxList& GetChildren();
%addmethods {
PyObject* GetChildren() {
wxList& list = self->GetChildren();
return wxPy_ConvertList(&list, "wxPyShape");
}
}
void Unlink();
void SetDrawHandles(bool drawH);
bool GetDrawHandles();
void MakeControlPoints();
void DeleteControlPoints(wxDC *dc = NULL);
void ResetControlPoints();
wxPyShapeEvtHandler *GetEventHandler();
void SetEventHandler(wxPyShapeEvtHandler *handler);
void MakeMandatoryControlPoints();
void ResetMandatoryControlPoints();
bool Recompute();
void CalculateSize();
void Select(bool select = TRUE, wxDC* dc = NULL);
void SetHighlight(bool hi = TRUE, bool recurse = FALSE);
bool IsHighlighted() ;
bool Selected();
bool AncestorSelected();
void SetSensitivityFilter(int sens = OP_ALL, bool recursive = FALSE);
int GetSensitivityFilter();
void SetDraggable(bool drag, bool recursive = FALSE);
void SetFixedSize(bool x, bool y);
void GetFixedSize(bool *OUTPUT, bool *OUTPUT) ;
bool GetFixedWidth();
bool GetFixedHeight();
void SetSpaceAttachments(bool sp);
bool GetSpaceAttachments() ;
void SetShadowMode(int mode, bool redraw = FALSE);
int GetShadowMode();
bool HitTest(double x, double y, int *OUTPUT, double *OUTPUT);
void SetCentreResize(bool cr);
bool GetCentreResize();
void SetMaintainAspectRatio(bool ar);
bool GetMaintainAspectRatio();
// wxList& GetLines();
%addmethods {
PyObject* GetLines() {
wxList& list = self->GetLines();
return wxPy_ConvertList(&list, "wxPyLineShape");
}
}
void SetDisableLabel(bool flag);
bool GetDisableLabel();
void SetAttachmentMode(int mode);
int GetAttachmentMode();
void SetId(long i);
long GetId();
void SetPen(wxPen *pen);
void SetBrush(wxBrush *brush);
// void SetClientData(wxObject *client_data);
// wxObject *GetClientData();
%addmethods {
void SetClientData(PyObject* userData) {
wxPyUserData* data = NULL;
if (userData)
data = new wxPyUserData(userData);
self->SetClientData(data);
}
PyObject* GetClientData() {
wxPyUserData* data = (wxPyUserData*)self->GetClientData();
if (data) {
Py_INCREF(data->m_obj);
return data->m_obj;
} else {
Py_INCREF(Py_None);
return Py_None;
}
}
}
void Show(bool show);
bool IsShown();
void Move(wxDC& dc, double x1, double y1, bool display = TRUE);
void Erase(wxDC& dc);
void EraseContents(wxDC& dc);
void Draw(wxDC& dc);
void Flash();
void MoveLinks(wxDC& dc);
void DrawContents(wxDC& dc);
void SetSize(double x, double y, bool recursive = TRUE);
void SetAttachmentSize(double x, double y);
void Attach(wxPyShapeCanvas *can);
void Detach();
bool Constrain();
void AddLine(wxPyLineShape *line, wxPyShape *other,
int attachFrom = 0, int attachTo = 0,
int positionFrom = -1, int positionTo = -1);
int GetLinePosition(wxPyLineShape* line);
void AddText(const wxString& string);
wxPen *GetPen();
wxBrush *GetBrush();
void SetDefaultRegionSize();
void FormatText(wxDC& dc, const wxString& s, int regionId = 0);
void SetFormatMode(int mode, int regionId = 0);
int GetFormatMode(int regionId = 0);
void SetFont(wxFont *font, int regionId = 0);
wxFont *GetFont(int regionId = 0);
void SetTextColour(const wxString& colour, int regionId = 0);
wxString GetTextColour(int regionId = 0);
int GetNumberOfTextRegions();
void SetRegionName(const wxString& name, int regionId = 0);
wxString GetRegionName(int regionId);
int GetRegionId(const wxString& name);
void NameRegions(const wxString& parentName = "");
// wxList& GetRegions();
%addmethods {
PyObject* GetRegions() {
wxList& list = self->GetRegions();
return wxPy_ConvertList(&list, "wxShapeRegion");
}
}
void AddRegion(wxShapeRegion *region);
void ClearRegions();
void AssignNewIds();
wxPyShape *FindRegion(const wxString& regionName, int *OUTPUT);
void FindRegionNames(wxStringList& list);
void ClearText(int regionId = 0);
void RemoveLine(wxPyLineShape *line);
#ifdef PROLOGIO
void WriteAttributes(wxExpr *clause);
void ReadAttributes(wxExpr *clause);
void ReadConstraints(wxExpr *clause, wxExprDatabase *database);
void WriteRegions(wxExpr *clause);
void ReadRegions(wxExpr *clause);
#endif
bool GetAttachmentPosition(int attachment, double *OUTPUT, double *OUTPUT,
int nth = 0, int no_arcs = 1, wxPyLineShape *line = NULL);
int GetNumberOfAttachments();
bool AttachmentIsValid(int attachment);
bool GetAttachmentPositionEdge(int attachment, double *OUTPUT, double *OUTPUT,
int nth = 0, int no_arcs = 1, wxPyLineShape *line = NULL);
wxRealPoint CalcSimpleAttachment(const wxRealPoint& pt1, const wxRealPoint& pt2,
int nth, int noArcs, wxPyLineShape* line);
bool AttachmentSortTest(int attachmentPoint, const wxRealPoint& pt1, const wxRealPoint& pt2);
void EraseLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
void DrawLinks(wxDC& dc, int attachment = -1, bool recurse = FALSE);
bool MoveLineToNewAttachment(wxDC& dc, wxPyLineShape *to_move,
double x, double y);
//void ApplyAttachmentOrdering(wxList& linesToSort);
%addmethods {
void ApplyAttachmentOrdering(PyObject* linesToSort) {
wxList* list = wxPy_wxListHelper(linesToSort, "_wxPyLineShape_p");
self->ApplyAttachmentOrdering(*list);
delete list;
}
}
wxRealPoint GetBranchingAttachmentRoot(int attachment);
bool GetBranchingAttachmentInfo(int attachment, wxRealPoint& root, wxRealPoint& neck,
wxRealPoint& shoulder1, wxRealPoint& shoulder2);
bool GetBranchingAttachmentPoint(int attachment, int n, wxRealPoint& attachmentPoint,
wxRealPoint& stemPoint);
int GetAttachmentLineCount(int attachment);
void SetBranchNeckLength(int len);
int GetBranchNeckLength();
void SetBranchStemLength(int len);
int GetBranchStemLength();
void SetBranchSpacing(int len);
int GetBranchSpacing();
void SetBranchStyle(long style);
long GetBranchStyle();
int PhysicalToLogicalAttachment(int physicalAttachment);
int LogicalToPhysicalAttachment(int logicalAttachment);
bool Draggable();
bool HasDescendant(wxPyShape *image);
wxPyShape *CreateNewCopy(bool resetMapping = TRUE, bool recompute = TRUE);
void Copy(wxPyShape& copy);
void CopyWithHandler(wxPyShape& copy);
void Rotate(double x, double y, double theta);
double GetRotation();
void ClearAttachments();
void Recentre(wxDC& dc);
void ClearPointList(wxList& list);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------

View File

@@ -1,797 +0,0 @@
# This file was created automatically by SWIG.
import oglbasicc
from misc import *
from misc2 import *
from windows import *
from gdi import *
from clip_dnd import *
from events import *
from streams import *
from mdi import *
from frames import *
from stattool import *
from controls import *
from controls2 import *
from windows2 import *
from cmndlgs import *
from windows3 import *
from image import *
from printfw import *
from sizers import *
from filesys import *
from utils import *
import wx
from oglcanvas import wxPyShapeCanvasPtr
class wxShapeRegionPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def SetText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetText,(self,) + _args, _kwargs)
return val
def SetFont(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetFont,(self,) + _args, _kwargs)
return val
def SetMinSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetMinSize,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetSize,(self,) + _args, _kwargs)
return val
def SetPosition(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetPosition,(self,) + _args, _kwargs)
return val
def SetProportions(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetProportions,(self,) + _args, _kwargs)
return val
def SetFormatMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetFormatMode,(self,) + _args, _kwargs)
return val
def SetName(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetName,(self,) + _args, _kwargs)
return val
def SetColour(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetColour,(self,) + _args, _kwargs)
return val
def GetText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetText,(self,) + _args, _kwargs)
return val
def GetFont(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetFont,(self,) + _args, _kwargs)
if val: val = wxFontPtr(val)
return val
def GetMinSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetMinSize,(self,) + _args, _kwargs)
return val
def GetProportion(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetProportion,(self,) + _args, _kwargs)
return val
def GetSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetSize,(self,) + _args, _kwargs)
return val
def GetPosition(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetPosition,(self,) + _args, _kwargs)
return val
def GetFormatMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetFormatMode,(self,) + _args, _kwargs)
return val
def GetName(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetName,(self,) + _args, _kwargs)
return val
def GetColour(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetColour,(self,) + _args, _kwargs)
return val
def GetActualColourObject(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetActualColourObject,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val)
return val
def GetFormattedText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetFormattedText,(self,) + _args, _kwargs)
return val
def GetPenColour(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetPenColour,(self,) + _args, _kwargs)
return val
def GetPenStyle(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetPenStyle,(self,) + _args, _kwargs)
return val
def SetPenStyle(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetPenStyle,(self,) + _args, _kwargs)
return val
def SetPenColour(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_SetPenColour,(self,) + _args, _kwargs)
return val
def GetActualPen(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetActualPen,(self,) + _args, _kwargs)
if val: val = wxPenPtr(val)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetWidth,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_GetHeight,(self,) + _args, _kwargs)
return val
def ClearText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxShapeRegion_ClearText,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxShapeRegion instance at %s>" % (self.this,)
class wxShapeRegion(wxShapeRegionPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglbasicc.new_wxShapeRegion,_args,_kwargs)
self.thisown = 1
class wxPyShapeEvtHandlerPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler__setSelf,(self,) + _args, _kwargs)
return val
def Destroy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_Destroy,(self,) + _args, _kwargs)
return val
def SetShape(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_SetShape,(self,) + _args, _kwargs)
return val
def GetShape(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_GetShape,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def SetPreviousHandler(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_SetPreviousHandler,(self,) + _args, _kwargs)
return val
def GetPreviousHandler(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_GetPreviousHandler,(self,) + _args, _kwargs)
if val: val = wxPyShapeEvtHandlerPtr(val)
return val
def CreateNewCopy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_CreateNewCopy,(self,) + _args, _kwargs)
if val: val = wxPyShapeEvtHandlerPtr(val)
return val
def base_OnDelete(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDelete,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShapeEvtHandler_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyShapeEvtHandler instance at %s>" % (self.this,)
class wxPyShapeEvtHandler(wxPyShapeEvtHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglbasicc.new_wxPyShapeEvtHandler,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyShapeEvtHandler)
class wxPyShapePtr(wxPyShapeEvtHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape__setSelf,(self,) + _args, _kwargs)
return val
def Destroy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Destroy,(self,) + _args, _kwargs)
return val
def GetBoundingBoxMax(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBoundingBoxMax,(self,) + _args, _kwargs)
return val
def GetBoundingBoxMin(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBoundingBoxMin,(self,) + _args, _kwargs)
return val
def GetPerimeterPoint(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetPerimeterPoint,(self,) + _args, _kwargs)
return val
def GetCanvas(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetCanvas,(self,) + _args, _kwargs)
if val: val = wxPyShapeCanvasPtr(val)
return val
def SetCanvas(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetCanvas,(self,) + _args, _kwargs)
return val
def AddToCanvas(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AddToCanvas,(self,) + _args, _kwargs)
return val
def InsertInCanvas(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_InsertInCanvas,(self,) + _args, _kwargs)
return val
def RemoveFromCanvas(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_RemoveFromCanvas,(self,) + _args, _kwargs)
return val
def GetX(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetX,(self,) + _args, _kwargs)
return val
def GetY(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetY,(self,) + _args, _kwargs)
return val
def SetX(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetX,(self,) + _args, _kwargs)
return val
def SetY(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetY,(self,) + _args, _kwargs)
return val
def GetParent(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetParent,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def SetParent(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetParent,(self,) + _args, _kwargs)
return val
def GetTopAncestor(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetTopAncestor,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def GetChildren(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetChildren,(self,) + _args, _kwargs)
return val
def Unlink(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Unlink,(self,) + _args, _kwargs)
return val
def SetDrawHandles(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetDrawHandles,(self,) + _args, _kwargs)
return val
def GetDrawHandles(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetDrawHandles,(self,) + _args, _kwargs)
return val
def MakeControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_MakeControlPoints,(self,) + _args, _kwargs)
return val
def DeleteControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_DeleteControlPoints,(self,) + _args, _kwargs)
return val
def ResetControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ResetControlPoints,(self,) + _args, _kwargs)
return val
def GetEventHandler(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetEventHandler,(self,) + _args, _kwargs)
if val: val = wxPyShapeEvtHandlerPtr(val)
return val
def SetEventHandler(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetEventHandler,(self,) + _args, _kwargs)
return val
def MakeMandatoryControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_MakeMandatoryControlPoints,(self,) + _args, _kwargs)
return val
def ResetMandatoryControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ResetMandatoryControlPoints,(self,) + _args, _kwargs)
return val
def Recompute(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Recompute,(self,) + _args, _kwargs)
return val
def CalculateSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_CalculateSize,(self,) + _args, _kwargs)
return val
def Select(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Select,(self,) + _args, _kwargs)
return val
def SetHighlight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetHighlight,(self,) + _args, _kwargs)
return val
def IsHighlighted(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_IsHighlighted,(self,) + _args, _kwargs)
return val
def Selected(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Selected,(self,) + _args, _kwargs)
return val
def AncestorSelected(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AncestorSelected,(self,) + _args, _kwargs)
return val
def SetSensitivityFilter(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetSensitivityFilter,(self,) + _args, _kwargs)
return val
def GetSensitivityFilter(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetSensitivityFilter,(self,) + _args, _kwargs)
return val
def SetDraggable(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetDraggable,(self,) + _args, _kwargs)
return val
def SetFixedSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetFixedSize,(self,) + _args, _kwargs)
return val
def GetFixedSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetFixedSize,(self,) + _args, _kwargs)
return val
def GetFixedWidth(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetFixedWidth,(self,) + _args, _kwargs)
return val
def GetFixedHeight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetFixedHeight,(self,) + _args, _kwargs)
return val
def SetSpaceAttachments(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetSpaceAttachments,(self,) + _args, _kwargs)
return val
def GetSpaceAttachments(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetSpaceAttachments,(self,) + _args, _kwargs)
return val
def SetShadowMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetShadowMode,(self,) + _args, _kwargs)
return val
def GetShadowMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetShadowMode,(self,) + _args, _kwargs)
return val
def HitTest(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_HitTest,(self,) + _args, _kwargs)
return val
def SetCentreResize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetCentreResize,(self,) + _args, _kwargs)
return val
def GetCentreResize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetCentreResize,(self,) + _args, _kwargs)
return val
def SetMaintainAspectRatio(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetMaintainAspectRatio,(self,) + _args, _kwargs)
return val
def GetMaintainAspectRatio(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetMaintainAspectRatio,(self,) + _args, _kwargs)
return val
def GetLines(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetLines,(self,) + _args, _kwargs)
return val
def SetDisableLabel(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetDisableLabel,(self,) + _args, _kwargs)
return val
def GetDisableLabel(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetDisableLabel,(self,) + _args, _kwargs)
return val
def SetAttachmentMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetAttachmentMode,(self,) + _args, _kwargs)
return val
def GetAttachmentMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetAttachmentMode,(self,) + _args, _kwargs)
return val
def SetId(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetId,(self,) + _args, _kwargs)
return val
def GetId(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetId,(self,) + _args, _kwargs)
return val
def SetPen(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetPen,(self,) + _args, _kwargs)
return val
def SetBrush(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetBrush,(self,) + _args, _kwargs)
return val
def SetClientData(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetClientData,(self,) + _args, _kwargs)
return val
def GetClientData(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetClientData,(self,) + _args, _kwargs)
return val
def Show(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Show,(self,) + _args, _kwargs)
return val
def IsShown(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_IsShown,(self,) + _args, _kwargs)
return val
def Move(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Move,(self,) + _args, _kwargs)
return val
def Erase(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Erase,(self,) + _args, _kwargs)
return val
def EraseContents(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_EraseContents,(self,) + _args, _kwargs)
return val
def Draw(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Draw,(self,) + _args, _kwargs)
return val
def Flash(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Flash,(self,) + _args, _kwargs)
return val
def MoveLinks(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_MoveLinks,(self,) + _args, _kwargs)
return val
def DrawContents(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_DrawContents,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetSize,(self,) + _args, _kwargs)
return val
def SetAttachmentSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetAttachmentSize,(self,) + _args, _kwargs)
return val
def Attach(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Attach,(self,) + _args, _kwargs)
return val
def Detach(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Detach,(self,) + _args, _kwargs)
return val
def Constrain(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Constrain,(self,) + _args, _kwargs)
return val
def AddLine(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AddLine,(self,) + _args, _kwargs)
return val
def GetLinePosition(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetLinePosition,(self,) + _args, _kwargs)
return val
def AddText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AddText,(self,) + _args, _kwargs)
return val
def GetPen(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetPen,(self,) + _args, _kwargs)
if val: val = wxPenPtr(val)
return val
def GetBrush(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBrush,(self,) + _args, _kwargs)
if val: val = wxBrushPtr(val)
return val
def SetDefaultRegionSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetDefaultRegionSize,(self,) + _args, _kwargs)
return val
def FormatText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_FormatText,(self,) + _args, _kwargs)
return val
def SetFormatMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetFormatMode,(self,) + _args, _kwargs)
return val
def GetFormatMode(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetFormatMode,(self,) + _args, _kwargs)
return val
def SetFont(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetFont,(self,) + _args, _kwargs)
return val
def GetFont(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetFont,(self,) + _args, _kwargs)
if val: val = wxFontPtr(val)
return val
def SetTextColour(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetTextColour,(self,) + _args, _kwargs)
return val
def GetTextColour(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetTextColour,(self,) + _args, _kwargs)
return val
def GetNumberOfTextRegions(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetNumberOfTextRegions,(self,) + _args, _kwargs)
return val
def SetRegionName(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetRegionName,(self,) + _args, _kwargs)
return val
def GetRegionName(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetRegionName,(self,) + _args, _kwargs)
return val
def GetRegionId(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetRegionId,(self,) + _args, _kwargs)
return val
def NameRegions(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_NameRegions,(self,) + _args, _kwargs)
return val
def GetRegions(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetRegions,(self,) + _args, _kwargs)
return val
def AddRegion(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AddRegion,(self,) + _args, _kwargs)
return val
def ClearRegions(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ClearRegions,(self,) + _args, _kwargs)
return val
def AssignNewIds(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AssignNewIds,(self,) + _args, _kwargs)
return val
def FindRegion(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_FindRegion,(self,) + _args, _kwargs)
return val
def FindRegionNames(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_FindRegionNames,(self,) + _args, _kwargs)
return val
def ClearText(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ClearText,(self,) + _args, _kwargs)
return val
def RemoveLine(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_RemoveLine,(self,) + _args, _kwargs)
return val
def GetAttachmentPosition(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetAttachmentPosition,(self,) + _args, _kwargs)
return val
def GetNumberOfAttachments(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetNumberOfAttachments,(self,) + _args, _kwargs)
return val
def AttachmentIsValid(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AttachmentIsValid,(self,) + _args, _kwargs)
return val
def GetAttachmentPositionEdge(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetAttachmentPositionEdge,(self,) + _args, _kwargs)
return val
def CalcSimpleAttachment(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_CalcSimpleAttachment,(self,) + _args, _kwargs)
if val: val = wxRealPointPtr(val) ; val.thisown = 1
return val
def AttachmentSortTest(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_AttachmentSortTest,(self,) + _args, _kwargs)
return val
def EraseLinks(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_EraseLinks,(self,) + _args, _kwargs)
return val
def DrawLinks(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_DrawLinks,(self,) + _args, _kwargs)
return val
def MoveLineToNewAttachment(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_MoveLineToNewAttachment,(self,) + _args, _kwargs)
return val
def ApplyAttachmentOrdering(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ApplyAttachmentOrdering,(self,) + _args, _kwargs)
return val
def GetBranchingAttachmentRoot(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchingAttachmentRoot,(self,) + _args, _kwargs)
if val: val = wxRealPointPtr(val) ; val.thisown = 1
return val
def GetBranchingAttachmentInfo(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchingAttachmentInfo,(self,) + _args, _kwargs)
return val
def GetBranchingAttachmentPoint(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchingAttachmentPoint,(self,) + _args, _kwargs)
return val
def GetAttachmentLineCount(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetAttachmentLineCount,(self,) + _args, _kwargs)
return val
def SetBranchNeckLength(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetBranchNeckLength,(self,) + _args, _kwargs)
return val
def GetBranchNeckLength(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchNeckLength,(self,) + _args, _kwargs)
return val
def SetBranchStemLength(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetBranchStemLength,(self,) + _args, _kwargs)
return val
def GetBranchStemLength(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchStemLength,(self,) + _args, _kwargs)
return val
def SetBranchSpacing(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetBranchSpacing,(self,) + _args, _kwargs)
return val
def GetBranchSpacing(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchSpacing,(self,) + _args, _kwargs)
return val
def SetBranchStyle(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_SetBranchStyle,(self,) + _args, _kwargs)
return val
def GetBranchStyle(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetBranchStyle,(self,) + _args, _kwargs)
return val
def PhysicalToLogicalAttachment(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_PhysicalToLogicalAttachment,(self,) + _args, _kwargs)
return val
def LogicalToPhysicalAttachment(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_LogicalToPhysicalAttachment,(self,) + _args, _kwargs)
return val
def Draggable(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Draggable,(self,) + _args, _kwargs)
return val
def HasDescendant(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_HasDescendant,(self,) + _args, _kwargs)
return val
def CreateNewCopy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_CreateNewCopy,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def Copy(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Copy,(self,) + _args, _kwargs)
return val
def CopyWithHandler(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_CopyWithHandler,(self,) + _args, _kwargs)
return val
def Rotate(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Rotate,(self,) + _args, _kwargs)
return val
def GetRotation(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_GetRotation,(self,) + _args, _kwargs)
return val
def ClearAttachments(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ClearAttachments,(self,) + _args, _kwargs)
return val
def Recentre(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_Recentre,(self,) + _args, _kwargs)
return val
def ClearPointList(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_ClearPointList,(self,) + _args, _kwargs)
return val
def base_OnDelete(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDelete,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglbasicc.wxPyShape_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyShape instance at %s>" % (self.this,)
class wxPyShape(wxPyShapePtr):
def __init__(self,this):
self.this = this
#-------------- FUNCTION WRAPPERS ------------------
#-------------- VARIABLE WRAPPERS ------------------

File diff suppressed because it is too large Load Diff

View File

@@ -1,157 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: oglcanvas.i
// Purpose: SWIG definitions for the wxWindows Object Graphics Library
//
// Author: Robin Dunn
//
// Created: 7-Sept-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module oglcanvas
%{
#include "helpers.h"
#include "oglhelpers.h"
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%import windows.i
%extern _defs.i
%extern misc.i
%extern gdi.i
%include _ogldefs.i
%extern oglbasic.i
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
class wxDiagram {
public:
wxDiagram();
~wxDiagram();
void AddShape(wxPyShape*shape, wxPyShape *addAfter = NULL);
void Clear(wxDC& dc);
void DeleteAllShapes();
void DrawOutline(wxDC& dc, double x1, double y1, double x2, double y2);
wxPyShape* FindShape(long id);
wxPyShapeCanvas* GetCanvas();
int GetCount();
double GetGridSpacing();
int GetMouseTolerance();
// wxList* GetShapeList();
%addmethods {
PyObject* GetShapeList() {
wxList* list = self->GetShapeList();
return wxPy_ConvertList(list, "wxPyShape");
}
}
bool GetQuickEditMode();
bool GetSnapToGrid();
void InsertShape(wxPyShape *shape);
bool LoadFile(const wxString& filename);
// **** Have to deal with wxExpr and wxExprDatabase first...
//void OnDatabaseLoad(wxExprDatabase& database);
//void OnDatabaseSave(wxExprDatabase& database);
//bool OnHeaderLoad(wxExprDatabase& database, wxExpr& expr);
//bool OnHeaderSave(wxExprDatabase& database, wxExpr& expr);
//bool OnShapeLoad(wxExprDatabase& database, wxPyShape& shape, wxExpr& expr);
//bool OnShapeSave(wxExprDatabase& database, wxPyShape& shape, wxExpr& expr);
void ReadContainerGeometry(wxExprDatabase& database);
void ReadLines(wxExprDatabase& database);
void ReadNodes(wxExprDatabase& database);
void RecentreAll(wxDC& dc);
void Redraw(wxDC& dc);
void RemoveAllShapes();
void RemoveShape(wxPyShape* shape);
bool SaveFile(const wxString& filename);
void SetCanvas(wxPyShapeCanvas* canvas);
void SetGridSpacing(double spacing);
void SetMouseTolerance(int tolerance);
void SetQuickEditMode(bool mode);
void SetSnapToGrid(bool snap);
void ShowAll(bool show);
void Snap(double *OUTPUT, double *OUTPUT);
};
//---------------------------------------------------------------------------
%{
IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragLeft);
IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnBeginDragRight);
IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnEndDragLeft);
IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnEndDragRight);
IMP_PYCALLBACK__BOOL2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnDragLeft);
IMP_PYCALLBACK__BOOL2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnDragRight);
IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnLeftClick);
IMP_PYCALLBACK__2DBLINT(wxPyShapeCanvas, wxShapeCanvas, OnRightClick);
%}
class wxPyShapeCanvas : public wxScrolledWindow {
public:
wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
const wxPoint& pos = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize,
long style = wxBORDER);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyShapeCanvas)"
%pragma(python) addtomethod = "__init__:#wx._StdWindowCallbacks(self)"
%pragma(python) addtomethod = "__init__:#wx._StdOnScrollCallbacks(self)"
void AddShape(wxPyShape *shape, wxPyShape *addAfter = NULL);
// **** Need a typemap for wxClassInfo, or implement wxObject, etc.....
wxPyShape* FindShape(double x1, double y, int *OUTPUT,
wxClassInfo *info = NULL, wxPyShape* notImage = NULL);
wxPyShape * FindFirstSensitiveShape(double x1, double y, int *OUTPUT, int op);
wxDiagram* GetDiagram();
bool GetQuickEditMode();
void InsertShape(wxPyShape* shape);
void base_OnBeginDragLeft(double x, double y, int keys = 0);
void base_OnBeginDragRight(double x, double y, int keys = 0);
void base_OnEndDragLeft(double x, double y, int keys = 0);
void base_OnEndDragRight(double x, double y, int keys = 0);
void base_OnDragLeft(bool draw, double x, double y, int keys = 0);
void base_OnDragRight(bool draw, double x, double y, int keys = 0);
void base_OnLeftClick(double x, double y, int keys = 0);
void base_OnRightClick(double x, double y, int keys = 0);
void Redraw(wxDC& dc);
void RemoveShape(wxPyShape *shape);
void SetDiagram(wxDiagram *diagram);
void Snap(double *OUTPUT, double *OUTPUT);
};
//---------------------------------------------------------------------------

View File

@@ -1,232 +0,0 @@
# This file was created automatically by SWIG.
import oglcanvasc
from misc import *
from misc2 import *
from windows import *
from gdi import *
from clip_dnd import *
from events import *
from streams import *
from mdi import *
from frames import *
from stattool import *
from controls import *
from controls2 import *
from windows2 import *
from cmndlgs import *
from windows3 import *
from image import *
from printfw import *
from sizers import *
from filesys import *
from utils import *
import wx
class wxDiagramPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,oglcanvasc=oglcanvasc):
if self.thisown == 1 :
oglcanvasc.delete_wxDiagram(self)
def AddShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_AddShape,(self,) + _args, _kwargs)
return val
def Clear(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_Clear,(self,) + _args, _kwargs)
return val
def DeleteAllShapes(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_DeleteAllShapes,(self,) + _args, _kwargs)
return val
def DrawOutline(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_DrawOutline,(self,) + _args, _kwargs)
return val
def FindShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_FindShape,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def GetCanvas(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetCanvas,(self,) + _args, _kwargs)
if val: val = wxPyShapeCanvasPtr(val)
return val
def GetCount(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetCount,(self,) + _args, _kwargs)
return val
def GetGridSpacing(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetGridSpacing,(self,) + _args, _kwargs)
return val
def GetMouseTolerance(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetMouseTolerance,(self,) + _args, _kwargs)
return val
def GetShapeList(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetShapeList,(self,) + _args, _kwargs)
return val
def GetQuickEditMode(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetQuickEditMode,(self,) + _args, _kwargs)
return val
def GetSnapToGrid(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_GetSnapToGrid,(self,) + _args, _kwargs)
return val
def InsertShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_InsertShape,(self,) + _args, _kwargs)
return val
def LoadFile(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_LoadFile,(self,) + _args, _kwargs)
return val
def ReadContainerGeometry(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_ReadContainerGeometry,(self,) + _args, _kwargs)
return val
def ReadLines(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_ReadLines,(self,) + _args, _kwargs)
return val
def ReadNodes(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_ReadNodes,(self,) + _args, _kwargs)
return val
def RecentreAll(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_RecentreAll,(self,) + _args, _kwargs)
return val
def Redraw(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_Redraw,(self,) + _args, _kwargs)
return val
def RemoveAllShapes(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_RemoveAllShapes,(self,) + _args, _kwargs)
return val
def RemoveShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_RemoveShape,(self,) + _args, _kwargs)
return val
def SaveFile(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_SaveFile,(self,) + _args, _kwargs)
return val
def SetCanvas(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_SetCanvas,(self,) + _args, _kwargs)
return val
def SetGridSpacing(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_SetGridSpacing,(self,) + _args, _kwargs)
return val
def SetMouseTolerance(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_SetMouseTolerance,(self,) + _args, _kwargs)
return val
def SetQuickEditMode(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_SetQuickEditMode,(self,) + _args, _kwargs)
return val
def SetSnapToGrid(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_SetSnapToGrid,(self,) + _args, _kwargs)
return val
def ShowAll(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_ShowAll,(self,) + _args, _kwargs)
return val
def Snap(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxDiagram_Snap,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxDiagram instance at %s>" % (self.this,)
class wxDiagram(wxDiagramPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglcanvasc.new_wxDiagram,_args,_kwargs)
self.thisown = 1
class wxPyShapeCanvasPtr(wxScrolledWindowPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas__setSelf,(self,) + _args, _kwargs)
return val
def AddShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_AddShape,(self,) + _args, _kwargs)
return val
def FindShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_FindShape,(self,) + _args, _kwargs)
return val
def FindFirstSensitiveShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_FindFirstSensitiveShape,(self,) + _args, _kwargs)
return val
def GetDiagram(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_GetDiagram,(self,) + _args, _kwargs)
if val: val = wxDiagramPtr(val)
return val
def GetQuickEditMode(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_GetQuickEditMode,(self,) + _args, _kwargs)
return val
def InsertShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_InsertShape,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_base_OnRightClick,(self,) + _args, _kwargs)
return val
def Redraw(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_Redraw,(self,) + _args, _kwargs)
return val
def RemoveShape(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_RemoveShape,(self,) + _args, _kwargs)
return val
def SetDiagram(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_SetDiagram,(self,) + _args, _kwargs)
return val
def Snap(self, *_args, **_kwargs):
val = apply(oglcanvasc.wxPyShapeCanvas_Snap,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyShapeCanvas instance at %s>" % (self.this,)
class wxPyShapeCanvas(wxPyShapeCanvasPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglcanvasc.new_wxPyShapeCanvas,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyShapeCanvas)
#wx._StdWindowCallbacks(self)
#wx._StdOnScrollCallbacks(self)
#-------------- FUNCTION WRAPPERS ------------------
#-------------- VARIABLE WRAPPERS ------------------

View File

@@ -1,103 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: oglhelpers.cpp
// Purpose: Some Helper functions to help in data conversions in OGL
//
// Author: Robin Dunn
//
// Created: 3-Sept-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#include <Python.h>
#include "helpers.h"
//---------------------------------------------------------------------------
// This one will work for any class for the VERY generic cases, but beyond that
// the helper needs to know more about the type.
wxList* wxPy_wxListHelper(PyObject* pyList, char* className) {
bool doSave = wxPyRestoreThread();
if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPySaveThread(doSave);
return NULL;
}
int count = PyList_Size(pyList);
wxList* list = new wxList;
if (! list) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
wxPySaveThread(doSave);
return NULL;
}
for (int x=0; x<count; x++) {
PyObject* pyo = PyList_GetItem(pyList, x);
wxObject* wxo = NULL;
if (SWIG_GetPtrObj(pyo, (void **)&wxo, className)) {
char errmsg[1024];
sprintf(errmsg, "Type error, expected list of %s objects", className);
PyErr_SetString(PyExc_TypeError, errmsg);
wxPySaveThread(doSave);
return NULL;
}
list->Append(wxo);
}
wxPySaveThread(doSave);
return list;
}
//---------------------------------------------------------------------------
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList) {
bool doSave = wxPyRestoreThread();
if (!PyList_Check(pyList)) {
PyErr_SetString(PyExc_TypeError, "Expected a list object.");
wxPySaveThread(doSave);
return NULL;
}
int count = PyList_Size(pyList);
wxList* list = new wxList;
if (! list) {
PyErr_SetString(PyExc_MemoryError, "Unable to allocate wxList object");
wxPySaveThread(doSave);
return NULL;
}
for (int x=0; x<count; x++) {
PyObject* pyo = PyList_GetItem(pyList, x);
if (PyTuple_Check(pyo)) {
PyObject* o1 = PyNumber_Float(PyTuple_GetItem(pyo, 0));
PyObject* o2 = PyNumber_Float(PyTuple_GetItem(pyo, 1));
double val1 = (o1 ? PyFloat_AsDouble(o1) : 0.0);
double val2 = (o2 ? PyFloat_AsDouble(o2) : 0.0);
list->Append((wxObject*) new wxRealPoint(val1, val2));
} else {
wxRealPoint* wxo = NULL;
if (SWIG_GetPtrObj(pyo, (void **)&wxo, "_wxRealPoint_p")) {
PyErr_SetString(PyExc_TypeError, "Type error, expected list of wxRealPoint objects or 2-tuples");
wxPySaveThread(doSave);
return NULL;
}
list->Append((wxObject*) new wxRealPoint(*wxo));
}
}
wxPySaveThread(doSave);
return list;
}
//---------------------------------------------------------------------------

View File

@@ -1,262 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: oglhelpers.h
// Purpose: Some Helper functions to help in data conversions in OGL
//
// Author: Robin Dunn
//
// Created: 9-Sept-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __wxp_ogl_helpers__
#define __wxp_ogl_helpers__
#include <wx/ogl/ogl.h>
#include <wx/ogl/basicp.h>
#include <wx/ogl/constrnt.h>
#include <wx/ogl/bmpshape.h>
#include <wx/ogl/drawn.h>
//---------------------------------------------------------------------------
// Define a macro that will be used in the class definintions below
#define WXSHAPE_DEC_CALLBACKS() \
DEC_PYCALLBACK__ (OnDelete); \
DEC_PYCALLBACK__DC (OnDraw); \
DEC_PYCALLBACK__DC (OnDrawContents); \
DEC_PYCALLBACK__DCBOOL (OnDrawBranches); \
DEC_PYCALLBACK__DC (OnMoveLinks); \
DEC_PYCALLBACK__DC (OnErase); \
DEC_PYCALLBACK__DC (OnEraseContents); \
DEC_PYCALLBACK__DC (OnHighlight); \
DEC_PYCALLBACK__2DBL2INT (OnLeftClick); \
DEC_PYCALLBACK__2DBL2INT (OnLeftDoubleClick); \
DEC_PYCALLBACK__2DBL2INT (OnRightClick); \
DEC_PYCALLBACK__2DBL (OnSize); \
DEC_PYCALLBACK_BOOL_DC4DBLBOOL (OnMovePre); \
DEC_PYCALLBACK__DC4DBLBOOL (OnMovePost); \
DEC_PYCALLBACK__BOOL2DBL2INT (OnDragLeft); \
DEC_PYCALLBACK__2DBL2INT (OnBeginDragLeft); \
DEC_PYCALLBACK__2DBL2INT (OnEndDragLeft); \
DEC_PYCALLBACK__BOOL2DBL2INT (OnDragRight); \
DEC_PYCALLBACK__2DBL2INT (OnBeginDragRight); \
DEC_PYCALLBACK__2DBL2INT (OnEndDragRight); \
DEC_PYCALLBACK__DC4DBL (OnDrawOutline); \
DEC_PYCALLBACK__DC (OnDrawControlPoints); \
DEC_PYCALLBACK__DC (OnEraseControlPoints); \
DEC_PYCALLBACK__DCBOOL (OnMoveLink); \
DEC_PYCALLBACK__WXCPBOOL2DBL2INT(OnSizingDragLeft); \
DEC_PYCALLBACK__WXCP2DBL2INT (OnSizingBeginDragLeft);\
DEC_PYCALLBACK__WXCP2DBL2INT (OnSizingEndDragLeft); \
DEC_PYCALLBACK__2DBL (OnBeginSize); \
DEC_PYCALLBACK__2DBL (OnEndSize); \
\
PYPRIVATE;
#define WXSHAPE_IMP_CALLBACKS(CLASS, PARENT) \
IMP_PYCALLBACK__ (CLASS, PARENT, OnDelete); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnDraw); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnDrawContents); \
IMP_PYCALLBACK__DCBOOL (CLASS, PARENT, OnDrawBranches); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnMoveLinks); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnErase); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnEraseContents); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnHighlight); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnLeftClick); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnLeftDoubleClick); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnRightClick); \
IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnSize); \
IMP_PYCALLBACK_BOOL_DC4DBLBOOL (CLASS, PARENT, OnMovePre); \
IMP_PYCALLBACK__DC4DBLBOOL (CLASS, PARENT, OnMovePost); \
IMP_PYCALLBACK__BOOL2DBL2INT (CLASS, PARENT, OnDragLeft); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnBeginDragLeft); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnEndDragLeft); \
IMP_PYCALLBACK__BOOL2DBL2INT (CLASS, PARENT, OnDragRight); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnBeginDragRight); \
IMP_PYCALLBACK__2DBL2INT (CLASS, PARENT, OnEndDragRight); \
IMP_PYCALLBACK__DC4DBL (CLASS, PARENT, OnDrawOutline); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnDrawControlPoints); \
IMP_PYCALLBACK__DC (CLASS, PARENT, OnEraseControlPoints); \
IMP_PYCALLBACK__DCBOOL (CLASS, PARENT, OnMoveLink); \
IMP_PYCALLBACK__WXCPBOOL2DBL2INT(CLASS, PARENT, OnSizingDragLeft); \
IMP_PYCALLBACK__WXCP2DBL2INT (CLASS, PARENT, OnSizingBeginDragLeft);\
IMP_PYCALLBACK__WXCP2DBL2INT (CLASS, PARENT, OnSizingEndDragLeft); \
IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnBeginSize); \
IMP_PYCALLBACK__2DBL (CLASS, PARENT, OnEndSize); \
// This one may be difficult...
//PYCALLBACK__??????? (PARENT, OnChangeAttachment);
//---------------------------------------------------------------------------
// These are prototypes of some helper functions found in oglhelpers.cpp
wxList* wxPy_wxListHelper(PyObject* pyList, char* className);
wxList* wxPy_wxRealPoint_ListHelper(PyObject* pyList);
//---------------------------------------------------------------------------
// Classes that derive from the shapes and such, but which know how to turn
// virtual callbacks into Python callbacks.
class wxPyShapeCanvas : public wxShapeCanvas {
public:
wxPyShapeCanvas(wxWindow* parent = NULL, wxWindowID id = -1,
const wxPoint& pos = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize,
long style = wxBORDER)
: wxShapeCanvas(parent, id, pos, size, style) {}
DEC_PYCALLBACK__2DBLINT(OnBeginDragLeft);
DEC_PYCALLBACK__2DBLINT(OnBeginDragRight);
DEC_PYCALLBACK__2DBLINT(OnEndDragLeft);
DEC_PYCALLBACK__2DBLINT(OnEndDragRight);
DEC_PYCALLBACK__BOOL2DBLINT(OnDragLeft);
DEC_PYCALLBACK__BOOL2DBLINT(OnDragRight);
DEC_PYCALLBACK__2DBLINT(OnLeftClick);
DEC_PYCALLBACK__2DBLINT(OnRightClick);
PYPRIVATE;
};
class wxPyShapeEvtHandler : public wxShapeEvtHandler {
public:
wxPyShapeEvtHandler(wxShapeEvtHandler *prev = NULL, wxShape *shape = NULL)
: wxShapeEvtHandler(prev, shape) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyShape : public wxShape {
public:
wxPyShape(wxPyShapeCanvas *can = NULL)
: wxShape(can) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyRectangleShape : public wxRectangleShape {
public:
wxPyRectangleShape(double width = 0.0, double height = 0.0)
: wxRectangleShape(width, height) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyControlPoint : public wxControlPoint {
public:
wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
wxPyShape *object = NULL,
double size = 0.0, double the_xoffset = 0.0,
double the_yoffset = 0.0, int the_type = 0)
: wxControlPoint(the_canvas, object, size,
the_xoffset, the_yoffset, the_type) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyBitmapShape : public wxBitmapShape {
public:
wxPyBitmapShape() : wxBitmapShape() {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyDrawnShape : public wxDrawnShape {
public:
wxPyDrawnShape() : wxDrawnShape() {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyCompositeShape : public wxCompositeShape {
public:
wxPyCompositeShape() : wxCompositeShape() {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyDividedShape : public wxDividedShape {
public:
wxPyDividedShape(double width = 0.0, double height = 0.0)
: wxDividedShape(width, height) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyDivisionShape : public wxDivisionShape {
public:
wxPyDivisionShape() : wxDivisionShape() {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyEllipseShape : public wxEllipseShape {
public:
wxPyEllipseShape(double width = 0.0, double height = 0.0)
: wxEllipseShape(width, height) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyCircleShape : public wxCircleShape {
public:
wxPyCircleShape(double width = 0.0)
: wxCircleShape(width) {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyLineShape : public wxLineShape {
public:
wxPyLineShape() : wxLineShape() {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyPolygonShape : public wxPolygonShape {
public:
wxPyPolygonShape() : wxPolygonShape() {}
WXSHAPE_DEC_CALLBACKS();
};
class wxPyTextShape : public wxTextShape {
public:
wxPyTextShape(double width = 0.0, double height = 0.0)
: wxTextShape(width, height) {}
WXSHAPE_DEC_CALLBACKS();
};
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
#endif

File diff suppressed because it is too large Load Diff

View File

@@ -1,574 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: oglshapes.i
// Purpose: SWIG definitions for the wxWindows Object Graphics Library
//
// Author: Robin Dunn
//
// Created: 3-Sept-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module oglshapes
%{
#include "helpers.h"
#include "oglhelpers.h"
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%import windows.i
%extern _defs.i
%extern misc.i
%extern gdi.i
%include _ogldefs.i
%import oglbasic.i
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
class wxPseudoMetaFile {
public:
wxPseudoMetaFile();
~wxPseudoMetaFile();
void Draw(wxDC& dc, double xoffset, double yoffset);
void WriteAttributes(wxExpr *clause, int whichAngle);
void ReadAttributes(wxExpr *clause, int whichAngle);
void Clear();
void Copy(wxPseudoMetaFile& copy);
void Scale(double sx, double sy);
void ScaleTo(double w, double h);
void Translate(double x, double y);
void Rotate(double x, double y, double theta);
bool LoadFromMetaFile(char* filename, double *width, double *height);
void GetBounds(double *minX, double *minY, double *maxX, double *maxY);
void CalculateSize(wxDrawnShape* shape);
// **** fix these... is it even possible? these are lists of various GDI opperations (not the objects...)
// wxList& GetOutlineColours();
// wxList& GetFillColours();
// wxList& GetOps();
void SetRotateable(bool rot);
bool GetRotateable();
void SetSize(double w, double h);
void SetFillBrush(wxBrush* brush);
wxBrush* GetFillBrush();
void SetOutlinePen(wxPen* pen);
wxPen* GetOutlinePen();
void SetOutlineOp(int op);
int GetOutlineOp();
bool IsValid();
void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
void DrawRectangle(const wxRect& rect);
void DrawRoundedRectangle(const wxRect& rect, double radius);
void DrawArc(const wxPoint& centrePt, const wxPoint& startPt, const wxPoint& endPt);
void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
void DrawEllipse(const wxRect& rect);
void DrawPoint(const wxPoint& pt);
void DrawText(const wxString& text, const wxPoint& pt);
void DrawLines(int PCOUNT, wxPoint* points);
void DrawPolygon(int PCOUNT, wxPoint* points, int flags = 0);
void DrawSpline(int PCOUNT, wxPoint* points);
void SetClippingRect(const wxRect& rect);
void DestroyClippingRect();
void SetPen(wxPen* pen, bool isOutline = FALSE);
void SetBrush(wxBrush* brush, bool isFill = FALSE);
void SetFont(wxFont* font);
void SetTextColour(const wxColour& colour);
void SetBackgroundColour(const wxColour& colour);
void SetBackgroundMode(int mode);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyRectangleShape, wxRectangleShape);
%}
class wxPyRectangleShape : public wxPyShape {
public:
wxPyRectangleShape(double width = 0.0, double height = 0.0);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyRectangleShape)"
void SetCornerRadius(double radius);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyControlPoint, wxControlPoint);
%}
class wxPyControlPoint : public wxPyRectangleShape {
public:
wxPyControlPoint(wxPyShapeCanvas *the_canvas = NULL,
wxPyShape *object = NULL,
double size = 0.0, double the_xoffset = 0.0,
double the_yoffset = 0.0, int the_type = 0);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyControlPoint)"
void SetCornerRadius(double radius);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyBitmapShape, wxBitmapShape);
%}
class wxPyBitmapShape : public wxPyRectangleShape {
public:
wxPyBitmapShape();
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyBitmapShape)"
wxBitmap& GetBitmap();
wxString GetFilename();
void SetBitmap(const wxBitmap& bitmap);
void SetFilename(const wxString& filename);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyDrawnShape, wxDrawnShape);
%}
class wxPyDrawnShape : public wxPyRectangleShape {
public:
wxPyDrawnShape();
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDrawnShape)"
void CalculateSize();
void DestroyClippingRect();
void DrawArc(const wxPoint& centrePoint, const wxPoint& startPoint,
const wxPoint& endPoint);
void DrawAtAngle(int angle);
void DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle);
void DrawLine(const wxPoint& point1, const wxPoint& point2);
void DrawLines(int PCOUNT, wxPoint* points);
void DrawPoint(const wxPoint& point);
void DrawPolygon(int PCOUNT, wxPoint* points, int flags = 0);
void DrawRectangle(const wxRect& rect);
void DrawRoundedRectangle(const wxRect& rect, double radius);
void DrawSpline(int PCOUNT, wxPoint* points);
void DrawText(const wxString& text, const wxPoint& point);
int GetAngle();
wxPseudoMetaFile& GetMetaFile();
double GetRotation();
bool LoadFromMetaFile(char * filename);
void Rotate(double x, double y, double theta);
void SetClippingRect(const wxRect& rect);
void SetDrawnBackgroundColour(const wxColour& colour);
void SetDrawnBackgroundMode(int mode);
void SetDrawnBrush(wxBrush* pen, bool isOutline = FALSE);
void SetDrawnFont(wxFont* font);
void SetDrawnPen(wxPen* pen, bool isOutline = FALSE);
void SetDrawnTextColour(const wxColour& colour);
void Scale(double sx, double sy);
void SetSaveToFile(bool save);
void Translate(double x, double y);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
class wxOGLConstraint {
public:
//wxOGLConstraint(int type, wxPyShape *constraining, wxList& constrained);
%addmethods {
wxOGLConstraint(int type, wxPyShape *constraining, PyObject* constrained) {
wxList* list = wxPy_wxListHelper(constrained, "_wxPyShape_p");
wxOGLConstraint* rv = new wxOGLConstraint(type, constraining, *list);
delete list;
return rv;
}
}
~wxOGLConstraint();
bool Evaluate();
void SetSpacing(double x, double y);
bool Equals(double a, double b);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyCompositeShape, wxCompositeShape);
%}
class wxPyCompositeShape : public wxPyRectangleShape {
public:
wxPyCompositeShape();
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyCompositeShape)"
void AddChild(wxPyShape *child, wxPyShape *addAfter = NULL);
wxOGLConstraint * AddConstraint(wxOGLConstraint *constraint);
//wxOGLConstraint * AddConstraint(int type,
// wxPyShape *constraining,
// wxList& constrained);
%addmethods {
wxOGLConstraint * AddConstrainedShapes(int type, wxPyShape *constraining,
PyObject* constrained) {
wxList* list = wxPy_wxListHelper(constrained, "_wxPyShape_p");
wxOGLConstraint* rv = self->AddConstraint(type, constraining, *list);
delete list;
return rv;
}
}
%name(AddSimpleConstraint)wxOGLConstraint* AddConstraint(int type,
wxPyShape *constraining,
wxPyShape *constrained);
void CalculateSize();
bool ContainsDivision(wxPyDivisionShape *division);
void DeleteConstraint(wxOGLConstraint *constraint);
void DeleteConstraintsInvolvingChild(wxPyShape *child);
// **** Needs an output typemap
//wxOGLConstraint * FindConstraint(long id, wxPyCompositeShape **actualComposite);
wxPyShape * FindContainerImage();
// wxList& GetConstraints();
// wxList& GetDivisions();
%addmethods {
PyObject* GetConstraints() {
wxList& list = self->GetConstraints();
return wxPy_ConvertList(&list, "wxOGLConstraint");
}
PyObject* GetDivisions() {
wxList& list = self->GetDivisions();
return wxPy_ConvertList(&list, "wxPyDivisionShape");
}
}
void MakeContainer();
bool Recompute();
void RemoveChild(wxPyShape *child);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyDividedShape, wxDividedShape);
%}
class wxPyDividedShape : public wxPyRectangleShape {
public:
wxPyDividedShape(double width = 0.0, double height = 0.0);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDividedShape)"
void EditRegions();
void SetRegionSizes();
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyDivisionShape, wxDivisionShape);
%}
class wxPyDivisionShape : public wxPyCompositeShape {
public:
wxPyDivisionShape();
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyDivisionShape)"
void AdjustBottom(double bottom, bool test);
void AdjustLeft(double left, bool test);
void AdjustRight(double right, bool test);
void AdjustTop(double top, bool test);
void Divide(int direction);
void EditEdge(int side);
wxPyDivisionShape * GetBottomSide();
int GetHandleSide();
wxPyDivisionShape * GetLeftSide();
wxString GetLeftSideColour();
wxPen * GetLeftSidePen();
wxPyDivisionShape * GetRightSide();
wxPyDivisionShape * GetTopSide();
wxPen * GetTopSidePen();
void ResizeAdjoining(int side, double newPos, bool test);
void PopupMenu(double x, double y);
void SetBottomSide(wxPyDivisionShape *shape);
void SetHandleSide(int side);
void SetLeftSide(wxPyDivisionShape *shape);
void SetLeftSideColour(const wxString& colour);
void SetLeftSidePen(wxPen *pen);
void SetRightSide(wxPyDivisionShape *shape);
void SetTopSide(wxPyDivisionShape *shape);
void SetTopSideColour(const wxString& colour);
void SetTopSidePen(wxPen *pen);
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,369 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: oglshapes2.i
// Purpose: SWIG definitions for the wxWindows Object Graphics Library
//
// Author: Robin Dunn
//
// Created: 3-Sept-1999
// RCS-ID: $Id$
// Copyright: (c) 1998 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module oglshapes2
%{
#include "helpers.h"
#include "oglhelpers.h"
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%import windows.i
%extern _defs.i
%extern misc.i
%extern gdi.i
%include _ogldefs.i
%import oglbasic.i
%import oglshapes.i
%pragma(python) code = "import wx"
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyEllipseShape, wxEllipseShape);
%}
class wxPyEllipseShape : public wxPyShape {
public:
wxPyEllipseShape(double width = 0.0, double height = 0.0);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyEllipseShape)"
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyCircleShape, wxCircleShape);
%}
class wxPyCircleShape : public wxPyEllipseShape {
public:
wxPyCircleShape(double width = 0.0);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyCircleShape)"
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
class wxArrowHead {
public:
wxArrowHead(int type = 0,
int end = 0,
double size = 0.0,
double dist = 0.0,
const char * name = "",
wxPseudoMetaFile *mf = NULL,
long arrowId = -1);
~wxArrowHead();
int _GetType();
int GetPosition();
void SetPosition(int pos);
double GetXOffset();
double GetYOffset();
double GetSpacing();
double GetSize();
wxString GetName();
void SetXOffset(double x);
void SetYOffset(double y);
wxPseudoMetaFile *GetMetaFile();
long GetId();
int GetArrowEnd();
double GetArrowSize();
void SetSize(double size);
void SetSpacing(double sp);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyLineShape, wxLineShape);
%}
class wxPyLineShape : public wxPyShape {
public:
wxPyLineShape();
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyLineShape)"
void AddArrow(int type, int end = ARROW_POSITION_END,
double arrowSize = 10.0, double xOffset = 0.0,
char* name = "", wxPseudoMetaFile *mf = NULL,
long arrowId = -1);
//void AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int end);
%addmethods {
void AddArrowOrdered(wxArrowHead *arrow, PyObject* referenceList, int end) {
wxList* list = wxPy_wxListHelper(referenceList, "_wxArrowHead_p");
self->AddArrowOrdered(arrow, *list, end);
delete list;
}
}
bool ClearArrow(const wxString& name);
void ClearArrowsAtPosition(int position = -1);
void DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool proportionalOffset);
%name(DeleteArrowHeadId)bool DeleteArrowHead(long arrowId);
bool DeleteArrowHead(int position, const wxString& name);
bool DeleteLineControlPoint();
void DrawArrows(wxDC& dc);
void DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
void EraseRegion(wxDC& dc, wxShapeRegion *region, double x, double y);
%name(FindArrowHeadId)wxArrowHead * FindArrowHead(long arrowId);
wxArrowHead * FindArrowHead(int position, const wxString& name);
void FindLineEndPoints(double *OUTPUT, double *OUTPUT,
double *OUTPUT, double *OUTPUT);
int FindLinePosition(double x, double y);
double FindMinimumWidth();
void FindNth(wxPyShape *image, int *OUTPUT, int *OUTPUT, bool incoming);
int GetAttachmentFrom();
int GetAttachmentTo();
void GetEnds(double *OUTPUT, double *OUTPUT, double *OUTPUT, double *OUTPUT);
wxPyShape * GetFrom();
void GetLabelPosition(int position, double *OUTPUT, double *OUTPUT);
wxPoint * GetNextControlPoint(wxPyShape *shape);
wxPyShape * GetTo();
void Initialise();
void InsertLineControlPoint(wxDC* dc);
bool IsEnd(wxPyShape *shape);
bool IsSpline();
void MakeLineControlPoints(int n);
void SetAttachmentFrom(int fromAttach);
void SetAttachments(int fromAttach, int toAttach);
void SetAttachmentTo(int toAttach);
void SetEnds(double x1, double y1, double x2, double y2);
void SetFrom(wxPyShape *object);
void SetIgnoreOffsets(bool ignore);
void SetSpline(bool spline);
void SetTo(wxPyShape *object);
void Straighten(wxDC* dc = NULL);
void Unlink();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyPolygonShape, wxPolygonShape);
%}
class wxPyPolygonShape : public wxPyShape {
public:
wxPyPolygonShape();
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyPolygonShape)"
// void Create(wxList* points);
%addmethods {
PyObject* Create(PyObject* points) {
wxList* list = wxPy_wxRealPoint_ListHelper(points);
if (list) {
self->Create(list);
Py_INCREF(Py_None);
return Py_None;
}
else return NULL;
}
}
void AddPolygonPoint(int pos = 0);
void CalculatePolygonCentre();
void DeletePolygonPoint(int pos = 0);
// wxList* GetPoints();
%addmethods {
PyObject* GetPoints() {
wxList* list = self->GetPoints();
return wxPy_ConvertList(list, "wxRealPoint");
}
}
void UpdateOriginalPoints();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------
%{
WXSHAPE_IMP_CALLBACKS(wxPyTextShape, wxTextShape);
%}
class wxPyTextShape : public wxPyRectangleShape {
public:
wxPyTextShape(double width = 0.0, double height = 0.0);
void _setSelf(PyObject* self, PyObject* _class);
%pragma(python) addtomethod = "__init__:self._setSelf(self, wxPyTextShape)"
void base_OnDelete();
void base_OnDraw(wxDC& dc);
void base_OnDrawContents(wxDC& dc);
void base_OnDrawBranches(wxDC& dc, bool erase = FALSE);
void base_OnMoveLinks(wxDC& dc);
void base_OnErase(wxDC& dc);
void base_OnEraseContents(wxDC& dc);
void base_OnHighlight(wxDC& dc);
void base_OnLeftClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnLeftDoubleClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnRightClick(double x, double y, int keys = 0, int attachment = 0);
void base_OnSize(double x, double y);
bool base_OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnMovePost(wxDC& dc, double x, double y, double old_x, double old_y, bool display = TRUE);
void base_OnDragLeft(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragLeft(double x, double y, int keys=0, int attachment = 0);
void base_OnDragRight(bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnEndDragRight(double x, double y, int keys=0, int attachment = 0);
void base_OnDrawOutline(wxDC& dc, double x, double y, double w, double h);
void base_OnDrawControlPoints(wxDC& dc);
void base_OnEraseControlPoints(wxDC& dc);
void base_OnMoveLink(wxDC& dc, bool moveControlPoints = TRUE);
void base_OnSizingDragLeft(wxPyControlPoint* pt, bool draw, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingBeginDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnSizingEndDragLeft(wxPyControlPoint* pt, double x, double y, int keys=0, int attachment = 0);
void base_OnBeginSize(double w, double h);
void base_OnEndSize(double w, double h);
// void base_OnChangeAttachment(int attachment, wxPyLineShape* line, wxList& ordering);
};
//---------------------------------------------------------------------------

View File

@@ -1,774 +0,0 @@
# This file was created automatically by SWIG.
import oglshapes2c
from misc import *
from misc2 import *
from windows import *
from gdi import *
from clip_dnd import *
from events import *
from streams import *
from mdi import *
from frames import *
from stattool import *
from controls import *
from controls2 import *
from windows2 import *
from cmndlgs import *
from windows3 import *
from image import *
from printfw import *
from sizers import *
from filesys import *
from utils import *
from oglbasic import *
from oglshapes import *
import wx
class wxPyEllipseShapePtr(wxPyShapePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape__setSelf,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyEllipseShape_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyEllipseShape instance at %s>" % (self.this,)
class wxPyEllipseShape(wxPyEllipseShapePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglshapes2c.new_wxPyEllipseShape,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyEllipseShape)
class wxPyCircleShapePtr(wxPyEllipseShapePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape__setSelf,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyCircleShape_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyCircleShape instance at %s>" % (self.this,)
class wxPyCircleShape(wxPyCircleShapePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglshapes2c.new_wxPyCircleShape,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyCircleShape)
class wxArrowHeadPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,oglshapes2c=oglshapes2c):
if self.thisown == 1 :
oglshapes2c.delete_wxArrowHead(self)
def _GetType(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead__GetType,(self,) + _args, _kwargs)
return val
def GetPosition(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetPosition,(self,) + _args, _kwargs)
return val
def SetPosition(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_SetPosition,(self,) + _args, _kwargs)
return val
def GetXOffset(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetXOffset,(self,) + _args, _kwargs)
return val
def GetYOffset(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetYOffset,(self,) + _args, _kwargs)
return val
def GetSpacing(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetSpacing,(self,) + _args, _kwargs)
return val
def GetSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetSize,(self,) + _args, _kwargs)
return val
def GetName(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetName,(self,) + _args, _kwargs)
return val
def SetXOffset(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_SetXOffset,(self,) + _args, _kwargs)
return val
def SetYOffset(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_SetYOffset,(self,) + _args, _kwargs)
return val
def GetMetaFile(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetMetaFile,(self,) + _args, _kwargs)
if val: val = wxPseudoMetaFilePtr(val)
return val
def GetId(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetId,(self,) + _args, _kwargs)
return val
def GetArrowEnd(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetArrowEnd,(self,) + _args, _kwargs)
return val
def GetArrowSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_GetArrowSize,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_SetSize,(self,) + _args, _kwargs)
return val
def SetSpacing(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxArrowHead_SetSpacing,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxArrowHead instance at %s>" % (self.this,)
class wxArrowHead(wxArrowHeadPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglshapes2c.new_wxArrowHead,_args,_kwargs)
self.thisown = 1
class wxPyLineShapePtr(wxPyShapePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape__setSelf,(self,) + _args, _kwargs)
return val
def AddArrow(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_AddArrow,(self,) + _args, _kwargs)
return val
def AddArrowOrdered(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_AddArrowOrdered,(self,) + _args, _kwargs)
return val
def ClearArrow(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_ClearArrow,(self,) + _args, _kwargs)
return val
def ClearArrowsAtPosition(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_ClearArrowsAtPosition,(self,) + _args, _kwargs)
return val
def DrawArrow(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_DrawArrow,(self,) + _args, _kwargs)
return val
def DeleteArrowHeadId(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_DeleteArrowHeadId,(self,) + _args, _kwargs)
return val
def DeleteArrowHead(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_DeleteArrowHead,(self,) + _args, _kwargs)
return val
def DeleteLineControlPoint(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_DeleteLineControlPoint,(self,) + _args, _kwargs)
return val
def DrawArrows(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_DrawArrows,(self,) + _args, _kwargs)
return val
def DrawRegion(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_DrawRegion,(self,) + _args, _kwargs)
return val
def EraseRegion(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_EraseRegion,(self,) + _args, _kwargs)
return val
def FindArrowHeadId(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_FindArrowHeadId,(self,) + _args, _kwargs)
if val: val = wxArrowHeadPtr(val)
return val
def FindArrowHead(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_FindArrowHead,(self,) + _args, _kwargs)
if val: val = wxArrowHeadPtr(val)
return val
def FindLineEndPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_FindLineEndPoints,(self,) + _args, _kwargs)
return val
def FindLinePosition(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_FindLinePosition,(self,) + _args, _kwargs)
return val
def FindMinimumWidth(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_FindMinimumWidth,(self,) + _args, _kwargs)
return val
def FindNth(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_FindNth,(self,) + _args, _kwargs)
return val
def GetAttachmentFrom(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetAttachmentFrom,(self,) + _args, _kwargs)
return val
def GetAttachmentTo(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetAttachmentTo,(self,) + _args, _kwargs)
return val
def GetEnds(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetEnds,(self,) + _args, _kwargs)
return val
def GetFrom(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetFrom,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def GetLabelPosition(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetLabelPosition,(self,) + _args, _kwargs)
return val
def GetNextControlPoint(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetNextControlPoint,(self,) + _args, _kwargs)
if val: val = wxPointPtr(val)
return val
def GetTo(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_GetTo,(self,) + _args, _kwargs)
if val: val = wxPyShapePtr(val)
return val
def Initialise(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_Initialise,(self,) + _args, _kwargs)
return val
def InsertLineControlPoint(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_InsertLineControlPoint,(self,) + _args, _kwargs)
return val
def IsEnd(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_IsEnd,(self,) + _args, _kwargs)
return val
def IsSpline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_IsSpline,(self,) + _args, _kwargs)
return val
def MakeLineControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_MakeLineControlPoints,(self,) + _args, _kwargs)
return val
def SetAttachmentFrom(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetAttachmentFrom,(self,) + _args, _kwargs)
return val
def SetAttachments(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetAttachments,(self,) + _args, _kwargs)
return val
def SetAttachmentTo(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetAttachmentTo,(self,) + _args, _kwargs)
return val
def SetEnds(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetEnds,(self,) + _args, _kwargs)
return val
def SetFrom(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetFrom,(self,) + _args, _kwargs)
return val
def SetIgnoreOffsets(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetIgnoreOffsets,(self,) + _args, _kwargs)
return val
def SetSpline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetSpline,(self,) + _args, _kwargs)
return val
def SetTo(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_SetTo,(self,) + _args, _kwargs)
return val
def Straighten(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_Straighten,(self,) + _args, _kwargs)
return val
def Unlink(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_Unlink,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyLineShape_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyLineShape instance at %s>" % (self.this,)
class wxPyLineShape(wxPyLineShapePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglshapes2c.new_wxPyLineShape,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyLineShape)
class wxPyPolygonShapePtr(wxPyShapePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape__setSelf,(self,) + _args, _kwargs)
return val
def Create(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_Create,(self,) + _args, _kwargs)
return val
def AddPolygonPoint(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_AddPolygonPoint,(self,) + _args, _kwargs)
return val
def CalculatePolygonCentre(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_CalculatePolygonCentre,(self,) + _args, _kwargs)
return val
def DeletePolygonPoint(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_DeletePolygonPoint,(self,) + _args, _kwargs)
return val
def GetPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_GetPoints,(self,) + _args, _kwargs)
return val
def UpdateOriginalPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_UpdateOriginalPoints,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyPolygonShape_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyPolygonShape instance at %s>" % (self.this,)
class wxPyPolygonShape(wxPyPolygonShapePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglshapes2c.new_wxPyPolygonShape,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyPolygonShape)
class wxPyTextShapePtr(wxPyRectangleShapePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def _setSelf(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape__setSelf,(self,) + _args, _kwargs)
return val
def base_OnDelete(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDelete,(self,) + _args, _kwargs)
return val
def base_OnDraw(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDraw,(self,) + _args, _kwargs)
return val
def base_OnDrawContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDrawContents,(self,) + _args, _kwargs)
return val
def base_OnDrawBranches(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDrawBranches,(self,) + _args, _kwargs)
return val
def base_OnMoveLinks(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnMoveLinks,(self,) + _args, _kwargs)
return val
def base_OnErase(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnErase,(self,) + _args, _kwargs)
return val
def base_OnEraseContents(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnEraseContents,(self,) + _args, _kwargs)
return val
def base_OnHighlight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnHighlight,(self,) + _args, _kwargs)
return val
def base_OnLeftClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnLeftClick,(self,) + _args, _kwargs)
return val
def base_OnLeftDoubleClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnLeftDoubleClick,(self,) + _args, _kwargs)
return val
def base_OnRightClick(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnRightClick,(self,) + _args, _kwargs)
return val
def base_OnSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnSize,(self,) + _args, _kwargs)
return val
def base_OnMovePre(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnMovePre,(self,) + _args, _kwargs)
return val
def base_OnMovePost(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnMovePost,(self,) + _args, _kwargs)
return val
def base_OnDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDragRight,(self,) + _args, _kwargs)
return val
def base_OnBeginDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnBeginDragRight,(self,) + _args, _kwargs)
return val
def base_OnEndDragRight(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnEndDragRight,(self,) + _args, _kwargs)
return val
def base_OnDrawOutline(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDrawOutline,(self,) + _args, _kwargs)
return val
def base_OnDrawControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnDrawControlPoints,(self,) + _args, _kwargs)
return val
def base_OnEraseControlPoints(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnEraseControlPoints,(self,) + _args, _kwargs)
return val
def base_OnMoveLink(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnMoveLink,(self,) + _args, _kwargs)
return val
def base_OnSizingDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnSizingDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingBeginDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnSizingBeginDragLeft,(self,) + _args, _kwargs)
return val
def base_OnSizingEndDragLeft(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnSizingEndDragLeft,(self,) + _args, _kwargs)
return val
def base_OnBeginSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnBeginSize,(self,) + _args, _kwargs)
return val
def base_OnEndSize(self, *_args, **_kwargs):
val = apply(oglshapes2c.wxPyTextShape_base_OnEndSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxPyTextShape instance at %s>" % (self.this,)
class wxPyTextShape(wxPyTextShapePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(oglshapes2c.new_wxPyTextShape,_args,_kwargs)
self.thisown = 1
self._setSelf(self, wxPyTextShape)
#-------------- FUNCTION WRAPPERS ------------------
#-------------- VARIABLE WRAPPERS ------------------

View File

@@ -1,24 +0,0 @@
/* Definitions for Windows/Unix exporting */
#if defined(__WIN32__)
# if defined(_MSC_VER)
# define SWIGEXPORT(a) __declspec(dllexport) a
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
#else
# define SWIGEXPORT(a) a
#endif
#ifdef __cplusplus
extern "C"
#endif
SWIGEXPORT(void) initoglc() {
}

View File

@@ -1,6 +0,0 @@
Makefile
Makefile
contrib
stc_c.exp
stc_c.ilk
stc_c.pch

View File

@@ -1,7 +0,0 @@
Since STC is not always bundled with distributions of wxWindows, in
order for it to be a standard part of wxPython I need to bundle it
here. The contents of the contrib directory are copies of the
relevant parts of the main contrib directory in wxWindows. The
build.py script in this directory will also build the needed files
from there, so you no longer have to worry about aquiring and building
additional libraries beyond wxWindows itself.

View File

@@ -1,4 +0,0 @@
# Stuff these names into the wx namespace so wxPyConstructObject can find them
wx.wxStyledTextEventPtr = wxStyledTextEventPtr
wx.wxStyledTextCtrlPtr = wxStyledTextCtrlPtr

View File

@@ -1,7 +0,0 @@
# The name "stc.cpp" was causing the debugger to get confused with the
# same module name in the stc library, so I changed the name of this
# one to stc_.cpp and this little stub to make the "stc" Python module
# name still usesable for everything that matters.
from stc_ import *

File diff suppressed because it is too large Load Diff

View File

@@ -1,105 +0,0 @@
/////////////////////////////////////////////////////////////////////////////
// Name: stc.i
// Purpose: Wrappers for the wxStyledTextCtrl.
//
// Author: Robin Dunn
//
// Created: 12-Oct-1999
// RCS-ID: $Id$
// Copyright: (c) 2000 by Total Control Software
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
%module stc_
%{
#include "helpers.h"
#include "wx/stc/stc.h"
%}
//---------------------------------------------------------------------------
%include typemaps.i
%include my_typemaps.i
%extern wx.i
%extern windows.i
%extern _defs.i
%extern events.i
%extern controls.i
//----------------------------------------------------------------------
// Get all our defs from the REAL header file.
%include stc.h
//%include SciLexer.h
//----------------------------------------------------------------------
// Python functions to act like the event macros
%pragma(python) code = "
def EVT_STC_CHANGE(win, id, fn):
win.Connect(id, -1, wxEVT_STC_CHANGE, fn)
def EVT_STC_STYLENEEDED(win, id, fn):
win.Connect(id, -1, wxEVT_STC_STYLENEEDED, fn)
def EVT_STC_CHARADDED(win, id, fn):
win.Connect(id, -1, wxEVT_STC_CHARADDED, fn)
def EVT_STC_UPDATEUI(win, id, fn):
win.Connect(id, -1, wxEVT_STC_UPDATEUI, fn)
def EVT_STC_SAVEPOINTREACHED(win, id, fn):
win.Connect(id, -1, wxEVT_STC_SAVEPOINTREACHED, fn)
def EVT_STC_SAVEPOINTLEFT(win, id, fn):
win.Connect(id, -1, wxEVT_STC_SAVEPOINTLEFT, fn)
def EVT_STC_ROMODIFYATTEMPT(win, id, fn):
win.Connect(id, -1, wxEVT_STC_ROMODIFYATTEMPT, fn)
def EVT_STC_DOUBLECLICK(win, id, fn):
win.Connect(id, -1, wxEVT_STC_DOUBLECLICK, fn)
def EVT_STC_MODIFIED(win, id, fn):
win.Connect(id, -1, wxEVT_STC_MODIFIED, fn)
def EVT_STC_KEY(win, id, fn):
win.Connect(id, -1, wxEVT_STC_KEY, fn)
def EVT_STC_MACRORECORD(win, id, fn):
win.Connect(id, -1, wxEVT_STC_MACRORECORD, fn)
def EVT_STC_MARGINCLICK(win, id, fn):
win.Connect(id, -1, wxEVT_STC_MARGINCLICK, fn)
def EVT_STC_NEEDSHOWN(win, id, fn):
win.Connect(id, -1, wxEVT_STC_NEEDSHOWN, fn)
def EVT_STC_POSCHANGED(win, id, fn):
win.Connect(id, -1, wxEVT_STC_POSCHANGED, fn)
"
//----------------------------------------------------------------------
%init %{
wxClassInfo::CleanUpClasses();
wxClassInfo::InitializeClasses();
%}
//----------------------------------------------------------------------
%pragma(python) include="_stcextras.py";
//----------------------------------------------------------------------
//----------------------------------------------------------------------

File diff suppressed because it is too large Load Diff

View File

@@ -1,23 +0,0 @@
/* Definitions for Windows/Unix exporting */
#if defined(__WIN32__)
# if defined(_MSC_VER)
# define SWIGEXPORT(a) __declspec(dllexport) a
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
# else
# define SWIGEXPORT(a) a
# endif
# endif
#else
# define SWIGEXPORT(a) a
#endif
#ifdef __cplusplus
extern "C"
#endif
SWIGEXPORT(void) initstc_c() {
}

View File

@@ -1,7 +0,0 @@
*.pyc
.emacs.desktop
b.bat
hangman_dict.txt
setup.bat
test.out
tmphtml.txt

View File

@@ -1,62 +0,0 @@
import sys, string
from wxPython.wx import *
from wxPython.html import *
import wxPython.lib.wxpTag
#---------------------------------------------------------------------------
class MyAboutBox(wxDialog):
text = '''
<html>
<body bgcolor="#AC76DE">
<center><table bgcolor="#458154" width="100%%" cellspacing="0"
cellpadding="0" border="1">
<tr>
<td align="center">
<h1>wxPython %s</h1>
Running on Python %s<br>
</td>
</tr>
</table>
<p><b>wxPython</b> is a Python extension module that
encapsulates the wxWindows GUI classes.</p>
<p>This demo shows off some of the capabilities
of <b>wxPython</b>. Select items from the menu or tree control,
sit back and enjoy. Be sure to take a peek at the source code for each
demo item so you can learn how to use the classes yourself.</p>
<p><b>wxPython</b> is brought to you by <b>Robin Dunn</b> and<br>
<b>Total Control Software</b>, Copyright (c) 1997-2000.</p>
<p>
<font size="-1">Please see <i>license.txt</i> for licensing information.</font>
</p>
<p><wxp class="wxButton">
<param name="label" value="Okay">
<param name="id" value="wxID_OK">
</wxp></p>
</center>
</body>
</html>
'''
def __init__(self, parent):
wxDialog.__init__(self, parent, -1, 'About the wxPython demo',)
html = wxHtmlWindow(self, -1, size=(420, -1))
py_version = string.split(sys.version)[0]
html.SetPage(self.text % (wx.__version__, py_version))
ir = html.GetInternalRepresentation()
html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
self.SetClientSize(html.GetSize())
self.CentreOnParent(wxBOTH)
#---------------------------------------------------------------------------

View File

@@ -1,130 +0,0 @@
"""
<html><body>
This demo shows how to embed an ActiveX control in a wxPython application, (Win32 only.)
<p>
The MakeActiveXClass function dynamically builds a new Class on the fly, that has the
same signature and semantics as wxWindow. This means that when you call the function
you get back a new class that you can use just like wxWindow, (set the size and position,
use in a sizer, etc.) except its contents will be the COM control.
<p>
This demo embeds the Adobe Acrobat Reader, and gives you some buttons for opening a PDF
file, changing pages, etc. that show how to call methods on the COM object. If you don't
have Acrobat Reader 4.0 installed it won't work.
</body></html>
"""
from wxPython.wx import *
if wxPlatform == '__WXMSW__':
from wxPython.lib.activexwrapper import MakeActiveXClass
import win32com.client.gencache
try:
acrobat = win32com.client.gencache.EnsureModule('{CA8A9783-280D-11CF-A24D-444553540000}', 0x0, 1, 3)
except:
raise ImportError("Can't load PDF.OCX, install Acrobat 4.0")
#----------------------------------------------------------------------
class TestPanel(wxPanel):
def __init__(self, parent):
wxPanel.__init__(self, parent, -1)
self.pdf = None
sizer = wxBoxSizer(wxVERTICAL)
btnSizer = wxBoxSizer(wxHORIZONTAL)
# this function creates a new class that can be used as
# a wxWindow, but contains the given ActiveX control.
ActiveXWrapper = MakeActiveXClass(acrobat.Pdf)
# create an instance of the new class
self.pdf = ActiveXWrapper( self, -1, style=wxSUNKEN_BORDER)
sizer.Add(self.pdf, 1, wxEXPAND)
btn = wxButton(self, wxNewId(), "Open PDF File")
EVT_BUTTON(self, btn.GetId(), self.OnOpenButton)
btnSizer.Add(btn, 1, wxEXPAND|wxALL, 5)
btn = wxButton(self, wxNewId(), "<-- Previous Page")
EVT_BUTTON(self, btn.GetId(), self.OnPrevPageButton)
btnSizer.Add(btn, 1, wxEXPAND|wxALL, 5)
btn = wxButton(self, wxNewId(), "Next Page -->")
EVT_BUTTON(self, btn.GetId(), self.OnNextPageButton)
btnSizer.Add(btn, 1, wxEXPAND|wxALL, 5)
btnSizer.Add(50, -1, 2, wxEXPAND)
sizer.Add(btnSizer, 0, wxEXPAND)
self.SetSizer(sizer)
self.SetAutoLayout(true)
def __del__(self):
if self.pdf:
self.pdf.Cleanup()
self.pdf = None
def OnOpenButton(self, event):
dlg = wxFileDialog(self, wildcard="*.pdf")
if dlg.ShowModal() == wxID_OK:
wxBeginBusyCursor()
self.pdf.LoadFile(dlg.GetPath())
wxEndBusyCursor()
dlg.Destroy()
def OnPrevPageButton(self, event):
self.pdf.gotoPreviousPage()
def OnNextPageButton(self, event):
self.pdf.gotoNextPage()
#----------------------------------------------------------------------
def runTest(frame, nb, log):
if wxPlatform == '__WXMSW__':
win = TestPanel(nb)
return win
else:
dlg = wxMessageDialog(frame, 'This demo only works on MSW.',
'Sorry', wxOK | wxICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
overview = __doc__
#----------------------------------------------------------------------
if __name__ == '__main__':
class TestFrame(wxFrame):
def __init__(self):
wxFrame.__init__(self, None, -1, "ActiveX test -- Acrobat", size=(640, 480),
style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
self.tp = TestPanel(self, sys.stdout)
EVT_CLOSE(self, self.OnCloseWindow)
def OnCloseWindow(self, event):
self.tp.pdf.Cleanup()
self.Destroy()
app = wxPySimpleApp()
frame = TestFrame()
frame.Show(true)
app.MainLoop()

View File

@@ -1,205 +0,0 @@
"""
<html><body>
This demo shows how to embed an ActiveX control in a wxPython
application, (Win32 only.)
<p>
The MakeActiveXClass function dynamically builds a new Class on the
fly, that has the same signature and semantics as wxWindow. This
means that when you call the function you get back a new class that
you can use just like wxWindow, (set the size and position, use in a
sizer, etc.) except its contents will be the COM control.
<p>
This demo embeds the Internet Exploer WebBrowser control, and shows
how to receive events from the COM control. (The title bar and status
bar are updated as pages change, in addition to the log messages being
shown.)
</body></html>
"""
from wxPython.wx import *
if wxPlatform == '__WXMSW__':
from wxPython.lib.activexwrapper import MakeActiveXClass
import win32com.client.gencache
try:
browserModule = win32com.client.gencache.EnsureModule("{EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}", 0, 1, 1)
except:
raise ImportError("IE4 or greater does not appear to be installed.")
#----------------------------------------------------------------------
class TestPanel(wxWindow):
def __init__(self, parent, log, frame=None):
wxWindow.__init__(self, parent, -1)#, style=wxCLIP_CHILDREN)
self.ie = None
self.log = log
self.current = "http://wxPython.org/"
self.frame = frame
if frame:
self.titleBase = frame.GetTitle()
sizer = wxBoxSizer(wxVERTICAL)
btnSizer = wxBoxSizer(wxHORIZONTAL)
# Make a new class that derives from the WebBrowser class in the
# COM module imported above. This class also derives from wxWindow and
# implements the machinery needed to integrate the two worlds.
theClass = MakeActiveXClass(browserModule.WebBrowser,
eventObj = self)
# Create an instance of that class
self.ie = theClass(self, -1, style=wxSUNKEN_BORDER)
#btn = wxButton(self, wxNewId(), " Open ")
#EVT_BUTTON(self, btn.GetId(), self.OnOpenButton)
#btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
btn = wxButton(self, wxNewId(), " Home ")
EVT_BUTTON(self, btn.GetId(), self.OnHomeButton)
btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
btn = wxButton(self, wxNewId(), " <-- ")
EVT_BUTTON(self, btn.GetId(), self.OnPrevPageButton)
btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
btn = wxButton(self, wxNewId(), " --> ")
EVT_BUTTON(self, btn.GetId(), self.OnNextPageButton)
btnSizer.Add(btn, 0, wxEXPAND|wxALL, 5)
txt = wxStaticText(self, -1, "Location:")
btnSizer.Add(txt, 0, wxCENTER|wxALL, 5)
self.location = wxComboBox(self, wxNewId(), "", style=wxCB_DROPDOWN)
EVT_COMBOBOX(self, self.location.GetId(), self.OnLocationSelect)
EVT_KEY_UP(self.location, self.OnLocationKey)
#EVT_CHAR(self.location, self.IgnoreReturn)
btnSizer.Add(self.location, 1, wxEXPAND|wxALL, 5)
sizer.Add(btnSizer, 0, wxEXPAND)
sizer.Add(self.ie, 1, wxEXPAND)
self.ie.Navigate(self.current)
self.location.Append(self.current)
self.SetSizer(sizer)
self.SetAutoLayout(true)
EVT_SIZE(self, self.OnSize)
def OnSize(self, evt):
self.Layout()
def __del__(self):
if self.ie:
self.ie.Cleanup()
self.ie = None
def OnLocationSelect(self, evt):
url = self.location.GetStringSelection()
self.log.write('OnLocationSelect: %s\n' % url)
self.ie.Navigate(url)
def OnLocationKey(self, evt):
if evt.KeyCode() == WXK_RETURN:
URL = self.location.GetValue()
self.location.Append(URL)
self.ie.Navigate(URL)
else:
evt.Skip()
def IgnoreReturn(self, evt):
print 'IgnoreReturn'
if evt.KeyCode() != WXK_RETURN:
evt.Skip()
def OnOpenButton(self, event):
dlg = wxTextEntryDialog(self, "Open Location",
"Enter a full URL or local path",
self.current, wxOK|wxCANCEL)
dlg.CentreOnParent()
if dlg.ShowModal() == wxID_OK:
self.current = dlg.GetValue()
self.ie.Navigate(self.current)
dlg.Destroy()
def OnHomeButton(self, event):
self.ie.GoHome() ## ET Phone Home!
def OnPrevPageButton(self, event):
self.ie.GoBack()
def OnNextPageButton(self, event):
self.ie.GoForward()
# The following event handlers are called by the web browser COM
# control since we passed self to MakeActiveXClass. It will look
# here for matching attributes and call them if they exist. See the
# module generated by makepy for details of method names, etc.
def OnBeforeNavigate2(self, pDisp, URL, *args):
self.log.write('OnBeforeNavigate2: %s\n' % URL)
def OnNavigateComplete2(self, pDisp, URL):
self.log.write('OnNavigateComplete2: %s\n' % URL)
self.current = URL
self.location.SetValue(URL)
def OnTitleChange(self, text):
self.log.write('OnTitleChange: %s\n' % text)
if self.frame:
self.frame.SetTitle(self.titleBase + ' -- ' + text)
def OnStatusTextChange(self, text):
self.log.write('OnStatusTextChange: %s\n' % text)
if self.frame:
self.frame.SetStatusText(text)
#----------------------------------------------------------------------
# for the demo framework...
def runTest(frame, nb, log):
if wxPlatform == '__WXMSW__':
win = TestPanel(nb, log, frame)
return win
else:
dlg = wxMessageDialog(frame, 'This demo only works on MSW.',
'Sorry', wxOK | wxICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
overview = __doc__
#----------------------------------------------------------------------
if __name__ == '__main__':
class TestFrame(wxFrame):
def __init__(self):
wxFrame.__init__(self, None, -1, "ActiveX test -- Internet Explorer",
size=(640, 480),
style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
self.CreateStatusBar()
self.tp = TestPanel(self, sys.stdout, self)
EVT_CLOSE(self, self.OnCloseWindow)
def OnCloseWindow(self, event):
self.tp.ie.Cleanup()
self.Destroy()
app = wxPySimpleApp()
frame = TestFrame()
frame.Show(true)
app.MainLoop()

View File

@@ -1,13 +0,0 @@
from wxPython.wx import *
#---------------------------------------------------------------------------
class ColoredPanel(wxWindow):
def __init__(self, parent, color):
wxWindow.__init__(self, parent, -1,
wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER)
self.SetBackgroundColour(color)
#---------------------------------------------------------------------------

View File

@@ -1,285 +0,0 @@
from wxPython.wx import *
import cPickle
#----------------------------------------------------------------------
class DoodlePad(wxWindow):
def __init__(self, parent, log):
wxWindow.__init__(self, parent, -1, style=wxSUNKEN_BORDER)
self.log = log
self.SetBackgroundColour(wxWHITE)
self.lines = []
self.x = self.y = 0
self.SetCursor(wxStockCursor(wxCURSOR_PENCIL))
EVT_LEFT_DOWN(self, self.OnLeftDown)
EVT_LEFT_UP(self, self.OnLeftUp)
EVT_RIGHT_UP(self, self.OnRightUp)
EVT_MOTION(self, self.OnMotion)
EVT_PAINT(self, self.OnPaint)
def OnPaint(self, event):
dc = wxPaintDC(self)
self.DrawSavedLines(dc)
def DrawSavedLines(self, dc):
dc.BeginDrawing()
dc.SetPen(wxPen(wxBLUE, 3))
for line in self.lines:
for coords in line:
apply(dc.DrawLine, coords)
dc.EndDrawing()
def OnLeftDown(self, event):
if event.ControlDown():
self.StartDragOpperation()
else:
self.curLine = []
self.x, self.y = event.GetPositionTuple()
self.CaptureMouse()
def OnLeftUp(self, event):
self.lines.append(self.curLine)
self.curLine = []
self.ReleaseMouse()
def OnRightUp(self, event):
self.lines = []
self.Refresh()
def OnMotion(self, event):
if event.Dragging() and not event.ControlDown():
dc = wxClientDC(self)
dc.BeginDrawing()
dc.SetPen(wxPen(wxBLUE, 3))
coords = (self.x, self.y) + event.GetPositionTuple()
self.curLine.append(coords)
apply(dc.DrawLine, coords)
self.x, self.y = event.GetPositionTuple()
dc.EndDrawing()
def StartDragOpperation(self):
# pickle the lines list
linesdata = cPickle.dumps(self.lines, 1)
# create our own data format and use it in a
# custom data object
ldata = wxCustomDataObject(wxCustomDataFormat("DoodleLines"))
ldata.SetData(linesdata)
# Also create a Bitmap version of the drawing
size = self.GetSize()
bmp = wxEmptyBitmap(size.width, size.height)
dc = wxMemoryDC()
dc.SelectObject(bmp)
dc.SetBackground(wxWHITE_BRUSH)
dc.Clear()
self.DrawSavedLines(dc)
dc.SelectObject(wxNullBitmap)
# Now make a data object for the bitmap and also a composite
# data object holding both of the others.
bdata = wxBitmapDataObject(bmp)
data = wxDataObjectComposite()
data.Add(ldata)
data.Add(bdata)
# And finally, create the drop source and begin the drag
# and drop opperation
dropSource = wxDropSource(self)
dropSource.SetData(data)
self.log.WriteText("Begining DragDrop\n")
result = dropSource.DoDragDrop()
self.log.WriteText("DragDrop completed: %d\n" % result)
#----------------------------------------------------------------------
class DoodleDropTarget(wxPyDropTarget):
def __init__(self, window, log):
wxPyDropTarget.__init__(self)
self.log = log
self.dv = window
# specify the type of data we will accept
self.data = wxCustomDataObject(wxCustomDataFormat("DoodleLines"))
self.SetDataObject(self.data)
# some virtual methods that track the progress of the drag
def OnEnter(self, x, y, d):
self.log.WriteText("OnEnter: %d, %d, %d\n" % (x, y, d))
return wxDragCopy
def OnLeave(self):
self.log.WriteText("OnLeave\n")
def OnDrop(self, x, y):
self.log.WriteText("OnDrop: %d %d\n" % (x, y))
return true
#def OnDragOver(self, x, y, d):
# self.log.WriteText("OnDragOver: %d, %d, %d\n" % (x, y, d))
# return wxDragCopy
# Called when OnDrop returns true. We need to get the data and
# do something with it.
def OnData(self, x, y, d):
self.log.WriteText("OnData: %d, %d, %d\n" % (x, y, d))
# copy the data from the drag source to out data object
if self.GetData():
# convert it back to a list of lines and give it to the viewer
linesdata = self.data.GetData()
lines = cPickle.loads(linesdata)
self.dv.SetLines(lines)
return d
class DoodleViewer(wxWindow):
def __init__(self, parent, log):
wxWindow.__init__(self, parent, -1, style=wxSUNKEN_BORDER)
self.log = log
self.SetBackgroundColour(wxWHITE)
self.lines = []
self.x = self.y = 0
dt = DoodleDropTarget(self, log)
self.SetDropTarget(dt)
EVT_PAINT(self, self.OnPaint)
def SetLines(self, lines):
self.lines = lines
self.Refresh()
def OnPaint(self, event):
dc = wxPaintDC(self)
self.DrawSavedLines(dc)
def DrawSavedLines(self, dc):
dc.BeginDrawing()
dc.SetPen(wxPen(wxRED, 3))
for line in self.lines:
for coords in line:
apply(dc.DrawLine, coords)
dc.EndDrawing()
#----------------------------------------------------------------------
class CustomDnDPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, false))
sizer = wxBoxSizer(wxHORIZONTAL)
text = wxStaticText(self, -1,
"Draw a little picture in this window\n"
"then Ctrl-Drag it to the lower \n"
"window or to another application\n"
"that accepts BMP's as a drop target.\n\n"
"The lower window is accepting a\n"
"custom data type that is a pickled\n"
"Python list of lines data.")
sizer.Add(text, 1, wxALL, 10)
insizer = wxBoxSizer(wxVERTICAL)
insizer.Add(DoodlePad(self, log), 1, wxEXPAND|wxALL, 5)
insizer.Add(DoodleViewer(self, log), 1, wxEXPAND|wxALL, 5)
sizer.Add(insizer, 1, wxEXPAND)
self.SetAutoLayout(true)
self.SetSizer(sizer)
#----------------------------------------------------------------------
#----------------------------------------------------------------------
class TestPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
self.SetAutoLayout(true)
sizer = wxBoxSizer(wxVERTICAL)
msg = "Custom Drag-And-Drop"
text = wxStaticText(self, -1, "", style=wxALIGN_CENTRE)
text.SetFont(wxFont(24, wxSWISS, wxNORMAL, wxBOLD, false))
text.SetLabel(msg)
w,h = text.GetTextExtent(msg)
text.SetSize(wxSize(w,h+1))
text.SetForegroundColour(wxBLUE)
sizer.Add(text, 0, wxEXPAND|wxALL, 5)
sizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)
sizer.Add(CustomDnDPanel(self, log), 1, wxEXPAND)
self.SetSizer(sizer)
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
if __name__ == '__main__':
import sys
class DummyLog:
def WriteText(self, text):
sys.stdout.write(text)
class TestApp(wxApp):
def OnInit(self):
self.MakeFrame()
return true
def MakeFrame(self, event=None):
frame = wxFrame(None, -1, "Custom Drag and Drop", size=(550,400))
menu = wxMenu()
menu.Append(6543, "Window")
mb = wxMenuBar()
mb.Append(menu, "New")
frame.SetMenuBar(mb)
EVT_MENU(frame, 6543, self.MakeFrame)
panel = TestPanel(frame, DummyLog())
frame.Show(true)
self.SetTopWindow(frame)
app = TestApp(0)
app.MainLoop()
#----------------------------------------------------------------------
overview = """\
This demo shows Drag and Drop using a custom data type and a custom data object. A type called "DoodleLines" is created and a Python Pickle of a list is actually transfered in the drag and drop opperation.
A second data object is also created containing a bitmap of the image and is made available to any drop target that accepts bitmaps, such as MS Word.
The two data objects are combined in a wxDataObjectComposite and the rest is handled by the framework.
"""

View File

@@ -1,127 +0,0 @@
#!/usr/bin/env python
#----------------------------------------------------------------------------
# Name: DialogUnits.py
# Purpose: A minimal wxPython program that is a bit smarter than test1.
#
# Author: Robin Dunn
#
# Created: A long time ago, in a galaxy far, far away...
# RCS-ID: $Id$
# Copyright: (c) 1998 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------------
## import all of the wxPython GUI package
from wxPython.wx import *
#---------------------------------------------------------------------------
## Create a new frame class, derived from the wxPython Frame.
class MyFrame(wxFrame):
def __init__(self, parent, id, title):
# First, call the base class' __init__ method to create the frame
wxFrame.__init__(self, parent, id, title,
wxPoint(100, 100), wxSize(160, 100))
# Associate some events with methods of this class
EVT_SIZE(self, self.OnSize)
EVT_MOVE(self, self.OnMove)
EVT_CLOSE(self, self.OnCloseWindow)
# Add a panel and some controls to display the size and position
panel = wxPanel(self, -1)
wxStaticText(panel, -1, "Size:",
wxDLG_PNT(panel, wxPoint(4, 4)), wxDefaultSize)
wxStaticText(panel, -1, "Pos:",
wxDLG_PNT(panel, wxPoint(4, 16)), wxDefaultSize)
self.sizeCtrl = wxTextCtrl(panel, -1, "",
wxDLG_PNT(panel, wxPoint(24, 4)),
wxDLG_SZE(panel, wxSize(36, -1)),
wxTE_READONLY)
self.posCtrl = wxTextCtrl(panel, -1, "",
wxDLG_PNT(panel, wxPoint(24, 16)),
wxDLG_SZE(panel, wxSize(36, -1)),
wxTE_READONLY)
#print wxDLG_PNT(panel, wxPoint(24, 4)), wxDLG_SZE(panel, wxSize(36, -1))
#print wxDLG_PNT(panel, wxPoint(24, 16)),wxDLG_SZE(panel, wxSize(36, -1))
# This method is called automatically when the CLOSE event is
# sent to this window
def OnCloseWindow(self, event):
# tell the window to kill itself
self.Destroy()
# This method is called by the System when the window is resized,
# because of the association above.
def OnSize(self, event):
size = event.GetSize()
self.sizeCtrl.SetValue("%s, %s" % (size.width, size.height))
# tell the event system to continue looking for an event handler,
# so the default handler will get called.
event.Skip()
# This method is called by the System when the window is moved,
# because of the association above.
def OnMove(self, event):
pos = event.GetPosition()
self.posCtrl.SetValue("%s, %s" % (pos.x, pos.y))
#---------------------------------------------------------------------------
# if running standalone
if __name__ == "__main__":
# Every wxWindows application must have a class derived from wxApp
class MyApp(wxApp):
# wxWindows calls this method to initialize the application
def OnInit(self):
# Create an instance of our customized Frame class
frame = MyFrame(NULL, -1, "This is a test")
frame.Show(true)
# Tell wxWindows that this is our main window
self.SetTopWindow(frame)
# Return a success flag
return true
app = MyApp(0) # Create an instance of the application class
app.MainLoop() # Tell it to start processing events
#---------------------------------------------------------------------------
# if running as part of the Demo Framework...
def runTest(frame, nb, log):
win = MyFrame(frame, -1, "This is a test")
frame.otherWin = win
win.Show(true)
overview = """\
A simple example that shows how to use Dialog Units.
"""
#----------------------------------------------------------------------------
#

View File

@@ -1,196 +0,0 @@
from wxPython.wx import *
#----------------------------------------------------------------------
class ClipTextPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
self.log = log
#self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, false))
sizer = wxBoxSizer(wxVERTICAL)
sizer.Add(wxStaticText(self, -1,
"Copy/Paste text to/from\n"
"this window and other apps"), 0, wxEXPAND|wxALL, 2)
self.text = wxTextCtrl(self, -1, "", style=wxTE_MULTILINE|wxHSCROLL)
sizer.Add(self.text, 1, wxEXPAND)
hsz = wxBoxSizer(wxHORIZONTAL)
hsz.Add(wxButton(self, 6050, " Copy "), 1, wxEXPAND|wxALL, 2)
hsz.Add(wxButton(self, 6051, " Paste "), 1, wxEXPAND|wxALL, 2)
sizer.Add(hsz, 0, wxEXPAND)
sizer.Add(wxButton(self, 6052, " Copy Bitmap "), 0, wxEXPAND|wxALL, 2)
EVT_BUTTON(self, 6050, self.OnCopy)
EVT_BUTTON(self, 6051, self.OnPaste)
EVT_BUTTON(self, 6052, self.OnCopyBitmap)
self.SetAutoLayout(true)
self.SetSizer(sizer)
def OnCopy(self, evt):
self.do = wxTextDataObject()
self.do.SetText(self.text.GetValue())
wxTheClipboard.Open()
wxTheClipboard.SetData(self.do)
wxTheClipboard.Close()
def OnPaste(self, evt):
do = wxTextDataObject()
wxTheClipboard.Open()
success = wxTheClipboard.GetData(do)
wxTheClipboard.Close()
if success:
self.text.SetValue(do.GetText())
else:
wxMessageBox("There is no data in the clipboard in the required format",
"Error")
def OnCopyBitmap(self, evt):
dlg = wxFileDialog(self, "Choose a bitmap to copy", wildcard="*.bmp")
if dlg.ShowModal() == wxID_OK:
bmp = wxBitmap(dlg.GetFilename(), wxBITMAP_TYPE_BMP)
bmpdo = wxBitmapDataObject(bmp)
wxTheClipboard.Open()
wxTheClipboard.SetData(bmpdo)
wxTheClipboard.Close()
wxMessageBox("The bitmap is now in the Clipboard. Switch to a graphics\n"
"editor and try pasting it in...")
dlg.Destroy()
#----------------------------------------------------------------------
class OtherDropTarget(wxPyDropTarget):
def __init__(self, window, log):
wxPyDropTarget.__init__(self)
self.log = log
self.do = wxFileDataObject()
self.SetDataObject(self.do)
def OnEnter(self, x, y, d):
self.log.WriteText("OnEnter: %d, %d, %d\n" % (x, y, d))
return wxDragCopy
#def OnDragOver(self, x, y, d):
# self.log.WriteText("OnDragOver: %d, %d, %d\n" % (x, y, d))
# return wxDragCopy
def OnLeave(self):
self.log.WriteText("OnLeave\n")
def OnDrop(self, x, y):
self.log.WriteText("OnDrop: %d %d\n" % (x, y))
return true
def OnData(self, x, y, d):
self.log.WriteText("OnData: %d, %d, %d\n" % (x, y, d))
self.GetData()
self.log.WriteText("%s\n" % self.do.GetFilenames())
return d
class MyFileDropTarget(wxFileDropTarget):
def __init__(self, window, log):
wxFileDropTarget.__init__(self)
self.window = window
self.log = log
def OnDropFiles(self, x, y, filenames):
self.window.SetInsertionPointEnd()
self.window.WriteText("\n%d file(s) dropped at %d,%d:\n" %
(len(filenames), x, y))
for file in filenames:
self.window.WriteText(file + '\n')
class FileDropPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
#self.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, false))
sizer = wxBoxSizer(wxVERTICAL)
sizer.Add(wxStaticText(self, -1, " \nDrag some files here:"),
0, wxEXPAND|wxALL, 2)
self.text = wxTextCtrl(self, -1, "",
style = wxTE_MULTILINE|wxHSCROLL|wxTE_READONLY)
dt = MyFileDropTarget(self, log)
self.text.SetDropTarget(dt)
sizer.Add(self.text, 1, wxEXPAND)
self.SetAutoLayout(true)
self.SetSizer(sizer)
def WriteText(self, text):
self.text.WriteText(text)
def SetInsertionPointEnd(self):
self.text.SetInsertionPointEnd()
#----------------------------------------------------------------------
#----------------------------------------------------------------------
class TestPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
self.SetAutoLayout(true)
outsideSizer = wxBoxSizer(wxVERTICAL)
msg = "Clipboard / Drag-And-Drop"
text = wxStaticText(self, -1, "", style=wxALIGN_CENTRE)
text.SetFont(wxFont(24, wxSWISS, wxNORMAL, wxBOLD, false))
text.SetLabel(msg)
w,h = text.GetTextExtent(msg)
text.SetSize(wxSize(w,h+1))
text.SetForegroundColour(wxBLUE)
outsideSizer.Add(text, 0, wxEXPAND|wxALL, 5)
outsideSizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)
inSizer = wxBoxSizer(wxHORIZONTAL)
inSizer.Add(ClipTextPanel(self, log), 1, wxEXPAND)
inSizer.Add(FileDropPanel(self, log), 1, wxEXPAND)
outsideSizer.Add(inSizer, 1, wxEXPAND)
self.SetSizer(outsideSizer)
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
#----------------------------------------------------------------------
overview = """\
This demo shows some examples of data transfer through clipboard or drag and drop. In wxWindows, these two ways to transfer data (either between different applications or inside one and the same) are very similar which allows to implement both of them using almost the same code - or, in other words, if you implement drag and drop support for your application, you get clipboard support for free and vice versa.
At the heart of both clipboard and drag and drop operations lies the wxDataObject class. The objects of this class (or, to be precise, classes derived from it) represent the data which is being carried by the mouse during drag and drop operation or copied to or pasted from the clipboard. wxDataObject is a "smart" piece of data because it knows which formats it supports (see GetFormatCount and GetAllFormats) and knows how to render itself in any of them (see GetDataHere). It can also receive its value from the outside in a format it supports if it implements the SetData method. Please see the documentation of this class for more details.
Both clipboard and drag and drop operations have two sides: the source and target, the data provider and the data receiver. These which may be in the same application and even the same window when, for example, you drag some text from one position to another in a word processor. Let us describe what each of them should do.
"""

View File

@@ -1,47 +0,0 @@
from wxPython.wx import *
from wxPython.lib.filebrowsebutton import FileBrowseButton, FileBrowseButtonWithHistory
#----------------------------------------------------------------------
class TestPanel(wxPanel):
def __init__(self, parent, ID, log):
wxPanel.__init__(self, parent, ID)
self.log = log
self.fbb = FileBrowseButton(self, -1, wxPoint(20,20), wxSize(450, -1),
changeCallback = self.fbbCallback)
self.fbbh = FileBrowseButtonWithHistory(self, -1, wxPoint(20, 50),
wxSize(450, -1),
#changeCallback = self.fbbhCallback
)
self.fbbh.SetHistory(['You', 'can', 'put', 'some', 'file', 'names', 'here'])
def fbbCallback(self, evt):
self.log.write('FileBrowseButton: %s\n' % evt.GetString())
def fbbhCallback(self, evt):
if hasattr(self, 'fbbh'):
value = evt.GetString()
self.log.write('FileBrowseButtonWithHistory: %s\n' % value)
history = self.fbbh.GetHistory()
history.append(value)
self.fbbh.SetHistory(history)
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, -1, log)
return win
#----------------------------------------------------------------------
overview = FileBrowseButton.__doc__

View File

@@ -1,61 +0,0 @@
from wxPython.wx import *
#----------------------------------------------------------------------
## class MyFontEnumerator(wxFontEnumerator):
## def __init__(self, list):
## wxFontEnumerator.__init__(self)
## self.list = list
## def OnFacename(self, face):
## self.list.append(face)
## return true
class TestPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
## list = []
## e = MyFontEnumerator(list)
## e.EnumerateFacenames()
e = wxFontEnumerator()
e.EnumerateFacenames()
list = e.GetFacenames()
list.sort()
wxStaticText(self, -1, "Face names:", wxPoint(15, 50), wxSize(65, 18))
self.lb1 = wxListBox(self, 60, wxPoint(80, 50), wxSize(200, 250),
list, wxLB_SINGLE)
self.lb1.SetSelection(0)
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
#----------------------------------------------------------------------
overview = """\
wxFontEnumerator enumerates either all available fonts on the system or only the ones with given attributes - either only fixed-width (suited for use in programs such as terminal emulators and the like) or the fonts available in the given encoding.
"""

View File

@@ -1,93 +0,0 @@
from wxPython.wx import *
from wxPython.lib.buttons import wxGenButton, wxGenBitmapButton, \
wxGenToggleButton, wxGenBitmapToggleButton
#----------------------------------------------------------------------
class TestPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
self.log = log
b = wxButton(self, -1, "A real button", (10,10))
b.SetDefault()
EVT_BUTTON(self, b.GetId(), self.OnButton)
b = wxButton(self, -1, "non-default", (140, 10))
EVT_BUTTON(self, b.GetId(), self.OnButton)
#wxTextCtrl(self, -1, "", (10,40))
b = wxGenButton(self, -1, 'Hello', (10,65))
EVT_BUTTON(self, b.GetId(), self.OnButton)
b = wxGenButton(self, -1, 'disabled', (140,65))
EVT_BUTTON(self, b.GetId(), self.OnButton)
b.Enable(false)
b = wxGenButton(self, -1, 'bigger', (250,50))
EVT_BUTTON(self, b.GetId(), self.OnButton)
b.SetFont(wxFont(20, wxSWISS, wxNORMAL, wxBOLD, false))
b.SetBezelWidth(5)
b.SetBestSize()
b.SetBackgroundColour(wxNamedColour("Navy"))
b.SetForegroundColour(wxWHITE)
#b.SetUseFocusIndicator(false)
b.SetToolTipString("This is a BIG button...")
bmp = wxBitmap('bitmaps/test2.bmp', wxBITMAP_TYPE_BMP)
b = wxGenBitmapButton(self, -1, bmp, (10, 130))
EVT_BUTTON(self, b.GetId(), self.OnButton)
b = wxGenBitmapButton(self, -1, None, (140, 130))
EVT_BUTTON(self, b.GetId(), self.OnButton)
bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
mask = wxMaskColour(bmp, wxBLUE)
bmp.SetMask(mask)
b.SetBitmapLabel(bmp)
bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
mask = wxMaskColour(bmp, wxBLUE)
bmp.SetMask(mask)
b.SetBitmapSelected(bmp)
b.SetBestSize()
b = wxGenToggleButton(self, -1, "Toggle Button", (10, 230))
EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
b = wxGenBitmapToggleButton(self, -1, None, (140, 230))
EVT_BUTTON(self, b.GetId(), self.OnToggleButton)
bmp = wxBitmap('bitmaps/lb1.bmp', wxBITMAP_TYPE_BMP)
mask = wxMaskColour(bmp, wxBLUE)
bmp.SetMask(mask)
b.SetBitmapLabel(bmp)
bmp = wxBitmap('bitmaps/lb2.bmp', wxBITMAP_TYPE_BMP)
mask = wxMaskColour(bmp, wxBLUE)
bmp.SetMask(mask)
b.SetBitmapSelected(bmp)
b.SetToggle(true)
b.SetBestSize()
def OnButton(self, event):
self.log.WriteText("Button Clicked: %d\n" % event.GetId())
def OnToggleButton(self, event):
msg = (event.GetIsDown() and "on") or "off"
self.log.WriteText("Button %d Toggled: %s\n" % (event.GetId(), msg))
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
#----------------------------------------------------------------------
import wxPython.lib.buttons
overview = wxPython.lib.buttons.__doc__

View File

@@ -1,231 +0,0 @@
#!/usr/bin/env python
from wxPython.wx import *
from wxPython.grid import *
#---------------------------------------------------------------------------
class MyCellEditor(wxPyGridCellEditor):
"""
This is a sample GridCellEditor that shows you how to make your own custom
grid editors. All the methods that can be overridden are show here. The
ones that must be overridden are marked with "*Must Override*" in the
docstring.
Notice that in order to call the base class version of these special
methods we use the method name preceded by "base_". This is because these
methods are "virtual" in C++ so if we try to call wxGridCellEditor.Create
for example, then when the wxPython extension module tries to call
ptr->Create(...) then it actually calls the derived class version which
looks up the method in this class and calls it, causing a recursion loop.
If you don't understand any of this, don't worry, just call the "base_"
version instead.
"""
def __init__(self, log):
self.log = log
self.log.write("MyCellEditor ctor\n")
wxPyGridCellEditor.__init__(self)
def Create(self, parent, id, evtHandler):
"""
Called to create the control, which must derive from wxControl.
*Must Override*
"""
self.log.write("MyCellEditor: Create\n")
self._tc = wxTextCtrl(parent, id, "")
self._tc.SetInsertionPoint(0)
self.SetControl(self._tc)
if evtHandler:
self._tc.PushEventHandler(evtHandler)
def SetSize(self, rect):
"""
Called to position/size the edit control within the cell rectangle.
If you don't fill the cell (the rect) then be sure to override
PaintBackground and do something meaningful there.
"""
self.log.write("MyCellEditor: SetSize %s\n" % rect)
self._tc.SetDimensions(rect.x, rect.y, rect.width+2, rect.height+2)
def Show(self, show, attr):
"""
Show or hide the edit control. You can use the attr (if not None)
to set colours or fonts for the control.
"""
self.log.write("MyCellEditor: Show(self, %s, %s)\n" % (show, attr))
self.base_Show(show, attr)
def PaintBackground(self, rect, attr):
"""
Draws the part of the cell not occupied by the edit control. The
base class version just fills it with background colour from the
attribute. In this class the edit control fills the whole cell so
don't do anything at all in order to reduce flicker.
"""
self.log.write("MyCellEditor: PaintBackground\n")
def BeginEdit(self, row, col, grid):
"""
Fetch the value from the table and prepare the edit control
to begin editing. Set the focus to the edit control.
*Must Override*
"""
self.log.write("MyCellEditor: BeginEdit (%d,%d)\n" % (row, col))
self.startValue = grid.GetTable().GetValue(row, col)
self._tc.SetValue(self.startValue)
self._tc.SetInsertionPointEnd()
self._tc.SetFocus()
# For this example, select the text
self._tc.SetSelection(0, self._tc.GetLastPosition())
def EndEdit(self, row, col, grid):
"""
Complete the editing of the current cell. Returns true if the value
has changed. If necessary, the control may be destroyed.
*Must Override*
"""
self.log.write("MyCellEditor: EndEdit (%d,%d)\n" % (row, col))
changed = false
val = self._tc.GetValue()
if val != self.startValue:
changed = true
grid.GetTable().SetValue(row, col, val) # update the table
self.startValue = ''
self._tc.SetValue('')
return changed
def Reset(self):
"""
Reset the value in the control back to its starting value.
*Must Override*
"""
self.log.write("MyCellEditor: Reset\n")
self._tc.SetValue(self.startValue)
self._tc.SetInsertionPointEnd()
def IsAcceptedKey(self, evt):
"""
Return TRUE to allow the given key to start editing: the base class
version only checks that the event has no modifiers. F2 is special
and will always start the editor.
"""
self.log.write("MyCellEditor: IsAcceptedKey: %d\n" % (evt.GetKeyCode()))
## Oops, there's a bug here, we'll have to do it ourself..
##return self.base_IsAcceptedKey(evt)
return (not (evt.ControlDown() or evt.AltDown()) and
evt.GetKeyCode() != WXK_SHIFT)
def StartingKey(self, evt):
"""
If the editor is enabled by pressing keys on the grid, this will be
called to let the editor do something about that first key if desired.
"""
self.log.write("MyCellEditor: StartingKey %d\n" % evt.GetKeyCode())
key = evt.GetKeyCode()
ch = None
if key in [WXK_NUMPAD0, WXK_NUMPAD1, WXK_NUMPAD2, WXK_NUMPAD3, WXK_NUMPAD4,
WXK_NUMPAD5, WXK_NUMPAD6, WXK_NUMPAD7, WXK_NUMPAD8, WXK_NUMPAD9]:
ch = ch = chr(ord('0') + key - WXK_NUMPAD0)
elif key < 256 and key >= 0 and chr(key) in string.printable:
ch = chr(key)
if not evt.ShiftDown():
ch = string.lower(ch)
if ch is not None:
# For this example, replace the text. Normally we would append it.
#self._tc.AppendText(ch)
self._tc.SetValue(ch)
else:
evt.Skip()
def StartingClick(self):
"""
If the editor is enabled by clicking on the cell, this method will be
called to allow the editor to simulate the click on the control if
needed.
"""
self.log.write("MyCellEditor: StartingClick\n")
def Destroy(self):
"""final cleanup"""
self.log.write("MyCellEditor: Destroy\n")
self.base_Destroy()
def Clone(self):
"""
Create a new object which is the copy of this one
*Must Override*
"""
self.log.write("MyCellEditor: Clone\n")
return MyCellEditor(self.log)
#---------------------------------------------------------------------------
class GridEditorTest(wxGrid):
def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1)
self.log = log
self.CreateGrid(10, 3)
# Somebody changed the grid so the type registry takes precedence
# over the default attribute set for editors and renderers, so we
# have to set null handlers for the type registry before the
# default editor will get used otherwise...
#self.RegisterDataType(wxGRID_VALUE_STRING, None, None)
#self.SetDefaultEditor(MyCellEditor(self.log))
# Or we could just do it like this:
#self.RegisterDataType(wxGRID_VALUE_STRING,
# wxGridCellStringRenderer(),
# MyCellEditor(self.log))
# but for this example, we'll just set the custom editor on one cell
self.SetCellEditor(1, 0, MyCellEditor(self.log))
self.SetCellValue(1, 0, "Try to edit this box")
# and on a column
attr = wxGridCellAttr()
attr.SetEditor(MyCellEditor(self.log))
self.SetColAttr(2, attr)
self.SetCellValue(1, 2, "or any in this column")
self.SetColSize(0, 150)
self.SetColSize(1, 150)
self.SetColSize(2, 150)
#---------------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Custom Grid Cell Editor Test",
size=(640,480))
grid = GridEditorTest(self, log)
#---------------------------------------------------------------------------
if __name__ == '__main__':
import sys
app = wxPySimpleApp()
frame = TestFrame(None, sys.stdout)
frame.Show(true)
app.MainLoop()

View File

@@ -1,153 +0,0 @@
from wxPython.wx import *
from wxPython.grid import *
import string
#---------------------------------------------------------------------------
class CustomDataTable(wxPyGridTableBase):
"""
"""
def __init__(self, log):
wxPyGridTableBase.__init__(self)
self.log = log
self.colLabels = ['ID', 'Description', 'Severity', 'Priority', 'Platform',
'Opened?', 'Fixed?', 'Tested?']
self.dataTypes = [wxGRID_VALUE_NUMBER,
wxGRID_VALUE_STRING,
wxGRID_VALUE_CHOICE + ':only in a million years!,wish list,minor,normal,major,critical',
wxGRID_VALUE_NUMBER + ':1,5',
wxGRID_VALUE_CHOICE + ':all,MSW,GTK,other',
wxGRID_VALUE_BOOL,
wxGRID_VALUE_BOOL,
wxGRID_VALUE_BOOL]
self.data = [
[1010, "The foo doesn't bar", "major", 1, 'MSW', 1, 1, 1],
[1011, "I've got a wicket in my wocket", "wish list", 2, 'other', 0, 0, 0],
[1012, "Rectangle() returns a triangle", "critical", 5, 'all', 0, 0, 0]
]
#--------------------------------------------------
# required methods for the wxPyGridTableBase interface
def GetNumberRows(self):
return len(self.data) + 1
def GetNumberCols(self):
return len(self.data[0])
def IsEmptyCell(self, row, col):
return not self.data[row][col]
# Get/Set values in the table. The Python version of these
# methods can handle any data-type, (as long as the Editor and
# Renderer understands the type too,) not just strings as in the
# C++ version.
def GetValue(self, row, col):
try:
return self.data[row][col]
except IndexError:
return ''
def SetValue(self, row, col, value):
try:
self.data[row][col] = value
except IndexError:
# add a new row
self.data.append([''] * self.GetNumberCols())
self.SetValue(row, col, value)
# tell the grid we've added a row
msg = wxGridTableMessage(self, # The table
wxGRIDTABLE_NOTIFY_ROWS_APPENDED, # what we did to it
1) # how many
self.GetView().ProcessTableMessage(msg)
#--------------------------------------------------
# Some optional methods
# Called when the grid needs to display labels
def GetColLabelValue(self, col):
return self.colLabels[col]
# Called to determine the kind of editor/renderer to use by
# default, doesn't necessarily have to be the same type used
# nativly by the editor/renderer if they know how to convert.
def GetTypeName(self, row, col):
return self.dataTypes[col]
# Called to determine how the data can be fetched and stored by the
# editor and renderer. This allows you to enforce some type-safety
# in the grid.
def CanGetValueAs(self, row, col, typeName):
colType = string.split(self.dataTypes[col], ':')[0]
if typeName == colType:
return true
else:
return false
def CanSetValueAs(self, row, col, typeName):
return self.CanGetValueAs(row, col, typeName)
#---------------------------------------------------------------------------
class CustTableGrid(wxGrid):
def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1)
table = CustomDataTable(log)
# The second parameter means that the grid is to take ownership of the
# table and will destroy it when done. Otherwise you would need to keep
# a reference to it and call it's Destroy method later.
self.SetTable(table, true)
self.SetRowLabelSize(0)
self.SetMargins(0,0)
self.AutoSizeColumns(false)
EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)
# I do this because I don't like the default behaviour of not starting the
# cell editor on double clicks, but only a second click.
def OnLeftDClick(self, evt):
if self.CanEnableCellControl():
self.EnableCellEditControl()
#---------------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Custom Table, data driven Grid Demo", size=(640,480))
grid = CustTableGrid(self, log)
#---------------------------------------------------------------------------
if __name__ == '__main__':
import sys
app = wxPySimpleApp()
frame = TestFrame(None, sys.stdout)
frame.Show(true)
app.MainLoop()
#---------------------------------------------------------------------------

View File

@@ -1,62 +0,0 @@
from wxPython.wx import *
from wxPython.grid import *
#---------------------------------------------------------------------------
class NewEnterHandlingGrid(wxGrid):
def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1)
self.log = log
self.CreateGrid(20, 6)
self.SetCellValue(0, 0, "Enter moves to the right")
self.SetCellValue(0, 5, "Enter wraps to next row")
self.SetColSize(0, 150)
self.SetColSize(5, 150)
EVT_KEY_DOWN(self, self.OnKeyDown)
def OnKeyDown(self, evt):
if evt.KeyCode() != WXK_RETURN:
evt.Skip()
return
if evt.ControlDown(): # the edit control needs this key
evt.Skip()
return
self.DisableCellEditControl()
success = self.MoveCursorRight(evt.ShiftDown())
if not success:
newRow = self.GetGridCursorRow() + 1
if newRow < self.GetTable().GetNumberRows():
self.SetGridCursor(newRow, 0)
self.MakeCellVisible(newRow, 0)
else:
# this would be a good place to add a new row if your app
# needs to do that
pass
#---------------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Simple Grid Demo", size=(640,480))
grid = NewEnterHandlingGrid(self, log)
#---------------------------------------------------------------------------
if __name__ == '__main__':
import sys
app = wxPySimpleApp()
frame = TestFrame(None, sys.stdout)
frame.Show(true)
app.MainLoop()
#---------------------------------------------------------------------------

View File

@@ -1,71 +0,0 @@
from wxPython.wx import *
from wxPython.grid import *
#---------------------------------------------------------------------------
class HugeTable(wxPyGridTableBase):
"""
This is all it takes to make a custom data table to plug into a
wxGrid. There are many more methods that can be overridden, but
the ones shown below are the required ones. This table simply
provides strings containing the row and column values.
"""
def __init__(self, log):
wxPyGridTableBase.__init__(self)
self.log = log
def GetNumberRows(self):
return 10000
def GetNumberCols(self):
return 10000
def IsEmptyCell(self, row, col):
return false
def GetValue(self, row, col):
return str( (row, col) )
def SetValue(self, row, col, value):
self.log.write('SetValue(%d, %d, "%s") ignored.\n' % (row, col, value))
#---------------------------------------------------------------------------
class HugeTableGrid(wxGrid):
def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1)
table = HugeTable(log)
# The second parameter means that the grid is to take ownership of the
# table and will destroy it when done. Otherwise you would need to keep
# a reference to it and call it's Destroy method later.
self.SetTable(table, true)
#---------------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Huge (virtual) Table Demo", size=(640,480))
grid = HugeTableGrid(self, log)
#---------------------------------------------------------------------------
if __name__ == '__main__':
import sys
app = wxPySimpleApp()
frame = TestFrame(None, sys.stdout)
frame.Show(true)
app.MainLoop()
#---------------------------------------------------------------------------

View File

@@ -1,189 +0,0 @@
from wxPython.wx import *
from wxPython.grid import *
#---------------------------------------------------------------------------
class SimpleGrid(wxGrid):
def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1)
self.log = log
self.moveTo = None
EVT_IDLE(self, self.OnIdle)
self.CreateGrid(25, 25)
# simple cell formatting
self.SetColSize(3, 200)
self.SetRowSize(4, 45)
self.SetCellValue(0, 0, "First cell")
self.SetCellValue(1, 1, "Another cell")
self.SetCellValue(2, 2, "Yet another cell")
self.SetCellFont(0, 0, wxFont(12, wxROMAN, wxITALIC, wxNORMAL))
self.SetCellTextColour(1, 1, wxRED)
self.SetCellBackgroundColour(2, 2, wxCYAN)
# attribute objects let you keep a set of formatting values
# in one spot, and reuse them if needed
attr = wxGridCellAttr()
attr.SetTextColour(wxBLACK)
attr.SetBackgroundColour(wxRED)
attr.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD))
# you can set cell attributes for the whole row (or column)
self.SetRowAttr(5, attr)
self.SetColLabelValue(0, "Custom")
self.SetColLabelValue(1, "column")
self.SetColLabelValue(2, "labels")
# test all the events
EVT_GRID_CELL_LEFT_CLICK(self, self.OnCellLeftClick)
EVT_GRID_CELL_RIGHT_CLICK(self, self.OnCellRightClick)
EVT_GRID_CELL_LEFT_DCLICK(self, self.OnCellLeftDClick)
EVT_GRID_CELL_RIGHT_DCLICK(self, self.OnCellRightDClick)
EVT_GRID_LABEL_LEFT_CLICK(self, self.OnLabelLeftClick)
EVT_GRID_LABEL_RIGHT_CLICK(self, self.OnLabelRightClick)
EVT_GRID_LABEL_LEFT_DCLICK(self, self.OnLabelLeftDClick)
EVT_GRID_LABEL_RIGHT_DCLICK(self, self.OnLabelRightDClick)
EVT_GRID_ROW_SIZE(self, self.OnRowSize)
EVT_GRID_COL_SIZE(self, self.OnColSize)
EVT_GRID_RANGE_SELECT(self, self.OnRangeSelect)
EVT_GRID_CELL_CHANGE(self, self.OnCellChange)
EVT_GRID_SELECT_CELL(self, self.OnSelectCell)
EVT_GRID_EDITOR_SHOWN(self, self.OnEditorShown)
EVT_GRID_EDITOR_HIDDEN(self, self.OnEditorHidden)
def OnCellLeftClick(self, evt):
self.log.write("OnCellLeftClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnCellRightClick(self, evt):
self.log.write("OnCellRightClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnCellLeftDClick(self, evt):
self.log.write("OnCellLeftDClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnCellRightDClick(self, evt):
self.log.write("OnCellRightDClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnLabelLeftClick(self, evt):
self.log.write("OnLabelLeftClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnLabelRightClick(self, evt):
self.log.write("OnLabelRightClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnLabelLeftDClick(self, evt):
self.log.write("OnLabelLeftDClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnLabelRightDClick(self, evt):
self.log.write("OnLabelRightDClick: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnRowSize(self, evt):
self.log.write("OnRowSize: row %d, %s\n" %
(evt.GetRowOrCol(), evt.GetPosition()))
evt.Skip()
def OnColSize(self, evt):
self.log.write("OnColSize: col %d, %s\n" %
(evt.GetRowOrCol(), evt.GetPosition()))
evt.Skip()
def OnRangeSelect(self, evt):
if evt.Selecting():
self.log.write("OnRangeSelect: top-left %s, bottom-right %s\n" %
(evt.GetTopLeftCoords(), evt.GetBottomRightCoords()))
evt.Skip()
def OnCellChange(self, evt):
self.log.write("OnCellChange: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
# Show how to stay in a cell that has bad data. We can't just
# call SetGridCursor here since we are nested inside one so it
# won't have any effect. Instead, set coordinants to move to in
# idle time.
value = self.GetCellValue(evt.GetRow(), evt.GetCol())
if value == 'no good':
self.moveTo = evt.GetRow(), evt.GetCol()
def OnIdle(self, evt):
if self.moveTo != None:
self.SetGridCursor(self.moveTo[0], self.moveTo[1])
self.moveTo = None
def OnSelectCell(self, evt):
self.log.write("OnSelectCell: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
# Another way to stay in a cell that has a bad value...
row = self.GetGridCursorRow()
col = self.GetGridCursorCol()
if self.IsCellEditControlEnabled():
self.HideCellEditControl()
self.DisableCellEditControl()
value = self.GetCellValue(row, col)
if value == 'no good 2':
return # cancels the cell selection
else:
evt.Skip()
def OnEditorShown(self, evt):
self.log.write("OnEditorShown: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
def OnEditorHidden(self, evt):
self.log.write("OnEditorHidden: (%d,%d) %s\n" %
(evt.GetRow(), evt.GetCol(), evt.GetPosition()))
evt.Skip()
#---------------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Simple Grid Demo", size=(640,480))
grid = SimpleGrid(self, log)
#---------------------------------------------------------------------------
if __name__ == '__main__':
import sys
app = wxPySimpleApp()
frame = TestFrame(None, sys.stdout)
frame.Show(true)
app.MainLoop()
#---------------------------------------------------------------------------

View File

@@ -1,181 +0,0 @@
from wxPython.wx import *
from wxPython.grid import *
import string, random
#---------------------------------------------------------------------------
class MyCustomRenderer(wxPyGridCellRenderer):
def __init__(self):
wxPyGridCellRenderer.__init__(self)
def Draw(self, grid, attr, dc, rect, row, col, isSelected):
dc.SetBackgroundMode(wxSOLID)
dc.SetBrush(wxBrush(wxBLACK, wxSOLID))
dc.SetPen(wxTRANSPARENT_PEN)
dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height)
dc.SetBackgroundMode(wxTRANSPARENT)
dc.SetFont(attr.GetFont())
text = grid.GetCellValue(row, col)
colors = [wxRED, wxWHITE, wxCYAN]
x = rect.x + 1
y = rect.y + 1
for ch in text:
dc.SetTextForeground(random.choice(colors))
dc.DrawText(ch, x, y)
w, h = dc.GetTextExtent(ch)
x = x + w
if x > rect.right - 5:
break
def GetBestSize(self, grid, attr, dc, row, col):
text = grid.GetCellValue(row, col)
dc.SetFont(attr.GetFont())
w, h = dc.GetTextExtent(text)
return wxSize(w, h)
def Clone(self):
return MyCustomRenderer()
#---------------------------------------------------------------------------
rendererDemoData = [
('wxGridCellStringRenderer\n(the default)', 'this is a text value', wxGridCellStringRenderer, ()),
('wxGridCellNumberRenderer', '12345', wxGridCellNumberRenderer, ()),
('wxGridCellFloatRenderer', '1234.5678', wxGridCellFloatRenderer, (6,2)),
('wxGridCellBoolRenderer', '1', wxGridCellBoolRenderer, ()),
('MyCustomRenderer', 'This is my renderer', MyCustomRenderer, ()),
]
editorDemoData = [
('wxGridCellTextEditor\n(the default)', 'Here is some more text', wxGridCellTextEditor, ()),
('wxGridCellNumberEditor\nwith min,max', '101', wxGridCellNumberEditor, (5, 10005)),
('wxGridCellNumberEditor\nwithout bounds', '101', wxGridCellNumberEditor, ()),
('wxGridCellFloatEditor', '1234.5678', wxGridCellFloatEditor, ()),
('wxGridCellBoolEditor', '1', wxGridCellBoolEditor, ()),
('wxGridCellChoiceEditor', 'one', wxGridCellChoiceEditor, (['one', 'two', 'three', 'four',
'kick', 'Microsoft', 'out the',
'door'], false)),
]
comboDemoData = [
('wxGridCellNumberRenderer\nwxGridCellNumberEditor', '20792', wxGridCellNumberRenderer, wxGridCellNumberEditor),
('wxGridCellBoolRenderer\nwxGridCellBoolEditor', '1', wxGridCellBoolRenderer, wxGridCellBoolEditor),
]
class EditorsAndRenderersGrid(wxGrid):
def __init__(self, parent, log):
wxGrid.__init__(self, parent, -1)
self.log = log
self.CreateGrid(25, 8)
renCol = 1
edCol = 4
self.SetCellValue(0, renCol, '''\
Cell Renderers are used to draw
the contents of the cell when they
need to be refreshed. Different
types of Renderers can be plugged in
to different cells in the grid, it can
even be automatically determined based
on the type of data in the cell.
''')
self.SetCellValue(0, edCol, '''\
Cell Editors are used when the
value of the cell is edited by
the user. An editor class is
wrapped around a an object
derived from wxControl and it
implements some methods required
to integrate with the grid.
''')
self.SetCellValue(16, renCol, '''\
Here are some combinations of Editors and
Renderers used together.
''')
row = 2
for label, value, renderClass, args in rendererDemoData:
renderer = apply(renderClass, args)
self.SetCellValue(row, renCol, label)
self.SetCellValue(row, renCol+1, value)
self.SetCellRenderer(row, renCol+1, renderer)
row = row + 2
row = 2
for label, value, editorClass, args in editorDemoData:
editor = apply(editorClass, args)
self.SetCellValue(row, edCol, label)
self.SetCellValue(row, edCol+1, value)
self.SetCellEditor(row, edCol+1, editor)
row = row + 2
row = 18
for label, value, renClass, edClass in comboDemoData:
self.SetCellValue(row, renCol, label)
self.SetCellValue(row, renCol+1, value)
editor = apply(edClass, ()) #args)
renderer = apply(renClass, ()) #args)
self.SetCellEditor(row, renCol+1, editor)
self.SetCellRenderer(row, renCol+1, renderer)
row = row + 2
font = self.GetFont()
font.SetWeight(wxBOLD)
attr = wxGridCellAttr()
attr.SetFont(font)
attr.SetBackgroundColour(wxLIGHT_GREY)
attr.SetReadOnly(true)
attr.SetAlignment(wxRIGHT, -1)
self.SetColAttr(renCol, attr)
self.SetColAttr(edCol, attr)
# There is a bug in wxGTK for this method...
if wxPlatform != '__WXGTK__':
self.AutoSizeColumns(true)
self.AutoSizeRows(true)
EVT_GRID_CELL_LEFT_DCLICK(self, self.OnLeftDClick)
# I do this because I don't like the default behaviour of not starting the
# cell editor on double clicks, but only a second click.
def OnLeftDClick(self, evt):
if self.CanEnableCellControl():
self.EnableCellEditControl()
#---------------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Editors and Renderers Demo", size=(640,480))
grid = EditorsAndRenderersGrid(self, log)
#---------------------------------------------------------------------------
if __name__ == '__main__':
import sys
app = wxPySimpleApp()
frame = TestFrame(None, sys.stdout)
frame.Show(true)
app.MainLoop()
#---------------------------------------------------------------------------

View File

@@ -1,62 +0,0 @@
from wxPython.wx import *
from wxPython.lib.layoutf import Layoutf
#---------------------------------------------------------------------------
class TestLayoutf(wxPanel):
def __init__(self, parent):
wxPanel.__init__(self, parent, -1)
self.SetAutoLayout(true)
EVT_BUTTON(self, 100, self.OnButton)
self.panelA = wxWindow(self, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelA.SetBackgroundColour(wxBLUE)
self.panelA.SetConstraints(Layoutf('t=t10#1;l=l10#1;b=b10#1;r%r50#1',(self,)))
self.panelB = wxWindow(self, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelB.SetBackgroundColour(wxRED)
self.panelB.SetConstraints(Layoutf('t=t10#1;r=r10#1;b%b30#1;l>10#2', (self,self.panelA)))
self.panelC = wxWindow(self, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelC.SetBackgroundColour(wxWHITE)
self.panelC.SetConstraints(Layoutf('t_10#3;r=r10#1;b=b10#1;l>10#2', (self,self.panelA,self.panelB)))
b = wxButton(self.panelA, 100, ' Panel A ')
b.SetConstraints(Layoutf('X=X#1;Y=Y#1;h*;w%w50#1', (self.panelA,)))
b = wxButton(self.panelB, 100, ' Panel B ')
b.SetConstraints(Layoutf('t=t2#1;r=r4#1;h*;w*', (self.panelB,)))
self.panelD = wxWindow(self.panelC, -1, wxPyDefaultPosition, wxPyDefaultSize, wxSIMPLE_BORDER)
self.panelD.SetBackgroundColour(wxGREEN)
self.panelD.SetConstraints(Layoutf('b%h50#1;r%w50#1;h=h#2;w=w#2', (self.panelC, b)))
b = wxButton(self.panelC, 100, ' Panel C ')
b.SetConstraints(Layoutf('t_#1;l>#1;h*;w*', (self.panelD,)))
wxStaticText(self.panelD, -1, "Panel D", wxPoint(4, 4)).SetBackgroundColour(wxGREEN)
def OnButton(self, event):
wxBell()
#---------------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestLayoutf(nb)
return win
#---------------------------------------------------------------------------
overview = Layoutf.__doc__

View File

@@ -1,53 +0,0 @@
#!/usr/bin/env python
from wxPython.wx import *
from wxScrolledWindow import MyCanvas
#----------------------------------------------------------------------
class MyParentFrame(wxMDIParentFrame):
def __init__(self):
wxMDIParentFrame.__init__(self, None, -1, "MDI Parent", size=(600,400))
self.winCount = 0
menu = wxMenu()
menu.Append(5000, "&New Window")
menu.AppendSeparator()
menu.Append(5001, "E&xit")
menubar = wxMenuBar()
menubar.Append(menu, "&File")
self.SetMenuBar(menubar)
self.CreateStatusBar()
EVT_MENU(self, 5000, self.OnNewWindow)
EVT_MENU(self, 5001, self.OnExit)
def OnExit(self, evt):
self.Close(true)
def OnNewWindow(self, evt):
self.winCount = self.winCount + 1
win = wxMDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
canvas = MyCanvas(win)
win.Show(true)
#----------------------------------------------------------------------
class MyApp(wxApp):
def OnInit(self):
frame = MyParentFrame()
frame.Show(true)
self.SetTopWindow(frame)
return true
app = MyApp(0)
app.MainLoop()

View File

@@ -1,140 +0,0 @@
#!/usr/bin/env python
from wxPython.wx import *
from wxScrolledWindow import MyCanvas
#----------------------------------------------------------------------
class MyParentFrame(wxMDIParentFrame):
ID_WINDOW_TOP = 5100
ID_WINDOW_LEFT1 = 5101
ID_WINDOW_LEFT2 = 5102
ID_WINDOW_BOTTOM = 5103
def __init__(self):
wxMDIParentFrame.__init__(self, None, -1, "MDI Parent", size=(600,400),
style = wxDEFAULT_FRAME_STYLE | wxHSCROLL | wxVSCROLL)
self.winCount = 0
menu = wxMenu()
menu.Append(5000, "&New Window")
menu.AppendSeparator()
menu.Append(5001, "E&xit")
menubar = wxMenuBar()
menubar.Append(menu, "&File")
self.SetMenuBar(menubar)
#self.CreateStatusBar()
EVT_MENU(self, 5000, self.OnNewWindow)
EVT_MENU(self, 5001, self.OnExit)
EVT_SASH_DRAGGED_RANGE(self,
self.ID_WINDOW_TOP, self.ID_WINDOW_BOTTOM,
self.OnSashDrag)
EVT_SIZE(self, self.OnSize)
# Create some layout windows
# A window like a toolbar
win = wxSashLayoutWindow(self, self.ID_WINDOW_TOP, style = wxNO_BORDER|wxSW_3D)
win.SetDefaultSize((1000, 30))
win.SetOrientation(wxLAYOUT_HORIZONTAL)
win.SetAlignment(wxLAYOUT_TOP)
win.SetBackgroundColour(wxColour(255, 0, 0))
win.SetSashVisible(wxSASH_BOTTOM, true)
self.topWindow = win
# A window like a statusbar
win = wxSashLayoutWindow(self, self.ID_WINDOW_BOTTOM, style = wxNO_BORDER|wxSW_3D)
win.SetDefaultSize((1000, 30))
win.SetOrientation(wxLAYOUT_HORIZONTAL)
win.SetAlignment(wxLAYOUT_BOTTOM)
win.SetBackgroundColour(wxColour(0, 0, 255))
win.SetSashVisible(wxSASH_TOP, true)
self.bottomWindow = win
# A window to the left of the client window
win = wxSashLayoutWindow(self, self.ID_WINDOW_LEFT1, style = wxNO_BORDER|wxSW_3D)
win.SetDefaultSize((120, 1000))
win.SetOrientation(wxLAYOUT_VERTICAL)
win.SetAlignment(wxLAYOUT_LEFT)
win.SetBackgroundColour(wxColour(0, 255, 0))
win.SetSashVisible(wxSASH_RIGHT, TRUE)
win.SetExtraBorderSize(10)
textWindow = wxTextCtrl(win, -1, "", wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE|wxSUNKEN_BORDER)
textWindow.SetValue("A sub window")
self.leftWindow1 = win
# Another window to the left of the client window
win = wxSashLayoutWindow(self, self.ID_WINDOW_LEFT2, style = wxNO_BORDER|wxSW_3D)
win.SetDefaultSize((120, 1000))
win.SetOrientation(wxLAYOUT_VERTICAL)
win.SetAlignment(wxLAYOUT_LEFT)
win.SetBackgroundColour(wxColour(0, 255, 255))
win.SetSashVisible(wxSASH_RIGHT, TRUE)
self.leftWindow2 = win
def OnSashDrag(self, event):
if event.GetDragStatus() == wxSASH_STATUS_OUT_OF_RANGE:
return
eID = event.GetId()
if eID == self.ID_WINDOW_TOP:
self.topWindow.SetDefaultSize(wxSize(1000, event.GetDragRect().height))
elif eID == self.ID_WINDOW_LEFT1:
self.leftWindow1.SetDefaultSize(wxSize(event.GetDragRect().width, 1000))
elif eID == self.ID_WINDOW_LEFT2:
self.leftWindow2.SetDefaultSize(wxSize(event.GetDragRect().width, 1000))
elif eID == self.ID_WINDOW_BOTTOM:
self.bottomWindow.SetDefaultSize(wxSize(1000, event.GetDragRect().height))
wxLayoutAlgorithm().LayoutMDIFrame(self)
self.GetClientWindow().Refresh()
def OnSize(self, event):
wxLayoutAlgorithm().LayoutMDIFrame(self)
def OnExit(self, evt):
self.Close(true)
def OnNewWindow(self, evt):
self.winCount = self.winCount + 1
win = wxMDIChildFrame(self, -1, "Child Window: %d" % self.winCount)
canvas = MyCanvas(win)
win.Show(true)
#----------------------------------------------------------------------
class MyApp(wxApp):
def OnInit(self):
frame = MyParentFrame()
frame.Show(true)
self.SetTopWindow(frame)
return true
app = MyApp(0)
app.MainLoop()

View File

@@ -1,544 +0,0 @@
#!/bin/env python
#----------------------------------------------------------------------------
# Name: Main.py
# Purpose: Testing lots of stuff, controls, window types, etc.
#
# Author: Robin Dunn
#
# Created: A long time ago, in a galaxy far, far away...
# RCS-ID: $Id$
# Copyright: (c) 1999 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------------
import sys, os
from wxPython.wx import *
from wxPython.lib.splashscreen import SplashScreen
from wxPython.html import wxHtmlWindow
#---------------------------------------------------------------------------
_treeList = [
('New since last release', ['wxProcess',
]),
('Managed Windows', ['wxFrame', 'wxDialog', 'wxMiniFrame']),
('Non-Managed Windows', ['wxGrid', 'wxSashWindow',
'wxScrolledWindow', 'wxSplitterWindow',
'wxStatusBar', 'wxNotebook',
'wxHtmlWindow',
'wxStyledTextCtrl_1', 'wxStyledTextCtrl_2',]),
('Common Dialogs', ['wxColourDialog', 'wxDirDialog', 'wxFileDialog',
'wxSingleChoiceDialog', 'wxTextEntryDialog',
'wxFontDialog', 'wxPageSetupDialog', 'wxPrintDialog',
'wxMessageDialog', 'wxProgressDialog']),
('Controls', ['wxButton', 'wxCheckBox', 'wxCheckListBox', 'wxChoice',
'wxComboBox', 'wxGauge', 'wxListBox', 'wxListCtrl', 'wxTextCtrl',
'wxTreeCtrl', 'wxSpinButton', 'wxSpinCtrl', 'wxStaticText',
'wxStaticBitmap', 'wxRadioBox', 'wxSlider', 'wxToolBar',
'wxCalendarCtrl',
]),
('Window Layout', ['wxLayoutConstraints', 'Sizers', ]),
('Miscellaneous', [ 'DragAndDrop', 'CustomDragAndDrop', 'FontEnumerator',
'wxTimer', 'wxValidator', 'wxGLCanvas', 'DialogUnits',
'wxImage', 'wxMask', 'PrintFramework', 'wxOGL',
'PythonEvents', 'Threads',
'ActiveXWrapper_Acrobat', 'ActiveXWrapper_IE',
'wxDragImage',
]),
('wxPython Library', ['Layoutf', 'wxScrolledMessageDialog',
'wxMultipleChoiceDialog', 'wxPlotCanvas', 'wxFloatBar',
'PyShell', 'wxCalendar', 'wxMVCTree', 'wxVTKRenderWindow',
'FileBrowseButton', 'GenericButtons', 'wxEditor',
'PyShellWindow',
]),
('Cool Contribs', ['pyTree', 'hangman', 'SlashDot', 'XMLtreeview']),
]
#---------------------------------------------------------------------------
class wxPythonDemo(wxFrame):
def __init__(self, parent, id, title):
wxFrame.__init__(self, parent, -1, title, size = (800, 600),
style=wxDEFAULT_FRAME_STYLE|wxNO_FULL_REPAINT_ON_RESIZE)
self.cwd = os.getcwd()
self.curOverview = ""
if wxPlatform == '__WXMSW__':
icon = wxIcon('bitmaps/mondrian.ico', wxBITMAP_TYPE_ICO)
self.SetIcon(icon)
# setup a taskbar icon, and catch some events from it
self.tbicon = wxTaskBarIcon()
self.tbicon.SetIcon(icon, "wxPython Demo")
EVT_TASKBAR_LEFT_DCLICK(self.tbicon, self.OnTaskBarActivate)
EVT_TASKBAR_RIGHT_UP(self.tbicon, self.OnTaskBarMenu)
EVT_MENU(self.tbicon, self.TBMENU_RESTORE, self.OnTaskBarActivate)
EVT_MENU(self.tbicon, self.TBMENU_CLOSE, self.OnTaskBarClose)
self.otherWin = None
EVT_IDLE(self, self.OnIdle)
EVT_CLOSE(self, self.OnCloseWindow)
self.Centre(wxBOTH)
self.CreateStatusBar(1, wxST_SIZEGRIP)
splitter = wxSplitterWindow(self, -1, style=wxNO_3D|wxSP_3D)
splitter2 = wxSplitterWindow(splitter, -1, style=wxNO_3D|wxSP_3D)
# Prevent TreeCtrl from displaying all items after destruction
self.dying = false
# Make a File menu
self.mainmenu = wxMenuBar()
menu = wxMenu()
exitID = wxNewId()
menu.Append(exitID, 'E&xit\tAlt-X', 'Get the heck outta here!')
EVT_MENU(self, exitID, self.OnFileExit)
self.mainmenu.Append(menu, '&File')
# Make a Demo menu
menu = wxMenu()
for item in _treeList:
submenu = wxMenu()
for childItem in item[1]:
mID = wxNewId()
submenu.Append(mID, childItem)
EVT_MENU(self, mID, self.OnDemoMenu)
menu.AppendMenu(wxNewId(), item[0], submenu)
self.mainmenu.Append(menu, '&Demo')
# Make a Help menu
helpID = wxNewId()
menu = wxMenu()
menu.Append(helpID, '&About\tCtrl-H', 'wxPython RULES!!!')
EVT_MENU(self, helpID, self.OnHelpAbout)
self.mainmenu.Append(menu, '&Help')
self.SetMenuBar(self.mainmenu)
# set the menu accellerator table...
aTable = wxAcceleratorTable([(wxACCEL_ALT, ord('X'), exitID),
(wxACCEL_CTRL, ord('H'), helpID)])
self.SetAcceleratorTable(aTable)
# Create a TreeCtrl
tID = wxNewId()
self.treeMap = {}
self.tree = wxTreeCtrl(splitter, tID,
style=wxTR_HAS_BUTTONS |
wxTR_EDIT_LABELS |
wxTR_HAS_VARIABLE_ROW_HEIGHT |
wxSUNKEN_BORDER)
#self.tree.SetBackgroundColour(wxNamedColour("Pink"))
root = self.tree.AddRoot("Overview")
firstChild = None
for item in _treeList:
child = self.tree.AppendItem(root, item[0])
if not firstChild: firstChild = child
for childItem in item[1]:
theDemo = self.tree.AppendItem(child, childItem)
self.treeMap[childItem] = theDemo
self.tree.Expand(root)
self.tree.Expand(firstChild)
EVT_TREE_ITEM_EXPANDED (self.tree, tID, self.OnItemExpanded)
EVT_TREE_ITEM_COLLAPSED (self.tree, tID, self.OnItemCollapsed)
EVT_TREE_SEL_CHANGED (self.tree, tID, self.OnSelChanged)
EVT_LEFT_DOWN (self.tree, self.OnTreeLeftDown)
# Create a Notebook
self.nb = wxNotebook(splitter2, -1)
# Set up a wxHtmlWindow on the Overview Notebook page
# we put it in a panel first because there seems to be a
# refresh bug of some sort (wxGTK) when it is directly in
# the notebook...
if 0: # the old way
self.ovr = wxHtmlWindow(self.nb, -1, size=(400, 400))
self.nb.AddPage(self.ovr, "Overview")
else: # hopefully I can remove this hacky code soon
panel = wxPanel(self.nb, -1)
self.ovr = wxHtmlWindow(panel, -1, size=(400, 400))
self.nb.AddPage(panel, "Overview")
def OnOvrSize(evt, ovr=self.ovr):
ovr.SetSize(evt.GetSize())
EVT_SIZE(panel, OnOvrSize)
self.SetOverview("Overview", overview)
# Set up a TextCtrl on the Demo Code Notebook page
self.txt = wxTextCtrl(self.nb, -1,
style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))
self.nb.AddPage(self.txt, "Demo Code")
# Set up a log on the View Log Notebook page
self.log = wxTextCtrl(splitter2, -1,
style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
# Set the wxWindows log target to be this textctrl
wxLog_SetActiveTarget(wxLogTextCtrl(self.log))
self.Show(true)
# add the windows to the splitter and split it.
splitter2.SplitHorizontally(self.nb, self.log)
splitter2.SetSashPosition(450, true)
splitter2.SetMinimumPaneSize(20)
splitter.SplitVertically(self.tree, splitter2)
splitter.SetSashPosition(180, true)
splitter.SetMinimumPaneSize(20)
# select initial items
self.nb.SetSelection(0)
self.tree.SelectItem(root)
if len(sys.argv) == 2:
try:
selectedDemo = self.treeMap[sys.argv[1]]
except:
selectedDemo = None
if selectedDemo:
self.tree.SelectItem(selectedDemo)
self.tree.EnsureVisible(selectedDemo)
wxLogMessage('window handle: %s' % self.GetHandle())
#---------------------------------------------
def WriteText(self, text):
if text[-1:] == '\n':
text = text[:-1]
wxLogMessage(text)
def write(self, txt):
self.WriteText(txt)
#---------------------------------------------
def OnItemExpanded(self, event):
item = event.GetItem()
wxLogMessage("OnItemExpanded: %s" % self.tree.GetItemText(item))
event.Skip()
#---------------------------------------------
def OnItemCollapsed(self, event):
item = event.GetItem()
wxLogMessage("OnItemCollapsed: %s" % self.tree.GetItemText(item))
event.Skip()
#---------------------------------------------
def OnTreeLeftDown(self, event):
pt = event.GetPosition();
item, flags = self.tree.HitTest(pt)
if item == self.tree.GetSelection():
self.SetOverview(self.tree.GetItemText(item), self.curOverview)
event.Skip()
#---------------------------------------------
def OnSelChanged(self, event):
if self.dying:
return
item = event.GetItem()
itemText = self.tree.GetItemText(item)
self.RunDemo(itemText)
#---------------------------------------------
def RunDemo(self, itemText):
os.chdir(self.cwd)
if self.nb.GetPageCount() == 3:
if self.nb.GetSelection() == 2:
self.nb.SetSelection(0)
self.nb.DeletePage(2)
if itemText == 'Overview':
self.GetDemoFile('Main.py')
self.SetOverview('Overview', overview)
self.nb.Refresh();
self.window = None
else:
if os.path.exists(itemText + '.py'):
wxBeginBusyCursor()
wxLogMessage("Running demo %s.py..." % itemText)
try:
self.GetDemoFile(itemText + '.py')
module = __import__(itemText, globals())
self.SetOverview(itemText, module.overview)
finally:
wxEndBusyCursor()
# in case runTest is modal, make sure things look right...
self.nb.Refresh();
wxYield()
self.window = module.runTest(self, self.nb, self) ###
if self.window:
self.nb.AddPage(self.window, 'Demo')
wxYield()
self.nb.SetSelection(2)
else:
self.ovr.SetPage("")
self.txt.Clear()
self.window = None
#---------------------------------------------
# Get the Demo files
def GetDemoFile(self, filename):
self.txt.Clear()
try:
self.txt.SetValue(open(filename).read())
except IOError:
self.txt.WriteText("Cannot open %s file." % filename)
self.txt.SetInsertionPoint(0)
self.txt.ShowPosition(0)
#---------------------------------------------
def SetOverview(self, name, text):
self.curOverview = text
lead = text[:6]
if lead != '<html>' and lead != '<HTML>':
text = string.join(string.split(text, '\n'), '<br>')
#text = '<font size="-1"><pre>' + text + '</pre></font>'
self.ovr.SetPage(text)
self.nb.SetPageText(0, name)
#---------------------------------------------
# Menu methods
def OnFileExit(self, *event):
self.Close()
def OnHelpAbout(self, event):
from About import MyAboutBox
about = MyAboutBox(self)
about.ShowModal()
about.Destroy()
#---------------------------------------------
def OnCloseWindow(self, event):
self.dying = true
self.window = None
self.mainmenu = None
if hasattr(self, "tbicon"):
del self.tbicon
self.Destroy()
#---------------------------------------------
def OnIdle(self, event):
if self.otherWin:
self.otherWin.Raise()
self.window = self.otherWin
self.otherWin = None
#---------------------------------------------
def OnDemoMenu(self, event):
try:
selectedDemo = self.treeMap[self.mainmenu.GetLabel(event.GetId())]
except:
selectedDemo = None
if selectedDemo:
self.tree.SelectItem(selectedDemo)
self.tree.EnsureVisible(selectedDemo)
#---------------------------------------------
def OnTaskBarActivate(self, evt):
if self.IsIconized():
self.Iconize(false)
if not self.IsShown():
self.Show(true)
self.Raise()
#---------------------------------------------
TBMENU_RESTORE = 1000
TBMENU_CLOSE = 1001
def OnTaskBarMenu(self, evt):
menu = wxMenu()
menu.Append(self.TBMENU_RESTORE, "Restore wxPython Demo")
menu.Append(self.TBMENU_CLOSE, "Close")
self.tbicon.PopupMenu(menu)
menu.Destroy()
#---------------------------------------------
def OnTaskBarClose(self, evt):
self.Close()
# because of the way wxTaskBarIcon.PopupMenu is implemented we have to
# prod the main idle handler a bit to get the window to actually close
wxGetApp().ProcessIdle()
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
class MyApp(wxApp):
def OnInit(self):
wxInitAllImageHandlers()
self.splash = SplashScreen(None, bitmapfile='bitmaps/splash.gif',
duration=4000, callback=self.AfterSplash)
self.splash.Show(true)
wxYield()
return true
def AfterSplash(self):
self.splash.Close(true)
frame = wxPythonDemo(None, -1, "wxPython: (A Demonstration)")
frame.Show(true)
self.SetTopWindow(frame)
self.ShowTip(frame)
def ShowTip(self, frame):
try:
showTipText = open("data/showTips").read()
showTip, index = eval(showTipText)
except IOError:
showTip, index = (1, 0)
#print showTip, index
if showTip:
tp = wxCreateFileTipProvider("data/tips.txt", index)
showTip = wxShowTip(frame, tp)
index = tp.GetCurrentTip()
open("data/showTips", "w").write(str( (showTip, index) ))
#---------------------------------------------------------------------------
def main():
try:
demoPath = os.path.split(__file__)[0]
os.chdir(demoPath)
except:
pass
app = MyApp(0)
app.MainLoop()
#---------------------------------------------------------------------------
overview = """<html><body>
<h2>Python</h2>
Python is an interpreted, interactive, object-oriented programming
language often compared to Tcl, Perl, Scheme, or Java.
<p> Python combines remarkable power with very clear syntax. It has
modules, classes, exceptions, very high level dynamic data types, and
dynamic typing. There are interfaces to many system calls and
libraries, and new built-in modules are easily written in C or
C++. Python is also usable as an extension language for applications
that need a programmable interface. <p>
<h2>wxWindows</h2>
wxWindows is a free C++ framework designed to make cross-platform
programming child's play. Well, almost. wxWindows 2 supports Windows
3.1/95/98/NT, Unix with GTK/Motif/Lesstif, with a Mac version
underway. Other ports are under consideration. <p>
wxWindows is a set of libraries that allows C++ applications to
compile and run on several different types of computers, with minimal
source code changes. There is one library per supported GUI (such as
Motif, or Windows). As well as providing a common API (Application
Programming Interface) for GUI functionality, it provides
functionality for accessing some commonly-used operating system
facilities, such as copying or deleting files. wxWindows is a
'framework' in the sense that it provides a lot of built-in
functionality, which the application can use or replace as required,
thus saving a great deal of coding effort. Basic data structures such
as strings, linked lists and hash tables are also supported.
<p>
<h2>wxPython</h2>
wxPython is a Python extension module that encapsulates the wxWindows
GUI classes. Currently it is only available for the Win32 and GTK
ports of wxWindows, but as soon as the other ports are brought up to
the same level as Win32 and GTK, it should be fairly trivial to
enable wxPython to be used with the new GUI.
<p>
The wxPython extension module attempts to mirror the class heiarchy
of wxWindows as closely as possible. This means that there is a
wxFrame class in wxPython that looks, smells, tastes and acts almost
the same as the wxFrame class in the C++ version. Unfortunately,
because of differences in the languages, wxPython doesn't match
wxWindows exactly, but the differences should be easy to absorb
because they are natural to Python. For example, some methods that
return multiple values via argument pointers in C++ will return a
tuple of values in Python.
<p>
There is still much to be done for wxPython, many classes still need
to be mirrored. Also, wxWindows is still somewhat of a moving target
so it is a bit of an effort just keeping wxPython up to date. On the
other hand, there are enough of the core classes completed that
useful applications can be written.
<p>
wxPython is close enough to the C++ version that the majority of
the wxPython documentation is actually just notes attached to the C++
documents that describe the places where wxPython is different. There
is also a series of sample programs included, and a series of
documentation pages that assist the programmer in getting started
with wxPython.
"""
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
if __name__ == '__main__':
main()
#----------------------------------------------------------------------------

View File

@@ -1,176 +0,0 @@
from wxPython.wx import *
from wxScrolledWindow import MyCanvas
#----------------------------------------------------------------------
class MyPrintout(wxPrintout):
def __init__(self, canvas, log):
wxPrintout.__init__(self)
self.canvas = canvas
self.log = log
def OnBeginDocument(self, start, end):
self.log.WriteText("wxPrintout.OnBeginDocument\n")
return self.base_OnBeginDocument(start, end)
def OnEndDocument(self):
self.log.WriteText("wxPrintout.OnEndDocument\n")
self.base_OnEndDocument()
def OnBeginPrinting(self):
self.log.WriteText("wxPrintout.OnBeginPrinting\n")
self.base_OnBeginPrinting()
def OnEndPrinting(self):
self.log.WriteText("wxPrintout.OnEndPrinting\n")
self.base_OnEndPrinting()
def OnPreparePrinting(self):
self.log.WriteText("wxPrintout.OnPreparePrinting\n")
self.base_OnPreparePrinting()
def HasPage(self, page):
self.log.WriteText("wxPrintout.HasPage\n")
if page == 1:
return true
else:
return false
def GetPageInfo(self):
self.log.WriteText("wxPrintout.GetPageInfo\n")
return (1, 1, 1, 1)
def OnPrintPage(self, page):
self.log.WriteText("wxPrintout.OnPrintPage\n")
dc = self.GetDC()
#-------------------------------------------
# One possible method of setting scaling factors...
maxX = self.canvas.getWidth()
maxY = self.canvas.getHeight()
# Let's have at least 50 device units margin
marginX = 50
marginY = 50
# Add the margin to the graphic size
maxX = maxX + (2 * marginX)
maxY = maxY + (2 * marginY)
# Get the size of the DC in pixels
(w, h) = dc.GetSizeTuple()
# Calculate a suitable scaling factor
scaleX = float(w) / maxX
scaleY = float(h) / maxY
# Use x or y scaling factor, whichever fits on the DC
actualScale = min(scaleX, scaleY)
# Calculate the position on the DC for centring the graphic
posX = (w - (self.canvas.getWidth() * actualScale)) / 2.0
posY = (h - (self.canvas.getHeight() * actualScale)) / 2.0
# Set the scale and origin
dc.SetUserScale(actualScale, actualScale)
dc.SetDeviceOrigin(int(posX), int(posY))
#-------------------------------------------
self.canvas.DoDrawing(dc)
return true
#----------------------------------------------------------------------
class TestPrintPanel(wxPanel):
def __init__(self, parent, frame, log):
wxPanel.__init__(self, parent, -1)
self.log = log
self.frame = frame
self.printData = wxPrintData()
self.printData.SetPaperId(wxPAPER_LETTER)
self.box = wxBoxSizer(wxVERTICAL)
self.canvas = MyCanvas(self)
self.box.Add(self.canvas, 1, wxGROW)
subbox = wxBoxSizer(wxHORIZONTAL)
btn = wxButton(self, 1201, "Print Setup")
EVT_BUTTON(self, 1201, self.OnPrintSetup)
subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1202, "Print Preview")
EVT_BUTTON(self, 1202, self.OnPrintPreview)
subbox.Add(btn, 1, wxGROW | wxALL, 2)
btn = wxButton(self, 1203, "Print")
EVT_BUTTON(self, 1203, self.OnDoPrint)
subbox.Add(btn, 1, wxGROW | wxALL, 2)
self.box.Add(subbox, 0, wxGROW)
self.SetAutoLayout(true)
self.SetSizer(self.box)
def OnPrintSetup(self, event):
printerDialog = wxPrintDialog(self)
printerDialog.GetPrintDialogData().SetPrintData(self.printData)
printerDialog.GetPrintDialogData().SetSetupDialog(true)
printerDialog.ShowModal();
self.printData = printerDialog.GetPrintDialogData().GetPrintData()
printerDialog.Destroy()
def OnPrintPreview(self, event):
self.log.WriteText("OnPrintPreview\n")
printout = MyPrintout(self.canvas, self.log)
printout2 = MyPrintout(self.canvas, self.log)
self.preview = wxPrintPreview(printout, printout2, self.printData)
if not self.preview.Ok():
self.log.WriteText("Houston, we have a problem...\n")
return
frame = wxPreviewFrame(self.preview, self.frame, "This is a print preview")
frame.Initialize()
frame.SetPosition(self.frame.GetPosition())
frame.SetSize(self.frame.GetSize())
frame.Show(true)
def OnDoPrint(self, event):
pdd = wxPrintDialogData()
pdd.SetPrintData(self.printData)
printer = wxPrinter(pdd)
printout = MyPrintout(self.canvas, self.log)
if not printer.Print(self.frame, printout):
wxMessageBox("There was a problem printing.\nPerhaps your current printer is not set correctly?", "Printing", wxOK)
else:
self.printData = printer.GetPrintDialogData().GetPrintData()
printout.Destroy()
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPrintPanel(nb, frame, log)
return win
#----------------------------------------------------------------------
overview = """\
"""

View File

@@ -1,21 +0,0 @@
from wxPython.wx import *
from wxPython.lib.shell import PyShell
#----------------------------------------------------------------------
def runTest(frame, nb, log):
testGlobals = {'hello' : 'How are you?'}
win = PyShell(nb, globals=testGlobals)
win.Show(true)
return win
#----------------------------------------------------------------------
overview = """
A simple GUI version of the interactive interpreter.
"""

View File

@@ -1,15 +0,0 @@
from wxPython.lib.pyshell import PyShellWindow
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = PyShellWindow(nb, -1)
return win
#----------------------------------------------------------------------
import wxPython.lib.pyshell
overview = wxPython.lib.pyshell.__doc__

View File

@@ -1,85 +0,0 @@
from wxPython.wx import *
import sys
#----------------------------------------------------------------------
myEVT_BUTTON_CLICKPOS = 5015
def EVT_BUTTON_CLICKPOS(win, id, func):
win.Connect(id, -1, myEVT_BUTTON_CLICKPOS, func)
class MyEvent(wxPyCommandEvent):
def __init__(self, evtType, id):
wxPyCommandEvent.__init__(self, evtType, id)
self.myVal = None
#def __del__(self):
# print '__del__'
# wxPyCommandEvent.__del__(self)
def SetMyVal(self, val):
self.myVal = val
def GetMyVal(self):
return self.myVal
class MyButton(wxButton):
def __init__(self, parent, id, txt, pos):
wxButton.__init__(self, parent, id, txt, pos)
EVT_LEFT_DOWN(self, self.OnLeftDown)
def OnLeftDown(self, event):
pt = event.GetPosition()
evt = MyEvent(myEVT_BUTTON_CLICKPOS, self.GetId())
evt.SetMyVal(pt)
#print id(evt), sys.getrefcount(evt)
self.GetEventHandler().ProcessEvent(evt)
#print id(evt), sys.getrefcount(evt)
event.Skip()
class TestPanel(wxPanel):
def __init__(self, parent, log):
wxPanel.__init__(self, parent, -1)
self.log = log
b = MyButton(self, -1, " Click me ", wxPoint(30,30))
EVT_BUTTON(self, b.GetId(), self.OnClick)
EVT_BUTTON_CLICKPOS(self, b.GetId(), self.OnMyEvent)
wxStaticText(self, -1, "Please see the Overview and Demo Code for details...",
wxPoint(30, 80))
def OnClick(self, event):
self.log.WriteText("OnClick\n")
def OnMyEvent(self, event):
#print id(event), sys.getrefcount(event)
self.log.WriteText("MyEvent: %s\n" % (event.GetMyVal(), ) )
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestPanel(nb, log)
return win
#----------------------------------------------------------------------
overview = """\
This demo is a contrived example of defining an event class in wxPython and sending it up the containment heirachy for processing.
"""

View File

@@ -1,7 +0,0 @@
To run the main demo in this directory, execute demo.py. In other
words, one of the following commands should do it:
demo.py
python demo.py
pythonw demo.py

View File

@@ -1,587 +0,0 @@
#----------------------------------------------------------------------
# sizer test code
#----------------------------------------------------------------------
from wxPython.wx import *
from wxPython.lib.grids import wxGridSizer, wxFlexGridSizer
#----------------------------------------------------------------------
def makeSimpleBox1(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeSimpleBox2(win):
box = wxBoxSizer(wxVERTICAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeSimpleBox3(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeSimpleBox4(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 1, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 1, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeSimpleBox5(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 3, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 1, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeSimpleBox6(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 1, wxALIGN_TOP)
box.Add(wxButton(win, 1010, "two"), 1, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 1, wxALIGN_CENTER)
box.Add(wxButton(win, 1010, "four"), 1, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxALIGN_BOTTOM)
return box
#----------------------------------------------------------------------
def makeSimpleBox7(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(60, 20, 0, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeSimpleBox8(win):
box = wxBoxSizer(wxVERTICAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(0,0, 1)
box.Add(wxButton(win, 1010, "two"), 0, wxALIGN_CENTER)
box.Add(0,0, 1)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
# box.Add(wxButton(win, 1010, "five"), 1, wxEXPAND)
return box
#----------------------------------------------------------------------
#----------------------------------------------------------------------
def makeSimpleBorder1(win):
bdr = wxBoxSizer(wxHORIZONTAL)
btn = wxButton(win, 1010, "border")
btn.SetSize(wxSize(80, 80))
bdr.Add(btn, 1, wxEXPAND|wxALL, 15)
return bdr
#----------------------------------------------------------------------
def makeSimpleBorder2(win):
bdr = wxBoxSizer(wxHORIZONTAL)
btn = wxButton(win, 1010, "border")
btn.SetSize(wxSize(80, 80))
bdr.Add(btn, 1, wxEXPAND | wxEAST | wxWEST, 15)
return bdr
#----------------------------------------------------------------------
def makeSimpleBorder3(win):
bdr = wxBoxSizer(wxHORIZONTAL)
btn = wxButton(win, 1010, "border")
btn.SetSize(wxSize(80, 80))
bdr.Add(btn, 1, wxEXPAND | wxNORTH | wxWEST, 15)
return bdr
#----------------------------------------------------------------------
#----------------------------------------------------------------------
def makeBoxInBox(win):
box = wxBoxSizer(wxVERTICAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box2 = wxBoxSizer(wxHORIZONTAL)
box2.AddMany([ (wxButton(win, 1010, "two"), 0, wxEXPAND),
(wxButton(win, 1010, "three"), 0, wxEXPAND),
(wxButton(win, 1010, "four"), 0, wxEXPAND),
(wxButton(win, 1010, "five"), 0, wxEXPAND),
])
box3 = wxBoxSizer(wxVERTICAL)
box3.AddMany([ (wxButton(win, 1010, "six"), 0, wxEXPAND),
(wxButton(win, 1010, "seven"), 2, wxEXPAND),
(wxButton(win, 1010, "eight"), 1, wxEXPAND),
(wxButton(win, 1010, "nine"), 1, wxEXPAND),
])
box2.Add(box3, 1, wxEXPAND)
box.Add(box2, 1, wxEXPAND)
box.Add(wxButton(win, 1010, "ten"), 0, wxEXPAND)
return box
#----------------------------------------------------------------------
def makeBoxInBorder(win):
bdr = wxBoxSizer(wxHORIZONTAL)
box = makeSimpleBox3(win)
bdr.Add(box, 1, wxEXPAND | wxALL, 15)
return bdr
#----------------------------------------------------------------------
def makeBorderInBox(win):
insideBox = wxBoxSizer(wxHORIZONTAL)
box2 = wxBoxSizer(wxHORIZONTAL)
box2.AddMany([ (wxButton(win, 1010, "one"), 0, wxEXPAND),
(wxButton(win, 1010, "two"), 0, wxEXPAND),
(wxButton(win, 1010, "three"), 0, wxEXPAND),
(wxButton(win, 1010, "four"), 0, wxEXPAND),
(wxButton(win, 1010, "five"), 0, wxEXPAND),
])
insideBox.Add(box2, 0, wxEXPAND)
bdr = wxBoxSizer(wxHORIZONTAL)
bdr.Add(wxButton(win, 1010, "border"), 1, wxEXPAND | wxALL)
insideBox.Add(bdr, 1, wxEXPAND | wxALL, 20)
box3 = wxBoxSizer(wxVERTICAL)
box3.AddMany([ (wxButton(win, 1010, "six"), 0, wxEXPAND),
(wxButton(win, 1010, "seven"), 2, wxEXPAND),
(wxButton(win, 1010, "eight"), 1, wxEXPAND),
(wxButton(win, 1010, "nine"), 1, wxEXPAND),
])
insideBox.Add(box3, 1, wxEXPAND)
outsideBox = wxBoxSizer(wxVERTICAL)
outsideBox.Add(wxButton(win, 1010, "top"), 0, wxEXPAND)
outsideBox.Add(insideBox, 1, wxEXPAND)
outsideBox.Add(wxButton(win, 1010, "bottom"), 0, wxEXPAND)
return outsideBox
#----------------------------------------------------------------------
def makeGrid1(win):
gs = wxGridSizer(3, 3, 2, 2) # rows, cols, hgap, vgap
gs.AddMany([ (wxButton(win, 1010, 'one'), 0, wxEXPAND),
(wxButton(win, 1010, 'two'), 0, wxEXPAND),
(wxButton(win, 1010, 'three'), 0, wxEXPAND),
(wxButton(win, 1010, 'four'), 0, wxEXPAND),
(wxButton(win, 1010, 'five'), 0, wxEXPAND),
#(75, 50),
(wxButton(win, 1010, 'six'), 0, wxEXPAND),
(wxButton(win, 1010, 'seven'), 0, wxEXPAND),
(wxButton(win, 1010, 'eight'), 0, wxEXPAND),
(wxButton(win, 1010, 'nine'), 0, wxEXPAND),
])
return gs
#----------------------------------------------------------------------
def makeGrid2(win):
gs = wxGridSizer(3, 3) # rows, cols, hgap, vgap
box = wxBoxSizer(wxVERTICAL)
box.Add(wxButton(win, 1010, 'A'), 0, wxEXPAND)
box.Add(wxButton(win, 1010, 'B'), 1, wxEXPAND)
gs2 = wxGridSizer(2,2, 4, 4)
gs2.AddMany([ (wxButton(win, 1010, 'C'), 0, wxEXPAND),
(wxButton(win, 1010, 'E'), 0, wxEXPAND),
(wxButton(win, 1010, 'F'), 0, wxEXPAND),
(wxButton(win, 1010, 'G'), 0, wxEXPAND)])
gs.AddMany([ (wxButton(win, 1010, 'one'), 0, wxALIGN_RIGHT | wxALIGN_BOTTOM),
(wxButton(win, 1010, 'two'), 0, wxEXPAND),
(wxButton(win, 1010, 'three'), 0, wxALIGN_LEFT | wxALIGN_BOTTOM),
(wxButton(win, 1010, 'four'), 0, wxEXPAND),
(wxButton(win, 1010, 'five'), 0, wxALIGN_CENTER),
(wxButton(win, 1010, 'six'), 0, wxEXPAND),
(box, 0, wxEXPAND | wxALL, 10),
(wxButton(win, 1010, 'eight'), 0, wxEXPAND),
(gs2, 0, wxEXPAND | wxALL, 4),
])
return gs
#----------------------------------------------------------------------
def makeGrid3(win):
gs = wxFlexGridSizer(3, 3, 2, 2) # rows, cols, hgap, vgap
gs.AddMany([ (wxButton(win, 1010, 'one'), 0, wxEXPAND),
(wxButton(win, 1010, 'two'), 0, wxEXPAND),
(wxButton(win, 1010, 'three'), 0, wxEXPAND),
(wxButton(win, 1010, 'four'), 0, wxEXPAND),
#(wxButton(win, 1010, 'five'), 0, wxEXPAND),
(175, 50),
(wxButton(win, 1010, 'six'), 0, wxEXPAND),
(wxButton(win, 1010, 'seven'), 0, wxEXPAND),
(wxButton(win, 1010, 'eight'), 0, wxEXPAND),
(wxButton(win, 1010, 'nine'), 0, wxEXPAND),
])
gs.AddGrowableRow(0)
gs.AddGrowableRow(2)
gs.AddGrowableCol(1)
return gs
#----------------------------------------------------------------------
def makeGrid4(win):
bpos = wxDefaultPosition
bsize = wxSize(100, 50)
gs = wxGridSizer(3, 3, 2, 2) # rows, cols, hgap, vgap
gs.AddMany([ (wxButton(win, 1010, 'one', bpos, bsize),
0, wxALIGN_TOP | wxALIGN_LEFT ),
(wxButton(win, 1010, 'two', bpos, bsize),
0, wxALIGN_TOP | wxALIGN_CENTER_HORIZONTAL ),
(wxButton(win, 1010, 'three', bpos, bsize),
0, wxALIGN_TOP | wxALIGN_RIGHT ),
(wxButton(win, 1010, 'four', bpos, bsize),
0, wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT ),
(wxButton(win, 1010, 'five', bpos, bsize),
0, wxALIGN_CENTER ),
(wxButton(win, 1010, 'six', bpos, bsize),
0, wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT ),
(wxButton(win, 1010, 'seven', bpos, bsize),
0, wxALIGN_BOTTOM | wxALIGN_LEFT ),
(wxButton(win, 1010, 'eight', bpos, bsize),
0, wxALIGN_BOTTOM | wxALIGN_CENTER_HORIZONTAL ),
(wxButton(win, 1010, 'nine', bpos, bsize),
0, wxALIGN_BOTTOM | wxALIGN_RIGHT ),
])
return gs
#----------------------------------------------------------------------
def makeShapes(win):
bpos = wxDefaultPosition
bsize = wxSize(100, 50)
gs = wxGridSizer(3, 3, 2, 2) # rows, cols, hgap, vgap
gs.AddMany([ (wxButton(win, 1010, 'one', bpos, bsize),
0, wxSHAPED | wxALIGN_TOP | wxALIGN_LEFT ),
(wxButton(win, 1010, 'two', bpos, bsize),
0, wxSHAPED | wxALIGN_TOP | wxALIGN_CENTER_HORIZONTAL ),
(wxButton(win, 1010, 'three', bpos, bsize),
0, wxSHAPED | wxALIGN_TOP | wxALIGN_RIGHT ),
(wxButton(win, 1010, 'four', bpos, bsize),
0, wxSHAPED | wxALIGN_CENTER_VERTICAL | wxALIGN_LEFT ),
(wxButton(win, 1010, 'five', bpos, bsize),
0, wxSHAPED | wxALIGN_CENTER ),
(wxButton(win, 1010, 'six', bpos, bsize),
0, wxSHAPED | wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT ),
(wxButton(win, 1010, 'seven', bpos, bsize),
0, wxSHAPED | wxALIGN_BOTTOM | wxALIGN_LEFT ),
(wxButton(win, 1010, 'eight', bpos, bsize),
0, wxSHAPED | wxALIGN_BOTTOM | wxALIGN_CENTER_HORIZONTAL ),
(wxButton(win, 1010, 'nine', bpos, bsize),
0, wxSHAPED | wxALIGN_BOTTOM | wxALIGN_RIGHT ),
])
return gs
#----------------------------------------------------------------------
def makeSimpleBoxShaped(win):
box = wxBoxSizer(wxHORIZONTAL)
box.Add(wxButton(win, 1010, "one"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "two"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "three"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "four"), 0, wxEXPAND)
box.Add(wxButton(win, 1010, "five"), 1, wxSHAPED)
return box
#----------------------------------------------------------------------
theTests = [
("Simple horizontal boxes", makeSimpleBox1,
"This is a HORIZONTAL box sizer with four non-stretchable buttons held "
"within it. Notice that the buttons are added and aligned in the horizontal "
"dimension. Also notice that they are fixed size in the horizontal dimension, "
"but will stretch vertically."
),
("Simple vertical boxes", makeSimpleBox2,
"Exactly the same as the previous sample but using a VERTICAL box sizer "
"instead of a HORIZONTAL one."
),
("Add a stretchable", makeSimpleBox3,
"We've added one more button with the strechable flag turned on. Notice "
"how it grows to fill the extra space in the otherwise fixed dimension."
),
("More than one stretchable", makeSimpleBox4,
"Here there are several items that are stretchable, they all divide up the "
"extra space evenly."
),
("Weighting factor", makeSimpleBox5,
"This one shows more than one strechable, but one of them has a weighting "
"factor so it gets more of the free space."
),
("Edge Affinity", makeSimpleBox6,
"For items that don't completly fill their allotted space, and don't "
"stretch, you can specify which side (or the center) they should stay "
"attached to."
),
("Spacer", makeSimpleBox7,
"You can add empty space to be managed by a Sizer just as if it were a "
"window or another Sizer."
),
("Centering in available space", makeSimpleBox8,
"This one shows an item that does not expand to fill it's space, but rather"
"stays centered within it."
),
# ("Percent Sizer", makeSimpleBox6,
# "You can use the wxBoxSizer like a Percent Sizer. Just make sure that all "
# "the weighting factors add up to 100!"
# ),
("", None, ""),
("Simple border sizer", makeSimpleBorder1,
"The wxBoxSizer can leave empty space around its contents. This one "
"gives a border all the way around."
),
("East and West border", makeSimpleBorder2,
"You can pick and choose which sides have borders."
),
("North and West border", makeSimpleBorder3,
"You can pick and choose which sides have borders."
),
("", None, ""),
("Boxes inside of boxes", makeBoxInBox,
"This one shows nesting of boxes within boxes within boxes, using both "
"orientations. Notice also that button seven has a greater weighting "
"factor than its siblings."
),
("Boxes inside a Border", makeBoxInBorder,
"Sizers of different types can be nested withing each other as well. "
"Here is a box sizer with several buttons embedded within a border sizer."
),
("Border in a Box", makeBorderInBox,
"Another nesting example. This one has Boxes and a Border inside another Box."
),
("", None, ""),
("Simple Grid", makeGrid1,
"This is an example of the wxGridSizer. In this case all row heights "
"and column widths are kept the same as all the others and all items "
"fill their available space. The horzontal and vertical gaps are set to "
"2 pixels each."
),
("More Grid Features", makeGrid2,
"This is another example of the wxGridSizer. This one has no gaps in the grid, "
"but various cells are given different alignment options and some of them "
"hold nested sizers."
),
("Flexible Grid", makeGrid3,
"This grid allows the rows to have different heights and the columns to have "
"different widths. You can also specify rows and columns that are growable, "
"which we have done for the first and last row and the middle column for "
"this example.\n"
"\nThere is also a spacer in the middle cell instead of an actual window."
),
("Grid with Alignment", makeGrid4,
"New alignment flags allow for the positioning of items in any corner or centered "
"position."
),
("", None, ""),
("Proportional resize", makeSimpleBoxShaped,
"Managed items can preserve their original aspect ratio. The last item has the "
"wxSHAPED flag set and will resize proportional to its origingal size."
),
("Proportional resize with Alignments", makeShapes,
"This one shows various alignments as well as proportional resizing for all items."
),
]
#----------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, title, sizerFunc):
wxFrame.__init__(self, parent, -1, title)
EVT_BUTTON(self, 1010, self.OnButton)
self.sizer = sizerFunc(self)
self.CreateStatusBar()
self.SetStatusText("Resize this frame to see how the sizers respond...")
self.sizer.Fit(self)
self.SetAutoLayout(true)
self.SetSizer(self.sizer)
EVT_CLOSE(self, self.OnCloseWindow)
def OnCloseWindow(self, event):
self.MakeModal(false)
self.Destroy()
def OnButton(self, event):
self.Close(true)
#----------------------------------------------------------------------
class TestSelectionPanel(wxPanel):
def __init__(self, parent, frame):
wxPanel.__init__(self, parent, -1)
self.frame = frame
self.list = wxListBox(self, 401,
wxDLG_PNT(self, 10, 10), wxDLG_SZE(self, 100, 100),
[])
EVT_LISTBOX(self, 401, self.OnSelect)
EVT_LISTBOX_DCLICK(self, 401, self.OnDClick)
self.btn = wxButton(self, 402, "Try it!", wxDLG_PNT(self, 120, 10)).SetDefault()
EVT_BUTTON(self, 402, self.OnDClick)
self.text = wxTextCtrl(self, -1, "",
wxDLG_PNT(self, 10, 115),
wxDLG_SZE(self, 200, 50),
wxTE_MULTILINE | wxTE_READONLY)
for item in theTests:
self.list.Append(item[0])
def OnSelect(self, event):
pos = self.list.GetSelection()
self.text.SetValue(theTests[pos][2])
def OnDClick(self, event):
pos = self.list.GetSelection()
title = theTests[pos][0]
func = theTests[pos][1]
if func:
win = TestFrame(self, title, func)
win.CentreOnParent(wxBOTH)
win.Show(true)
win.MakeModal(true)
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestSelectionPanel(nb, frame)
return win
overview = ""
#wxSizer.__doc__ + '\n' + '-' * 80 + '\n' + \
#wxBoxSizer.__doc__ + '\n' + '-' * 80 + '\n' + \
#wxBorderSizer.__doc__
#----------------------------------------------------------------------
if __name__ == '__main__':
class MainFrame(wxFrame):
def __init__(self):
wxFrame.__init__(self, NULL, -1, "Testing...")
self.CreateStatusBar()
mainmenu = wxMenuBar()
menu = wxMenu()
menu.Append(200, 'E&xit', 'Get the heck outta here!')
mainmenu.Append(menu, "&File")
self.SetMenuBar(mainmenu)
EVT_MENU(self, 200, self.OnExit)
self.panel = TestSelectionPanel(self, self)
self.SetSize(wxSize(400, 380))
EVT_CLOSE(self, self.OnCloseWindow)
def OnCloseWindow(self, event):
self.Destroy()
def OnExit(self, event):
self.Close(true)
class TestApp(wxApp):
def OnInit(self):
frame = MainFrame()
frame.Show(true)
self.SetTopWindow(frame)
return true
app = TestApp(0)
app.MainLoop()
#----------------------------------------------------------------------

View File

@@ -1,379 +0,0 @@
#!/usr/bin/python
"""This is SlashDot 1.2
It's the obligatory Slashdot.org headlines reader that
any modern widget set/library must have in order to be taken
seriously :-)
Usage is quite simple; wxSlash attempts to download the
'ultramode.txt' file from http://slashdot.org, which
contains the headlines in a computer friendly format. It
then displays said headlines in a wxWindows list control.
You can read articles using either Python's html library
or an external browser. Uncheck the 'browser->internal' menu
item to use the latter option. Use the settings dialog box
to set which external browser is started.
This code is available under the wxWindows license, see
elsewhere. If you modify this code, be aware of the fact
that slashdot.org's maintainer, CmdrTaco, explicitly asks
'ultramode.txt' downloaders not to do this automatically
more than twice per hour. If this feature is abused,
CmdrTaco may remove the ultramode file completely and that
will make a *lot* of people unhappy.
I want to thank Alex Shnitman whose slashes.pl
(Perl/GTK) script gave me the idea for this applet.
Have fun with it,
Harm van der Heijden (H.v.d.Heijden@phys.tue.nl)
"""
from wxPython.wx import *
from httplib import HTTP
from htmllib import HTMLParser
import os
import re
import formatter
class HTMLTextView(wxFrame):
def __init__(self, parent, id, title='HTMLTextView', url=None):
wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
wxSize(600,400))
EVT_CLOSE(self, self.OnCloseWindow)
self.mainmenu = wxMenuBar()
menu = wxMenu()
menu.Append(201, '&Open URL...', 'Open URL')
EVT_MENU(self, 201, self.OnFileOpen)
menu.Append(209, 'E&xit', 'Exit viewer')
EVT_MENU(self, 209, self.OnFileExit)
self.mainmenu.Append(menu, '&File')
self.SetMenuBar(self.mainmenu)
self.CreateStatusBar(1)
self.text = wxTextCtrl(self, -1, "", wxPyDefaultPosition,
wxPyDefaultSize, wxTE_MULTILINE | wxTE_READONLY)
if (url):
self.OpenURL(url)
def logprint(self, x):
self.SetStatusText(x)
def OpenURL(self, url):
self.url = url
m = re.match('file:(\S+)\s*', url)
if m:
f = open(m.groups()[0],'r')
else:
m = re.match('http://([^/]+)(/\S*)\s*', url)
if m:
host = m.groups()[0]
path = m.groups()[1]
else:
m = re.match('http://(\S+)\s*', url)
if not m:
# Invalid URL
self.logprint("Invalid or unsupported URL: %s" % (url))
return
host = m.groups()[0]
path = ''
f = RetrieveAsFile(host,path,self.logprint)
if not f:
self.logprint("Could not open %s" % (url))
return
self.logprint("Receiving data...")
data = f.read()
tmp = open('tmphtml.txt','w')
fmt = formatter.AbstractFormatter(formatter.DumbWriter(tmp))
p = HTMLParser(fmt)
self.logprint("Parsing data...")
p.feed(data)
p.close()
tmp.close()
tmp = open('tmphtml.txt', 'r')
self.text.SetValue(tmp.read())
self.SetTitle(url)
self.logprint(url)
def OnFileOpen(self, event):
dlg = wxTextEntryDialog(self, "Enter URL to open:", "")
if dlg.ShowModal() == wxID_OK:
url = dlg.GetValue()
else:
url = None
if url:
self.OpenURL(url)
def OnFileExit(self, event):
self.Close()
def OnCloseWindow(self, event):
self.Destroy()
def ParseSlashdot(f):
art_sep = re.compile('%%\r?\n')
line_sep = re.compile('\r?\n')
data = f.read()
list = art_sep.split(data)
art_list = []
for i in range(1,len(list)-1):
art_list.append(line_sep.split(list[i]))
return art_list
def myprint(x):
print x
def RetrieveAsFile(host, path='', logprint = myprint):
try:
h = HTTP(host)
except:
logprint("Failed to create HTTP connection to %s... is the network available?" % (host))
return None
h.putrequest('GET',path)
h.putheader('Accept','text/html')
h.putheader('Accept','text/plain')
h.endheaders()
errcode, errmsg, headers = h.getreply()
if errcode != 200:
logprint("HTTP error code %d: %s" % (errcode, errmsg))
return None
f = h.getfile()
# f = open('/home/harm/ultramode.txt','r')
return f
class AppStatusBar(wxStatusBar):
def __init__(self, parent):
wxStatusBar.__init__(self,parent, -1)
self.SetFieldsCount(2)
self.SetStatusWidths([-1, 100])
self.but = wxButton(self, 1001, "Refresh")
EVT_BUTTON(self, 1001, parent.OnViewRefresh)
EVT_SIZE(self, self.OnSize)
self.OnSize(None)
def logprint(self,x):
self.SetStatusText(x,0)
def OnSize(self, event):
rect = self.GetFieldRect(1)
self.but.SetPosition(wxPoint(rect.x+2, rect.y+2))
self.but.SetSize(wxSize(rect.width-4, rect.height-4))
# This is a simple timer class to start a function after a short delay;
class QuickTimer(wxTimer):
def __init__(self, func, wait=100):
wxTimer.__init__(self)
self.callback = func
self.Start(wait); # wait .1 second (.001 second doesn't work. why?)
def Notify(self):
self.Stop();
apply(self.callback, ());
class AppFrame(wxFrame):
def __init__(self, parent, id, title):
wxFrame.__init__(self, parent, id, title, wxPyDefaultPosition,
wxSize(650, 250))
# if the window manager closes the window:
EVT_CLOSE(self, self.OnCloseWindow);
# Now Create the menu bar and items
self.mainmenu = wxMenuBar()
menu = wxMenu()
menu.Append(209, 'E&xit', 'Enough of this already!')
EVT_MENU(self, 209, self.OnFileExit)
self.mainmenu.Append(menu, '&File')
menu = wxMenu()
menu.Append(210, '&Refresh', 'Refresh headlines')
EVT_MENU(self, 210, self.OnViewRefresh)
menu.Append(211, '&Slashdot Index', 'View Slashdot index')
EVT_MENU(self, 211, self.OnViewIndex)
menu.Append(212, 'Selected &Article', 'View selected article')
EVT_MENU(self, 212, self.OnViewArticle)
self.mainmenu.Append(menu, '&View')
menu = wxMenu()
menu.Append(220, '&Internal', 'Use internal text browser',TRUE)
menu.Check(220, true)
self.UseInternal = 1;
EVT_MENU(self, 220, self.OnBrowserInternal)
menu.Append(222, '&Settings...', 'External browser Settings')
EVT_MENU(self, 222, self.OnBrowserSettings)
self.mainmenu.Append(menu, '&Browser')
menu = wxMenu()
menu.Append(230, '&About', 'Some documentation');
EVT_MENU(self, 230, self.OnAbout)
self.mainmenu.Append(menu, '&Help')
self.SetMenuBar(self.mainmenu)
if wxPlatform == '__WXGTK__':
# I like lynx. Also Netscape 4.5 doesn't react to my cmdline opts
self.BrowserSettings = "xterm -e lynx %s &"
elif wxPlatform == '__WXMSW__':
# netscape 4.x likes to hang out here...
self.BrowserSettings = '\\progra~1\\Netscape\\Communicator\\Program\\netscape.exe %s'
else:
# a wild guess...
self.BrowserSettings = 'netscape %s'
# A status bar to tell people what's happening
self.sb = AppStatusBar(self)
self.SetStatusBar(self.sb)
self.list = wxListCtrl(self, 1100, style=wxLC_REPORT)
self.list.InsertColumn(0, 'Subject')
self.list.InsertColumn(1, 'Date')
self.list.InsertColumn(2, 'Posted by')
self.list.InsertColumn(3, 'Comments')
self.list.SetColumnWidth(0, 300)
self.list.SetColumnWidth(1, 150)
self.list.SetColumnWidth(2, 100)
self.list.SetColumnWidth(3, 100)
EVT_LIST_ITEM_SELECTED(self, 1100, self.OnItemSelected)
EVT_LEFT_DCLICK(self.list, self.OnLeftDClick)
self.logprint("Connecting to slashdot... Please wait.")
# wxYield doesn't yet work here. That's why we use a timer
# to make sure that we see some GUI stuff before the slashdot
# file is transfered.
self.timer = QuickTimer(self.DoRefresh, 1000)
def logprint(self, x):
self.sb.logprint(x)
def OnFileExit(self, event):
self.Destroy()
def DoRefresh(self):
f = RetrieveAsFile('slashdot.org','/ultramode.txt',self.sb.logprint)
art_list = ParseSlashdot(f)
self.list.DeleteAllItems()
self.url = []
self.current = -1
i = 0;
for article in art_list:
self.list.InsertStringItem(i, article[0])
self.list.SetStringItem(i, 1, article[2])
self.list.SetStringItem(i, 2, article[3])
self.list.SetStringItem(i, 3, article[6])
self.url.append(article[1])
i = i + 1
self.logprint("File retrieved OK.")
def OnViewRefresh(self, event):
self.logprint("Connecting to slashdot... Please wait.");
wxYield()
self.DoRefresh()
def DoViewIndex(self):
if self.UseInternal:
self.view = HTMLTextView(self, -1, 'slashdot.org',
'http://slashdot.org')
self.view.Show(true)
else:
self.logprint(self.BrowserSettings % ('http://slashdot.org'))
#os.system(self.BrowserSettings % ('http://slashdot.org'))
wxExecute(self.BrowserSettings % ('http://slashdot.org'))
self.logprint("OK")
def OnViewIndex(self, event):
self.logprint("Starting browser... Please wait.")
wxYield()
self.DoViewIndex()
def DoViewArticle(self):
if self.current<0: return
url = self.url[self.current]
if self.UseInternal:
self.view = HTMLTextView(self, -1, url, url)
self.view.Show(true)
else:
self.logprint(self.BrowserSettings % (url))
os.system(self.BrowserSettings % (url))
self.logprint("OK")
def OnViewArticle(self, event):
self.logprint("Starting browser... Please wait.")
wxYield()
self.DoViewArticle()
def OnBrowserInternal(self, event):
if self.mainmenu.Checked(220):
self.UseInternal = 1
else:
self.UseInternal = 0
def OnBrowserSettings(self, event):
dlg = wxTextEntryDialog(self, "Enter command to view URL.\nUse %s as a placeholder for the URL.", "", self.BrowserSettings);
if dlg.ShowModal() == wxID_OK:
self.BrowserSettings = dlg.GetValue()
def OnAbout(self, event):
dlg = wxMessageDialog(self, __doc__, "wxSlash", wxOK | wxICON_INFORMATION)
dlg.ShowModal()
def OnItemSelected(self, event):
self.current = event.m_itemIndex
self.logprint("URL: %s" % (self.url[self.current]))
def OnLeftDClick(self, event):
(x,y) = event.Position();
# Actually, we should convert x,y to logical coords using
# a dc, but only for a wxScrolledWindow widget.
# Now wxGTK derives wxListCtrl from wxScrolledWindow,
# and wxMSW from wxControl... So that doesn't work.
#dc = wxClientDC(self.list)
##self.list.PrepareDC(dc)
#x = dc.DeviceToLogicalX( event.GetX() )
#y = dc.DeviceToLogicalY( event.GetY() )
id = self.list.HitTest(wxPoint(x,y))
#print "Double click at %d %d" % (x,y), id
# Okay, we got a double click. Let's assume it's the current selection
wxYield()
self.OnViewArticle(event)
def OnCloseWindow(self, event):
self.Destroy()
#---------------------------------------------------------------------------
# if running standalone
if __name__ == '__main__':
class MyApp(wxApp):
def OnInit(self):
frame = AppFrame(NULL, -1, "Slashdot Breaking News")
frame.Show(true)
self.SetTopWindow(frame)
return true
app = MyApp(0)
app.MainLoop()
#---------------------------------------------------------------------------
# if running as part of the Demo Framework...
def runTest(frame, nb, log):
win = AppFrame(NULL, -1, "Slashdot Breaking News")
frame.otherWin = win
win.Show(true)
overview = __doc__
#----------------------------------------------------------------------------

View File

@@ -1,244 +0,0 @@
from wxPython.wx import *
import thread
import time
from whrandom import random
#----------------------------------------------------------------------
wxEVT_UPDATE_BARGRAPH = 25015
def EVT_UPDATE_BARGRAPH(win, func):
win.Connect(-1, -1, wxEVT_UPDATE_BARGRAPH, func)
class UpdateBarEvent(wxPyEvent):
def __init__(self, barNum, value):
wxPyEvent.__init__(self)
self.SetEventType(wxEVT_UPDATE_BARGRAPH)
self.barNum = barNum
self.value = value
#----------------------------------------------------------------------
class CalcBarThread:
def __init__(self, win, barNum, val):
self.win = win
self.barNum = barNum
self.val = val
def Start(self):
self.keepGoing = self.running = true
thread.start_new_thread(self.Run, ())
def Stop(self):
self.keepGoing = false
def IsRunning(self):
return self.running
def Run(self):
while self.keepGoing:
evt = UpdateBarEvent(self.barNum, int(self.val))
wxPostEvent(self.win, evt)
del evt
sleeptime = (random() * 2) + 0.5
#print self.barNum, 'sleeping for', sleeptime
time.sleep(sleeptime)
sleeptime = sleeptime * 5
if int(random() * 2):
self.val = self.val + sleeptime
else:
self.val = self.val - sleeptime
if self.val < 0: self.val = 0
if self.val > 300: self.val = 300
self.running = false
#----------------------------------------------------------------------
class GraphWindow(wxWindow):
def __init__(self, parent, labels):
wxWindow.__init__(self, parent, -1)
self.values = []
for label in labels:
self.values.append((label, 0))
self.font = wxFont(12, wxSWISS, wxNORMAL, wxBOLD)
self.SetFont(self.font)
self.colors = [ wxRED, wxGREEN, wxBLUE, wxCYAN,
wxNamedColour("Yellow"), wxNamedColor("Navy") ]
EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
EVT_PAINT(self, self.OnPaint)
def SetValue(self, index, value):
assert index < len(self.values)
cur = self.values[index]
self.values[index:index+1] = [(cur[0], value)]
def SetFont(self, font):
wxWindow.SetFont(self, font)
wmax = hmax = 0
for label, val in self.values:
w,h = self.GetTextExtent(label)
if w > wmax: wmax = w
if h > hmax: hmax = h
self.linePos = wmax + 10
self.barHeight = hmax
def Draw(self, dc, size):
dc.SetFont(self.font)
dc.SetTextForeground(wxBLUE)
dc.SetBackground(wxBrush(self.GetBackgroundColour()))
dc.Clear()
dc.SetPen(wxPen(wxBLACK, 3, wxSOLID))
dc.DrawLine(self.linePos, 0, self.linePos, size.height-10)
bh = ypos = self.barHeight
for x in range(len(self.values)):
label, val = self.values[x]
dc.DrawText(label, 5, ypos)
if val:
color = self.colors[ x % len(self.colors) ]
dc.SetPen(wxPen(color))
dc.SetBrush(wxBrush(color))
dc.DrawRectangle(self.linePos+3, ypos, val, bh)
ypos = ypos + 2*bh
if ypos > size.height-10:
break
def OnPaint(self, evt):
size = self.GetSize()
bmp = wxEmptyBitmap(size.width, size.height)
dc = wxMemoryDC()
dc.SelectObject(bmp)
self.Draw(dc, size)
wdc = wxPaintDC(self)
wdc.BeginDrawing()
wdc.Blit(0,0, size.width, size.height, dc, 0,0)
wdc.EndDrawing()
dc.SelectObject(wxNullBitmap)
def OnEraseBackground(self, evt):
pass
#----------------------------------------------------------------------
class TestFrame(wxFrame):
def __init__(self, parent, log):
wxFrame.__init__(self, parent, -1, "Thread Test", size=(450,300))
self.log = log
#self.CenterOnParent()
panel = wxPanel(self, -1)
panel.SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD))
wxStaticText(panel, -1,
"This demo shows multiple threads interacting with this\n"
"window by sending events to it.", wxPoint(5,5))
panel.Fit()
self.graph = GraphWindow(self, ['Zero', 'One', 'Two', 'Three', 'Four',
'Five', 'Six', 'Seven'])
sizer = wxBoxSizer(wxVERTICAL)
sizer.Add(panel, 0, wxEXPAND)
sizer.Add(self.graph, 1, wxEXPAND)
self.SetSizer(sizer)
self.SetAutoLayout(true)
#self.graph.SetValue(0, 25)
#self.graph.SetValue(1, 50)
#self.graph.SetValue(2, 75)
#self.graph.SetValue(3, 100)
EVT_UPDATE_BARGRAPH(self, self.OnUpdate)
self.threads = []
self.threads.append(CalcBarThread(self, 0, 50))
self.threads.append(CalcBarThread(self, 1, 75))
self.threads.append(CalcBarThread(self, 2, 100))
self.threads.append(CalcBarThread(self, 3, 150))
self.threads.append(CalcBarThread(self, 4, 225))
self.threads.append(CalcBarThread(self, 5, 300))
self.threads.append(CalcBarThread(self, 6, 250))
self.threads.append(CalcBarThread(self, 7, 175))
for t in self.threads:
t.Start()
EVT_CLOSE(self, self.OnCloseWindow)
def OnUpdate(self, evt):
self.graph.SetValue(evt.barNum, evt.value)
self.graph.Refresh(false)
def OnCloseWindow(self, evt):
busy = wxBusyInfo("One moment please, waiting for threads to die...")
for t in self.threads:
t.Stop()
running = 1
while running:
running = 0
for t in self.threads:
running = running + t.IsRunning()
time.sleep(0.1)
self.Destroy()
#----------------------------------------------------------------------
def runTest(frame, nb, log):
win = TestFrame(frame, log)
frame.otherWin = win
win.Show(true)
return None
#----------------------------------------------------------------------
overview = """\
The main issue with multi-threaded GUI programming is the thread safty
of the GUI itself. On most platforms the GUI is not thread safe and
so any cross platform GUI Toolkit and applications written with it
need to take that into account.
The solution is to only allow interaction with the GUI from a single
thread, but this often severly limits what can be done in an
application and makes it difficult to use additional threads at all.
Since wxPython already makes extensive use of event handlers, it is a
logical extension to allow events to be sent to GUI objects from
alternate threads. A function called wxPostEvent allows you to do
this. It accepts an event and an event handler (window) and instead
of sending the event immediately in the current context like
ProcessEvent does, it processes it later from the context of the GUI
thread.
"""

View File

@@ -1,79 +0,0 @@
import string, sys
py2 = sys.version[0] == '2'
from wxPython.wx import *
try:
if py2:
from xml.parsers import expat
parsermodule = expat
else:
from xml.parsers import pyexpat
parsermodule = pyexpat
haveXML = true
except ImportError:
haveXML = false
#----------------------------------------------------------------------
if not haveXML:
def runTest(frame, nb, log):
dlg = wxMessageDialog(frame, 'This demo requires the XML package. '
'See http://www.python.org/sigs/xml-sig/',
'Sorry', wxOK | wxICON_INFORMATION)
dlg.ShowModal()
dlg.Destroy()
else:
class XMLTree(wxTreeCtrl):
def __init__(self, parent, ID):
wxTreeCtrl.__init__(self, parent, ID)
self.nodeStack = [self.AddRoot("Root")]
# Define a handler for start element events
def StartElement(self, name, attrs ):
if py2:
name = name.encode()
id = self.AppendItem(self.nodeStack[-1], name)
self.nodeStack.append(id)
def EndElement(self, name ):
self.nodeStack = self.nodeStack[:-1]
def CharacterData(self, data ):
if string.strip(data):
if py2:
data = data.encode()
self.AppendItem(self.nodeStack[-1], data)
def LoadTree(self, filename):
# Create a parser
Parser = parsermodule.ParserCreate()
# Tell the parser what the start element handler is
Parser.StartElementHandler = self.StartElement
Parser.EndElementHandler = self.EndElement
Parser.CharacterDataHandler = self.CharacterData
# Parse the XML File
ParserStatus = Parser.Parse(open(filename,'r').read(), 1)
def runTest(frame, nb, log):
win = XMLTree(nb, -1)
win.LoadTree("paper.xml")
return win
#----------------------------------------------------------------------
overview = """\
"""

View File

@@ -1 +0,0 @@
new.bmp.test

Binary file not shown.

Before

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 990 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 630 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

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