don't use ROPs for drawing the text for wxMSW compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
c0043a5066
commit
72174350ae
@ -1260,7 +1260,12 @@ void wxWindowDC::SetLogicalFunction( int function )
|
||||
{
|
||||
wxCHECK_RET( Ok(), wxT("invalid window dc") );
|
||||
|
||||
if (m_logicalFunction == function) return;
|
||||
if (m_logicalFunction == function)
|
||||
return;
|
||||
|
||||
// VZ: shouldn't this be a CHECK?
|
||||
if (!m_window)
|
||||
return;
|
||||
|
||||
GdkFunction mode = GDK_COPY;
|
||||
switch (function)
|
||||
@ -1294,11 +1299,12 @@ void wxWindowDC::SetLogicalFunction( int function )
|
||||
|
||||
m_logicalFunction = function;
|
||||
|
||||
if (!m_window) return;
|
||||
|
||||
gdk_gc_set_function( m_penGC, mode );
|
||||
gdk_gc_set_function( m_brushGC, mode );
|
||||
gdk_gc_set_function( m_textGC, mode );
|
||||
|
||||
// to stay compatible with wxMSW, we don't apply ROPs to the text
|
||||
// operations (i.e. DrawText/DrawRotatedText)
|
||||
// gdk_gc_set_function( m_textGC, mode );
|
||||
}
|
||||
|
||||
void wxWindowDC::SetTextForeground( const wxColour &col )
|
||||
|
@ -1260,7 +1260,12 @@ void wxWindowDC::SetLogicalFunction( int function )
|
||||
{
|
||||
wxCHECK_RET( Ok(), wxT("invalid window dc") );
|
||||
|
||||
if (m_logicalFunction == function) return;
|
||||
if (m_logicalFunction == function)
|
||||
return;
|
||||
|
||||
// VZ: shouldn't this be a CHECK?
|
||||
if (!m_window)
|
||||
return;
|
||||
|
||||
GdkFunction mode = GDK_COPY;
|
||||
switch (function)
|
||||
@ -1294,11 +1299,12 @@ void wxWindowDC::SetLogicalFunction( int function )
|
||||
|
||||
m_logicalFunction = function;
|
||||
|
||||
if (!m_window) return;
|
||||
|
||||
gdk_gc_set_function( m_penGC, mode );
|
||||
gdk_gc_set_function( m_brushGC, mode );
|
||||
gdk_gc_set_function( m_textGC, mode );
|
||||
|
||||
// to stay compatible with wxMSW, we don't apply ROPs to the text
|
||||
// operations (i.e. DrawText/DrawRotatedText)
|
||||
// gdk_gc_set_function( m_textGC, mode );
|
||||
}
|
||||
|
||||
void wxWindowDC::SetTextForeground( const wxColour &col )
|
||||
|
Loading…
Reference in New Issue
Block a user