Commit Graph

62 Commits

Author SHA1 Message Date
Vadim Zeitlin
c73b4312f9 compilation fix for wxUSE_STL=1 and mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-08-15 20:09:46 +00:00
Włodzimierz Skiba
92218ce600 [1231183] 'cleanup: mismatched indentation' and other cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-07-22 17:13:46 +00:00
Vadim Zeitlin
39dcd5151a don't draw edge around the bitmap for pseudo owner-drawn items, this doesn't look well
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 20:15:48 +00:00
Vadim Zeitlin
9ba4b498e3 VC6 (harmless) warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 18:55:49 +00:00
Vadim Zeitlin
810ca88256 support not-quite-owner-drawn mode when we draw only the bitmap and the system takes care of the rest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-06-07 18:28:48 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Dimitri Schoolwerth
767b35a56f applied patch #1185523: "Replace GetTextExtentPoint with GetTextExtentPoint32"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-17 16:03:25 +00:00
Julian Smart
8ee64db5c1 Fix for compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-20 10:35:51 +00:00
Vadim Zeitlin
51d2fa37c4 more visual improvements to owner-drawn menus (patch 1143785)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-19 17:25:37 +00:00
Julian Smart
271fa25083 Applied [ 1059554 ] patch for [1028659] fixes a couple of bugs with menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-12 10:42:00 +00:00
Kevin Hock
34621cc5d6 Documentation patch from Olly Betts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-22 19:11:07 +00:00
Włodzimierz Skiba
078cf5cb75 Source cleaning: -1/wxID_ANY/wxNOT_FOUND, ::, TRUE/true, FALSE/false, whitespaces, tabs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-31 12:38:46 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Vadim Zeitlin
7230716d7a patch 816178 and tons of other fixes to owner drawn bitmaps appearance; some code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-16 08:50:20 +00:00
Vadim Zeitlin
cb0bcdd65c don't draw raised border around disabled bitmaps (patch 814745)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-30 12:29:34 +00:00
Vadim Zeitlin
104032545e added wxOwnerDrawn::SetOwnerDrawn() and SetDisabledBitmap(); corrected calculation of menu width and drawing of accels for disabled items (parts of patch 758598)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-22 00:43:36 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Vadim Zeitlin
e87fb0ee85 added missing module.h include (bug 748158)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-06-03 13:19:21 +00:00
Julian Smart
b39dbf34b8 Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 19:16:45 +00:00
Julian Smart
c0cb30dc8f Applied patch [ 731656 ] Owner draw menu icons
Benjamin I. Williams


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-21 19:07:02 +00:00
Václav Slavík
a71b82dda9 compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-19 16:46:27 +00:00
Julian Smart
cfbf444a53 Applied updated patch [ 731719 ] Owner draw font leak/overuse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-04 17:12:58 +00:00
Julian Smart
19b4237945 Applied patch [ 731719 ] Owner draw font leak/overuse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-03 11:56:38 +00:00
Chris Elliott
2bdf715463 Macro swicth from SC to SYMANTEC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-02 11:21:03 +00:00
Julian Smart
6c9a19aaba Removed erroneous copyright names and corrected licence spelling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-03-17 11:23:28 +00:00
Vadim Zeitlin
4fa47e5643 compilation warning fixes (patch 651719)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-30 01:00:49 +00:00
Julian Smart
2a2a71e326 Applied patch [ 642172 ] Fix menu accelerators in ownerdrw
Fixed bug when updating menu text to inform the
ownerdrw code of the new menu accelerator attached to
the menu item.
Improved the layout of the owenerdrw menu ownerdrw to
correctly account for menu accelerators, submenu
arrows etc.

Scott Pleiter

(Note from JACS: I've also changed the sample to show the Quit item
correctly aligned; it needs to have the font set before wxWin knows
it's an ownerdrawn item.)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-09 10:15:00 +00:00
Vadim Zeitlin
d2ec53ea4a fix (?) for small menu item bitmaps (bug 635438)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-07 00:05:03 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Julian Smart
5ac7be7a9f Applied patch [ 592363 ] Owner Draw Round 2 fixes
This patch fixes the following items in the owner draw
code:

* When an item is disabled, yet highlighted, the code
will now retrieve the user's system settings for
greyed-out text and use that color. Previously, the
code had continued to print the disabled text with an
embossed effect, which looked bad when the item was
highlighted.

* Menu formatting, such as hot-key underlining
(example, "&Open"), has been fixed.

* Measurements and alignments with
accelerators/hot-keys has been fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-08 09:10:04 +00:00
Julian Smart
d9cf726bf3 Applied patch from Benjamin Williams to improve
wxMenu ownerdraw behaviour


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-04 19:03:56 +00:00
Vadim Zeitlin
f44b4495db fixed the selection rectangle drawing (was off by 1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-16 19:27:49 +00:00
Václav Slavík
136cb3c7a9 more MSLU fixes and moved MSLU stuff into separate file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-17 23:35:18 +00:00
Václav Slavík
dbc38199c0 more MSLU fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-15 19:42:01 +00:00
Václav Slavík
a756f21001 use the new wxSystemSettings API everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-08 23:53:01 +00:00
Kendall Bennett
19193a2c85 Mutiple updates from SciTech for wxWindows including the following:
1. Updates to HTML applet classes in client side include syntax
2. Updates to wxUniversal for OS/2
3. Updates for better palette management on Windows
4. Misc other fixes and changes to fix build system for Watcom 11.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-17 22:25:56 +00:00
Vadim Zeitlin
6d5b2a57cf tried to fix the accel string drawing in the owner drawn menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-05-21 23:58:58 +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
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
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
Julian Smart
5100cabffa Added wxHelpControllerHelpProvider, added DisplayContextPopup, DisplayTextPopup
to wxHelpControllerBase and wxCHMHelpController; updated sample


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-09-12 14:53:39 +00:00
George Tasker
ff0ea71cea Changed code to allow for removal of the #include <windows.h> from wxprec.h for windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-01-18 12:29:32 +00:00
Guillermo Rodriguez Garcia
1b24a68eba Added #if wxUSE_OWNER_DRAWN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-12-16 14:53:07 +00:00
Vadim Zeitlin
07cf98cb8e 1. undid my wrong fix to wxWindowBase::Centre
2. corrected fatal bug in wxCheckLstBox (double deletion of items)
3. wxTextCtrl::SetValue() only does it if the new text is different from
   the old one
4. wxBitmap(const wxIcon&) ctor added
5. compilation fixes for VC++ and generic Win32 implementation of
   wxGetCurrentTime() in timercmn.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-11-13 00:30:45 +00:00
Julian Smart
0cdf89abb1 More Watcom C++ compilation stuff
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-24 13:07:26 +00:00
Karsten Ballüder
223d09f6b5 replaced T() makro with wxT() due to namespace probs, _T() exists, too
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-08 14:35:56 +00:00
Vadim Zeitlin
e90c1d2a19 many changes; major ones:
1. start of !wxUSE_GUI support
2. _T() macro renamed to T()
3. wxConvertWX2MB and MB2WX macro added


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-10-04 20:15:38 +00:00
Unknown (MT)
ebb206a33d blit using icon mask
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-09-13 07:13:52 +00:00
Julian Smart
c7527e3f21 wxBook additions; added a couple of pixels in menu drawing; taskbar
PopupMenu improvements


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-08-12 20:18:18 +00:00