Commit Graph

9035 Commits

Author SHA1 Message Date
Gilles Depeyrot
a8562f5520 applied SourceForge patch #423536
removed obsolete xpm handling code
corrections after wxUniv merge


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


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


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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 11:55:33 +00:00
Stefan Csomor
ba7eb0a5a7 no message
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 06:01:57 +00:00
Vadim Zeitlin
e421922f90 MSW compilation fixes - widgets sample runs!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-27 00:27:24 +00:00
Vadim Zeitlin
29149a6491 compilation fixes - wxGTK compiles but not links
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 21:29:16 +00:00
Vadim Zeitlin
21aeca5e54 another file added on univ branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 21:09:16 +00:00
Vadim Zeitlin
32b8ec418a added more files (unchanged) from wxUniv branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 21:05:06 +00:00
Vadim Zeitlin
1e6feb95a7 first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 20:59:19 +00:00
Stefan Csomor
aeb313f31c forced redraw before scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 18:47:51 +00:00
Stefan Csomor
9714ffa0c4 added tiered implementation (using draw paragraph) for stattext, corrected scrollbar paging, forced redraw before scrolling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 18:45:16 +00:00
Stefan Csomor
0c05747a9d added tiered implementation (using draw paragraph)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 18:41:02 +00:00
Vadim Zeitlin
e446cd6783 reverting accidental commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 17:31:54 +00:00
Vadim Zeitlin
b6ca231f85 no changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:08:16 +00:00
Vadim Zeitlin
544421165f use GetText() instead of GetText(wxString&), made some methods inline
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:08:03 +00:00
Vadim Zeitlin
6b1a0f7a66 testing merging with -kk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-26 16:03:48 +00:00
Robin Dunn
60be92e035 removed debug code that got left in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-25 23:51:23 +00:00
Robin Dunn
6a1836a0a4 some fixes and a new mixin class added to the library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-06-25 23:46:28 +00:00