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

Applied patch [ 868061 ] Warning free OGL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-01-08 14:35:36 +00:00
parent 6c155d3387
commit 93210c68cb
12 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/src/ogl/basic.cpp
View File

@@ -276,7 +276,7 @@ wxShape::wxShape(wxShapeCanvas *can)
m_pen = g_oglBlackPen;
m_brush = wxWHITE_BRUSH;
m_font = g_oglNormalFont;
m_textColour = wxBLACK;
m_textColour = wxT("BLACK");
m_textColourName = wxT("BLACK");
m_visible = FALSE;
m_selected = FALSE;
@@ -753,8 +753,7 @@ int wxShape::GetFormatMode(int regionId) const
void wxShape::SetTextColour(const wxString& the_colour, int regionId)
{
wxColour *wxcolour = wxTheColourDatabase->FindColour(the_colour);
m_textColour = wxcolour;
m_textColour = wxTheColourDatabase->Find(the_colour);
m_textColourName = the_colour;
wxNode *node = m_regions.Item(regionId);
@@ -920,7 +919,7 @@ void wxShape::OnDrawContents(wxDC& dc)
wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();
if (region->GetFont()) dc.SetFont(* region->GetFont());
dc.SetTextForeground(* (region->GetActualColourObject()));
dc.SetTextForeground(region->GetActualColourObject());
dc.SetBackgroundMode(wxTRANSPARENT);
if (!m_formatted)
{