projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
show first item added with InsertItem() correctly (part of patch 833247)
[wxWidgets.git]
/
src
/
generic
/
renderg.cpp
diff --git
a/src/generic/renderg.cpp
b/src/generic/renderg.cpp
index 9e44ad6c5a77b851ba48609971785c21f57ec758..fdfb957f7c1109f1d4e461670bd293006c3eb3d5 100644
(file)
--- a/
src/generic/renderg.cpp
+++ b/
src/generic/renderg.cpp
@@
-218,13
+218,15
@@
wxRendererGeneric::DrawTreeItemButton(wxWindow * WXUNUSED(win),
// half of the length of the horz lines in "-" and "+"
const wxCoord halfWidth = rect.width/2 - 2;
dc.SetPen(*wxBLACK_PEN);
// half of the length of the horz lines in "-" and "+"
const wxCoord halfWidth = rect.width/2 - 2;
dc.SetPen(*wxBLACK_PEN);
- dc.DrawLine(xMiddle - halfWidth, yMiddle, xMiddle + halfWidth, yMiddle);
+ dc.DrawLine(xMiddle - halfWidth, yMiddle,
+ xMiddle + halfWidth + 1, yMiddle);
+
if ( !(flags & wxCONTROL_EXPANDED) )
{
// turn "-" into "+"
const wxCoord halfHeight = rect.height/2 - 2;
dc.DrawLine(xMiddle, yMiddle - halfHeight,
if ( !(flags & wxCONTROL_EXPANDED) )
{
// turn "-" into "+"
const wxCoord halfHeight = rect.height/2 - 2;
dc.DrawLine(xMiddle, yMiddle - halfHeight,
- xMiddle, yMiddle + halfHeight);
+ xMiddle, yMiddle + halfHeight
+ 1
);
}
}
}
}
@@
-239,16
+241,17
@@
wxRendererGeneric::GetSplitterParams(const wxWindow *win)
wxCoord sashWidth,
border;
wxCoord sashWidth,
border;
- if ( win->HasFlag(wxSP_3D) )
- {
+ if ( win->HasFlag(wxSP_3DSASH) )
sashWidth = 7;
sashWidth = 7;
- border = 2;
- }
+ else if ( win->HasFlag(wxSP_NOSASH) )
+ sashWidth = 0;
else // no 3D effect
else // no 3D effect
- {
sashWidth = 3;
sashWidth = 3;
+
+ if ( win->HasFlag(wxSP_3DBORDER) )
+ border = 2;
+ else // no 3D effect
border = 0;
border = 0;
- }
return wxSplitterRenderParams(sashWidth, border, false);
}
return wxSplitterRenderParams(sashWidth, border, false);
}
@@
-259,7
+262,7
@@
wxRendererGeneric::DrawSplitterBorder(wxWindow *win,
const wxRect& rectOrig,
int WXUNUSED(falgs))
{
const wxRect& rectOrig,
int WXUNUSED(falgs))
{
- if ( win->HasFlag(wxSP_3D) )
+ if ( win->HasFlag(wxSP_3D
BORDER
) )
{
wxRect rect = rectOrig;
DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
{
wxRect rect = rectOrig;
DrawShadedRect(dc, &rect, m_penDarkGrey, m_penHighlight);
@@
-302,34
+305,36
@@
wxRendererGeneric::DrawSplitterSash(wxWindow *win,
const wxCoord h = size.y;
wxCoord offset = 0;
const wxCoord h = size.y;
wxCoord offset = 0;
- // If we're not drawing the border, droppings will
- // be left unless we make the sash shorter
- if ( !win->HasFlag(wxSP_3DBORDER) )
+ // If we're drawing the border, draw the sash 3d lines shorter
+ if ( win->HasFlag(wxSP_3DBORDER) )
{
{
- offset =
3
;
+ offset =
1
;
}
}
- // from left to right
- if ( win->HasFlag(wxSP_3D) )
+ dc.SetPen(*wxTRANSPARENT_PEN);
+ dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
+
+ if ( win->HasFlag(wxSP_3DSASH) )
{
{
+ // Draw the 3D sash
+ dc.DrawRectangle(position + 2, 0, 3, h);
+
dc.SetPen(m_penLightGrey);
dc.SetPen(m_penLightGrey);
- dc.DrawLine(position,
1 + offset, position, h - 1
- offset);
+ dc.DrawLine(position,
offset, position, h
- offset);
dc.SetPen(m_penHighlight);
dc.SetPen(m_penHighlight);
- dc.DrawLine(position + 1, offset, position + 1, h - offset);
- }
+ dc.DrawLine(position + 1, 0, position + 1, h);
- dc.SetPen(*wxTRANSPARENT_PEN);
- dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)));
- dc.DrawRectangle(position + 2, offset, 3, h - 2*offset);
-
- if ( win->HasFlag(wxSP_3D) )
- {
dc.SetPen(m_penDarkGrey);
dc.SetPen(m_penDarkGrey);
- dc.DrawLine(position + 5,
offset, position + 5, h - offset
);
+ dc.DrawLine(position + 5,
0, position + 5, h
);
dc.SetPen(m_penBlack);
dc.SetPen(m_penBlack);
- dc.DrawLine(position + 6, offset, position + 6, h - 1 - offset);
+ dc.DrawLine(position + 6, offset, position + 6, h - offset);
+ }
+ else
+ {
+ // Draw a flat sash
+ dc.DrawRectangle(position, 0, 3, h);
}
}
}
}