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

Fix for BadMatch problems on SGI.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2000-07-06 13:40:49 +00:00
parent faf08d09e2
commit 97b0241cf2
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/dcclient.cpp
View File

@@ -122,7 +122,11 @@ enum wxPoolGCType
wxTEXT_COLOUR, wxTEXT_COLOUR,
wxBG_COLOUR, wxBG_COLOUR,
wxPEN_COLOUR, wxPEN_COLOUR,
wxBRUSH_COLOUR wxBRUSH_COLOUR,
wxTEXT_SCREEN,
wxBG_SCREEN,
wxPEN_SCREEN,
wxBRUSH_SCREEN
}; };
struct wxGC struct wxGC
@@ -267,6 +271,14 @@ void wxWindowDC::SetUpDC()
wxASSERT_MSG( !m_penGC, wxT("GCs already created") ); wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
if (m_isScreenDC)
{
m_penGC = wxGetPoolGC( m_window, wxPEN_SCREEN );
m_brushGC = wxGetPoolGC( m_window, wxBRUSH_SCREEN );
m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
}
else
if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1)) if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1))
{ {
m_penGC = wxGetPoolGC( m_window, wxPEN_MONO ); m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );

14
src/gtk1/dcclient.cpp
View File

@@ -122,7 +122,11 @@ enum wxPoolGCType
wxTEXT_COLOUR, wxTEXT_COLOUR,
wxBG_COLOUR, wxBG_COLOUR,
wxPEN_COLOUR, wxPEN_COLOUR,
wxBRUSH_COLOUR wxBRUSH_COLOUR,
wxTEXT_SCREEN,
wxBG_SCREEN,
wxPEN_SCREEN,
wxBRUSH_SCREEN
}; };
struct wxGC struct wxGC
@@ -267,6 +271,14 @@ void wxWindowDC::SetUpDC()
wxASSERT_MSG( !m_penGC, wxT("GCs already created") ); wxASSERT_MSG( !m_penGC, wxT("GCs already created") );
if (m_isScreenDC)
{
m_penGC = wxGetPoolGC( m_window, wxPEN_SCREEN );
m_brushGC = wxGetPoolGC( m_window, wxBRUSH_SCREEN );
m_textGC = wxGetPoolGC( m_window, wxTEXT_SCREEN );
m_bgGC = wxGetPoolGC( m_window, wxBG_SCREEN );
}
else
if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1)) if (m_isMemDC && (((wxMemoryDC*)this)->m_selected.GetDepth() == 1))
{ {
m_penGC = wxGetPoolGC( m_window, wxPEN_MONO ); m_penGC = wxGetPoolGC( m_window, wxPEN_MONO );