Commit Graph

80 Commits

Author SHA1 Message Date
Vadim Zeitlin
10df406479 Revert changes to the drawing of the tree item buttons in the generic renderer.
This reverts r74887 as this created problems when drawing them at standard
size.

See #15526.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-10-17 22:28:29 +00:00
Vadim Zeitlin
bddab017c6 Improve drawing of the tree item buttons in the generic renderer.
Draw the "-" and "+" signs always properly centered.

Closes #15526.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-09-30 23:49:15 +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
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Vadim Zeitlin
7822ffb1de Add #if checks fixing minimal wxGTK build.
Check for functions availability before using them. This fixes compilation of
wxGTK with all features disabled.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-10 13:52:22 +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
5276b0a53c Use wxDELETE() and wxDELETEA() when possible.
Use wxDELETE[A]() functions which automatically NULL out their arguments after
deleting them instead of doing it manually.

Closes #9685.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-06-20 18:18:23 +00:00
Robert Roebling
5d947bc835 No-PCH compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-16 15:36:14 +00:00
Vadim Zeitlin
08043a1c27 Clip drawing in wxRendererGeneric::DrawHeaderButtonContents().
Clip drawing of the icon and bitmap to the header rectangle.

Don't clip the text because we already ellipsize it to avoid overflowing but
do the ellipsization correctly, using wxControl::Ellipsize() instead of the
simple (and wrong) duplicated version here.

Also correct and simplify the alignment calculations.

Closes #12047.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-15 11:15:09 +00:00
Vadim Zeitlin
78010a1f33 Don't change the current pen and brush in DrawHeaderButtonContents().
Renderer methods shouldn't affect the functions drawing on the DC after it but
the wxRendererGeneric implementation did.

Use wxDC{Pen,Brush}Changer classes instead of calling wxDC::Set{Pen,Brush}()
directly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-15 11:15:05 +00:00
Vadim Zeitlin
c93e68a85a Remove wxGTK-specific text shift in wxRenderer::DrawHeaderButtonContents().
This was probably related to the code removed by r63947 and doesn't seem to be
needed here neither (and could presumably result in the same problems as in
the ticket #11780).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-15 10:47:28 +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
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
c22ace4dff fix a couple of harmless warnings during wxOSX build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-06-18 22:54:21 +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
Kevin Ollivier
a2ee194587 Restore DrawRadioButton to the main wxRenderer API, create a method overload for the wxUniv API so that it can coexist with the wxUniv method of the same name.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-12 01:06:53 +00:00
Kevin Ollivier
b0b71b31c3 Assert if these methods are triggered to alert the user they are not implemented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-02-07 23:19:35 +00:00
Vadim Zeitlin
99c4be6806 rename wxRendererNative::DrawRadioButton() to DrawOptionButton() to avoid conflict with wxUniv function with the same name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-28 13:55:51 +00:00
Robert Roebling
eec49654fc draw icon before text label in header (huh?)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-22 14:40:35 +00:00
Robert Roebling
6f91f3a333 Further header button details
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-22 14:28:07 +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
Stefan Csomor
530a427a4c adaptions to new osx ouside the main trees
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-02 17:00:30 +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
Stefan Csomor
33ddeabab9 fixing file paths after renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-11 19:23:52 +00:00
Paul Cornett
04ee05f92a fix a huge number of build errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-17 18:26:00 +00:00
Stefan Csomor
9553702e46 mac cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-20 16:21:04 +00:00
Vadim Zeitlin
cae618d1d3 fix off by 1 pixel error in header drawing (patch 1819260)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-10-24 13:37:15 +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
Julian Smart
e2125bdc32 Mac fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-08-16 19:05:32 +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
Václav Slavík
47b378bd88 removed extra semicolons (patch #1700459; fixes compilation with gcc's -pedantic flag)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-14 09:58:37 +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
Robin Dunn
9c97f00622 Oops, file wasn't saved before last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-14 19:45:27 +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
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
dd05139a80 Include wx/gdicmn.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-19 20:18:46 +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
0164f8ebfd Improved wxDCPen/BrushChangers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-23 14:11:55 +00:00
Włodzimierz Skiba
4660e6acfc Introduced wxDCPenChanger and wxDCBrushChanger.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-22 14:25:35 +00:00
Włodzimierz Skiba
75d6ba569d Drawing fix for generic wxTreeCtrl.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-22 12:20:22 +00:00
Włodzimierz Skiba
da80ae712a Include wx/dc.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-05 22:58:39 +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
Vadim Zeitlin
784d240848 fixed unused param warning and code cleanup/simplification in DrawItemSelectionRect()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 18:00:52 +00:00
Robert Roebling
daebb44c74 Added wxRenderer method for drawing selection
rect if an item in a list has ben selected.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-26 10:48:52 +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
3061e2fb50 use wxDC::DrawCheckMark() to draw the checkbox button; also simplified the code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-19 01:20:42 +00:00
Włodzimierz Skiba
5c1f6b2752 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-18 19:37:10 +00:00