Commit Graph

94 Commits

Author SHA1 Message Date
Vadim Zeitlin
b6be374d72 Move DSS_HIDEPREFIX fallback definition to the central header.
Do it only once now that it's used in 3 different places (it recently started
to be used in src/msw/anybutton.cpp as well) instead of defining it thrice.

This also fixes MinGW build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-18 23:36:34 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Vadim Zeitlin
017dc06b50 Use wxString::t_str() in calls to Windows API functions in wxMSW.
Use t_str() instead of wx_str() to make the code work correctly in UTF-8 build
in which wx_str() returns a pointer to UTF-8 buffer while we need a wchar_t
pointer for Windows.

Closes #14371.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-03 19:16:59 +00:00
Vadim Zeitlin
c9980eb871 Another compilation fix for wxMSW without PCH.
Need to include <commctrl.h> as we use HIMAGELIST and related functions now.

See #11595.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-26 12:33:01 +00:00
Vadim Zeitlin
85ee88cd53 Improve wxCheckListBox appearance under Vista/Win7.
Fix the items alignment and also code cleanup: fix indentation, remove magic
numbers &c.

Closes #10286.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-23 13:22:00 +00:00
Vadim Zeitlin
98fbab9e7b Refactor owner-drawing code.
Only keep common code in the base class and extract all menu/listbox-specific
stuff into derived classes.

This makes the code cleaner and more maintainable but introduces some problems
in wxCheckListBox appearance which will be fixed by the next patch.

Closes #10635.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-01-23 13:21:12 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Paul Cornett
ab0c29ae95 draw focus rect for wxCheckListBox item
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-06 16:04:20 +00:00
Paul Cornett
6efda5fda4 fix off-by-one size of wxCheckListBox item draw rect
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-06 15:51:09 +00:00
Vadim Zeitlin
29cd57f79b use margin width after updating it in OnMeasureItem() (see #10452)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-31 18:20:58 +00:00
Vadim Zeitlin
d247a50d45 include missing header (wx/msw/wrapcctl.h) for PCH-less build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-26 10:30:25 +00:00
Vadim Zeitlin
0a1f778483 add wxDrawStateBitmap() (closes #10289)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-25 14:38:44 +00:00
Vadim Zeitlin
e328b97245 extract wrapper for SystemParametersInfo(SPI_GETNONCLIENTMETRICS) in a header so that it could be reused from elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 13:26:45 +00:00
Vadim Zeitlin
74052fe83b added more includes of wx/msw/dc.h needed since r52054 for wxMSW compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-25 02:13:36 +00:00
Vadim Zeitlin
67c5dabb64 fix assert when using owner-drawn menu items with the newest (Vista) SDK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-26 01:34:00 +00:00
Vadim Zeitlin
fb582e40cc initialize wxMSWSystemMenuFontModule stuff on demand only, there is no need to create menu font if we never use owner-drawn menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-07 19:04:45 +00:00
Vadim Zeitlin
55e04bbd7e adjust the minimal menu item height to be lesser than the menubar height; some code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-07 18:50:07 +00:00
Robert Roebling
888dde65f4 DC reorganization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-30 13:48:22 +00:00
Paul Cornett
36866abca3 build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 18:45:11 +00:00
Václav Slavík
c9f7896861 first phase of transition to unified Unicode build:
1. changed c_str() to return wxCStrData (implicitly convertible to wxChar*)
2. added template type-safe wrappers for vararg functions
3. added wxUniChar class representing single Unicode character
4. changed wxString::operator[] and wxString::iterator to return wxUniChar


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-17 10:26:10 +00:00
Vadim Zeitlin
4d1f840337 added wx/image.h to fix non-PCH compilation after last commit (patch 1635649)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-15 10:54:40 +00:00
Vadim Zeitlin
0d3997fd6d corrected drawing of the bitmaps for the disabled menu items (replaces patch 1632891, closes bug 1632888)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-01-14 20:59:17 +00:00
Vadim Zeitlin
5d7eebb6b2 use SelectObjectAsSource when we don't need to modify the bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-31 14:44:37 +00:00
Włodzimierz Skiba
02761f6cd4 Include wx/module.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-31 19:31:43 +00:00
Włodzimierz Skiba
25466131ac Include wx/menuitem.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-19 07:12:50 +00:00
Włodzimierz Skiba
9eddec696f Include wx/settings.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-24 07:16:32 +00:00
Włodzimierz Skiba
f38924e863 Include wx/dcmemory.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-08 07:58:37 +00:00
Michael Wetherell
8d7eaf9140 Warning fixes for VC5 (Igor Korot)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-12 12:16:56 +00:00
Julian Smart
3f5c62f982 Reverted semicolons patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:45:41 +00:00
Julian Smart
edef87c827 Applied patch [ 1399013 ] More removals of extraneous semicolons
Wlodek Szafran


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 11:46:53 +00:00
Vadim Zeitlin
4e47fd5a1b replaced gs_menuItems hack with a wxOwnerDrawn::m_isMenuItem field
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:43:35 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
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