Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
55,860 Commits 1 Branch 330 Tags
226fa6db3dc88370446602fd7490a8890305ffd3
Commit Graph

70 Commits

Author SHA1 Message Date
Vadim Zeitlin
252255e852 Fix DrawChoice() behaviour in wxRendererXP. 
The implementation of wxRendererXP::DrawChoice() inadvertently used
wxRendererMSW::DrawComboBoxDropButton() and so drew the button in the classic
and not themed style.

Fix this by defining DrawChoice() in the base wxRendererMSWBase class and
reusing it in wxRendererXP via inheritance and not composition.

Closes #14337.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-05-26 12:29:46 +00:00
Dimitri Schoolwerth
07968bbdc5 Fixed drawing a check box in the undetermined state for non-themed MSW apps. 
wxRendererMSW::DoDrawFrameControl (used for systems prior to XP or when theming is disabled) didn't check for the wxCONTROL_UNDETERMINED flag yet. Set the appropriate styles when the flag is used to fix drawing check boxes in their third state (as used in for example the treelist sample).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-08-29 16:06:32 +00:00
Vadim Zeitlin
53d4bdbc15 Add wxDCImpl::MSWApplyGDIPlusTransform() to formalize wxRendererMSW hack. 
Replace the dynamic_cast<> used in wxMSW wxRenderer implementation code with a
virtual function call.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-07-07 13:05:22 +00:00
Robin Dunn
066bd25191 When we're using GDI+, the DC might have transforms applied to it, but the renderer APIs don't respect them. So we need to apply the transforms to the rect ourselves. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2011-05-05 17:56:18 +00:00
Václav Slavík
9aebcb5e44 Add wxRenderer::GetHeaderButtonMargin(). 
Used for best size calculations of column width.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-10-30 15:57:32 +00:00
Vadim Zeitlin
526954c596 Globally use "wxWindows licence" consistently. 
Use "wxWindows licence" and not "wxWidgets licence" (the latter doesn't
exist) and consistently spell "licence" using British spelling.

See #12165.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2010-07-13 13:29:13 +00:00
Vadim Zeitlin
b50d93d1da Added wxRendererNative::DrawTitleBarBitmap(). 
This is currently only implemented for wxMSW as there is no advantage to use a
generic implementation compared to using wxArtProvider directly under the
other ports. But for MSW this allows to have perfectly natively looking
titlebar-like buttons.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-05 22:57:04 +00:00
Vadim Zeitlin
942d5e2d72 Replaced GraphicsHDC from src/msw/renderer.cpp with wxDC::GetTempHDC(). 
wxDC::GetTempHDC() method provides a convenient and safe way to retrieve HDC
from a wxDC object, whether it is using GDI or GDI+. It is implemented using
(MSW-specific) virtual functions in wxDC and so doesn't need ugly hacks like
wxDynamicCast which were used in src/msw/renderer.cpp to achieve the same
effect.

Also, we now use GetTempHDC() consistently in all wxMSW rendering methods as
the old GraphicsHDC was only used in some of them meaning that many methods
didn't work at all with wxGCDC.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-05 22:56:58 +00:00
Vadim Zeitlin
6c9aaf7d0c Refactor wxRendererXP button drawing methods. 
Avoid code duplication in wxRendererXP as well and fix a bug in
DrawRadioBitmap() which incorrectly drew it in hot state when it was disabled
but wxCONTROL_CURRENT was specified.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-05 22:56:52 +00:00
Vadim Zeitlin
081b33427e Implement wxRenderer::DrawRadioBitmap() for classic MSW renderer. 
Clean up the functions added in r57313:
- Versions using wxUxThemeEngine should be in wxRendererXP
- Provide implementation using DrawFrameControl() in wxRendererMSW too
- Refactor the code to avoid triplication in wxRendererMSW

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-10-05 22:56:48 +00:00
Vadim Zeitlin
6e6b532c1a Rename wxRendererNative::DrawRadioButton() to DrawRadioBitmap(). 
This old name function conflicted with the one in wxRenderer in wxUniv and
also was misleading as this function draws only a bitmap and not the entire
wxRadioButton control.

The old workaround for the warnings about the function names conflict was ugly
and unmaintainable, as proven by the fact that wxRenderer method signature
already became different from the wxRendererNative one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-08-20 00:44:22 +00:00
Vadim Zeitlin
5aac6f3f95 remove MSVC warnings about DLL-exported class inheriting from non DLL-exported one by not exporting private classes at all 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-11 13:16:45 +00:00
Francesco Montorsi
de4bf0b305 improve look of wxDataViewCtrl and of its renderer on wxMSW when windows XP themeing is not used (wxRendererXP::DrawItemSelectionRect implementation is ok also for wxRendererMSW; share the code). 
Fix a typo in the drawing code for horizontal rules in wxDataViewCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-05 00:36:17 +00:00
Francesco Montorsi
191e43fd02 revert r59246; the window parameter was there by purpose (i.e. for consistency with other Get* methods -- even if unused); document what the win parameter does in the various wxRenderer::Get* methods 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-02 20:09:10 +00:00
Francesco Montorsi
92c32bbee7 deprecated GetCheckBoxSize(wxWindow *) in favour of GetCheckBoxSize() const (the window parameter was unused and not documented) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-03-01 16:46:49 +00:00
Vadim Zeitlin
c0c133e13b add wx-prefixed and semicolon-requiring versions of DECLARE_NO_{COPY,ASSIGN}_CLASS macros 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2009-02-08 11:45:59 +00:00
Vadim Zeitlin
7280c8281d compilation fix after latest changes (missing header) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-14 20:27:35 +00:00
Kevin Ollivier
97bd2a50f5 Hopefully the right fix this time. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-13 20:46:47 +00:00
Kevin Ollivier
cc9370b7e4 HDC() fix was wrong, may have been just a problem with mismatched parens. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-13 20:11:31 +00:00
Kevin Ollivier
509675f86b MSW compile fixes. 
M    src/msw/renderer.cpp


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-13 18:23:39 +00:00
Kevin Ollivier
e413198572 Forward port new wxRenderer methods in 2.8 to trunk. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-12-13 17:36:27 +00:00
Vadim Zeitlin
e8759560f8 add wxRenderer::GetCheckBoxSize(); refactor wxGTK code to avoid duplication (#9642) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-08-02 21:51:22 +00:00
Vadim Zeitlin
025f7d775c don't include wx/msw/dc.h from wx/msw/private.h, this results in circular inclusion of wx/stream.h from wx/filefn.h before wxFileOffset is defined which results in compilation errors under WinCE and is bad/confusing anyhow 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2008-02-24 22:32:23 +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
Robert Roebling
4cda739ce4 Use BTNFACE colour for rendering selected item when widget is unfocussed 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-20 10:33:32 +00:00
Robert Roebling
ce0cf2b871 Make wxRenderer::DrawItemSelectionRect() draw a focus outline of wxCONTROL_CURRENT and wxCONTROL_FOCUSED is given, blind patch for wxMac 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-17 20:57:01 +00:00
Vadim Zeitlin
11fa6e636b initialize all fields of WINDOWPOS struct to avoid mingw32 warnings 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-10-02 17:34:30 +00:00
Vadim Zeitlin
a268f4b734 don't use NULL when we mean 0 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-16 23:40:08 +00:00
Vadim Zeitlin
51c42fc50a don't use GetThemeMetric(HP_HEADERITEM, TMT_HEIGHT) as it doesn't seem to work; implement GetHeaderButtonHeight() in wxRendererMSW instead of doing it in wxRendererXP using HDM_LAYOUT; added test for this renderer method to the sample 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48535 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-09-03 21:50:28 +00:00
Julian Smart
6d78998725 Added DrawFocusRect to wxRenderer 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-08-16 12:15:15 +00:00
Vadim Zeitlin
d6f2a8911e many compilation fixes for WinCE using VC8 (it now build, although still doesn't work) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-07-27 16:34:24 +00:00
Vadim Zeitlin
46bd197877 use wxCopyRectToRECT() instead of duplicating its code (patch 1707294) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45649 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-26 01:26:46 +00:00
Vadim Zeitlin
8a46124968 added new wxCONTROL_FLAT bit (see discussion of patch 1691478) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-16 01:22:46 +00:00
Vadim Zeitlin
59ee63e934 implement DrawCheckBox() in class Win32 renderer (modified patch 1691478) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-04-16 00:51:31 +00:00
Vadim Zeitlin
f4322df68b no changes, just removed TABs/trailing spaces 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-03-07 22:56:34 +00:00
Robert Roebling
a9fdf82418 Minor parts from FM's wxDataViewCtrl patch. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2007-02-17 11:35:58 +00:00
Robin Dunn
c97c995223 Return optimal label width from DrawHeaderButton 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-11-30 23:44:55 +00:00
Vadim Zeitlin
4614c8e528 include wx/msw/private.h before wx/msw/uxtheme.h for consistency with other headers (it's not needed, strictly speaking, as uxtheme.h now includes it itself anyhow, but it's more clear like this) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-30 15:41:58 +00:00
Vadim Zeitlin
844b9f5fd2 corrected last commit: Inflate() should be Deflate() 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 16:30:54 +00:00
Vadim Zeitlin
f2ea42557b add support for wxCONTROL_ISDEFAULT to wxRendererMSW::DrawPushButton() (modified patch 1572887) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-10-08 15:49:52 +00:00
Robin Dunn
80752b57a9 As per wx-dev, split the sort arrow options out to a separate parameter. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-14 19:42:41 +00:00
Robin Dunn
4b94ddc44c More support for drawing native column headers, adds more states 
(selected, mouse-over) and also optionally drawing the contents of the
header (label and/or bitmap, sort arrow) in a consistent way.  Also
added a method to determine the default height of the column header.
This is based on work done for OSAF.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-09-13 20:28:43 +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
90b903c263 Renamed DrawCheckButton due to conflict with existing and public api of wxUniversal port. 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-30 23:54:26 +00:00
Robert Roebling
2209baaee3 Committed Jaako's renderer patch 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-24 16:57:27 +00:00
Vadim Zeitlin
9f93b45e59 implemented DrawCheckButton() for XP renderer; code cleanup 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-04-19 02:15:30 +00:00
Julian Smart
a9d9e2f262 Applied patch [ 1389709 ] XP theme support for DrawHeaderButton, DrawTreeItemButton 
By Chris Mellon


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2006-01-17 15:41:26 +00:00
Julian Smart
404914c6f6 Include settings.h 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-17 23:40:01 +00:00
Julian Smart
fe404d1afc Applied [ 1294048 ] [wxMSW] Correct splitter sash drawing on XP 
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-09-17 20:34:53 +00:00
Julian Smart
84c62b4f52 Guess settings for reasonable behaviour in all 3 standard XP themes 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2005-05-17 13:23:51 +00:00