Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sorry folks, a lot of changes to remedy GetFont, GetBrush etc.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-08 23:26:18 +00:00
parent c18ecb1164
commit c0ed460c2e
106 changed files with 535 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/ogl/src/basic.cpp
View File

@@ -605,7 +605,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
wxShapeRegion *region = (wxShapeRegion *)node->Data();
region->SetText(s);
dc.SetFont(region->GetFont());
dc.SetFont(* region->GetFont());
region->GetSize(&w, &h);
@@ -919,10 +919,10 @@ void wxShape::OnDrawContents(wxDC& dc)
GetBoundingBoxMin(&bound_x, &bound_y);
if (m_regions.Number() < 1) return;
if (m_pen) dc.SetPen(m_pen);
if (m_pen) dc.SetPen(* m_pen);
wxShapeRegion *region = (wxShapeRegion *)m_regions.First()->Data();
if (region->GetFont()) dc.SetFont(region->GetFont());
if (region->GetFont()) dc.SetFont(* region->GetFont());
dc.SetTextForeground(* (region->GetActualColourObject()));
dc.SetBackgroundMode(wxTRANSPARENT);
@@ -988,8 +988,8 @@ void wxShape::OnEraseContents(wxDC& dc)
if (m_pen)
penWidth = m_pen->GetWidth();
dc.SetPen(g_oglWhiteBackgroundPen);
dc.SetBrush(g_oglWhiteBackgroundBrush);
dc.SetPen(* g_oglWhiteBackgroundPen);
dc.SetBrush(* g_oglWhiteBackgroundBrush);
dc.DrawRectangle(WXROUND(topLeftX - penWidth), WXROUND(topLeftY - penWidth),
WXROUND(maxX + penWidth*2.0 + 4.0), WXROUND(maxY + penWidth*2.0 + 4.0));
}
@@ -2535,8 +2535,8 @@ void wxShape::OnDrawControlPoints(wxDC& dc)
if (!m_drawHandles)
return;
dc.SetBrush(wxBLACK_BRUSH);
dc.SetPen(wxBLACK_PEN);
dc.SetBrush(* wxBLACK_BRUSH);
dc.SetPen(* wxBLACK_PEN);
wxNode *node = m_controlPoints.First();
while (node)