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

fixed GTK2-only bug in SetLogicalFunction()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-11-06 15:20:47 +00:00
parent 20ea7ff9d7
commit 53630547cf
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gtk/dcclient.cpp
View File

@@ -1852,7 +1852,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash ); gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
} }
} }
#endif #endif // GTK+ > 1.0
GdkCapStyle capStyle = GDK_CAP_ROUND; GdkCapStyle capStyle = GDK_CAP_ROUND;
switch (m_pen.GetCap()) switch (m_pen.GetCap())
@@ -1991,12 +1991,12 @@ void wxWindowDC::SetLogicalFunction( int function )
if (!m_window) if (!m_window)
return; return;
GdkFunction mode = GDK_COPY; GdkFunction mode;
switch (function) switch (function)
{ {
case wxXOR: mode = GDK_XOR; break; case wxXOR: mode = GDK_XOR; break;
case wxINVERT: mode = GDK_INVERT; break; case wxINVERT: mode = GDK_INVERT; break;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)
case wxOR_REVERSE: mode = GDK_OR_REVERSE; break; case wxOR_REVERSE: mode = GDK_OR_REVERSE; break;
case wxAND_REVERSE: mode = GDK_AND_REVERSE; break; case wxAND_REVERSE: mode = GDK_AND_REVERSE; break;
case wxCLEAR: mode = GDK_CLEAR; break; case wxCLEAR: mode = GDK_CLEAR; break;
@@ -2013,12 +2013,10 @@ void wxWindowDC::SetLogicalFunction( int function )
// unsupported by GTK // unsupported by GTK
case wxNOR: mode = GDK_COPY; break; case wxNOR: mode = GDK_COPY; break;
#endif #endif // GTK+ > 1.0
default: default:
{
wxFAIL_MSG( wxT("unsupported logical function") ); wxFAIL_MSG( wxT("unsupported logical function") );
break; mode = GDK_COPY;
}
} }
m_logicalFunction = function; m_logicalFunction = function;

12
src/gtk1/dcclient.cpp
View File

@@ -1852,7 +1852,7 @@ void wxWindowDC::SetPen( const wxPen &pen )
gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash ); gdk_gc_set_dashes( m_penGC, 0, (wxGTKDash*)req_dash, req_nb_dash );
} }
} }
#endif #endif // GTK+ > 1.0
GdkCapStyle capStyle = GDK_CAP_ROUND; GdkCapStyle capStyle = GDK_CAP_ROUND;
switch (m_pen.GetCap()) switch (m_pen.GetCap())
@@ -1991,12 +1991,12 @@ void wxWindowDC::SetLogicalFunction( int function )
if (!m_window) if (!m_window)
return; return;
GdkFunction mode = GDK_COPY; GdkFunction mode;
switch (function) switch (function)
{ {
case wxXOR: mode = GDK_XOR; break; case wxXOR: mode = GDK_XOR; break;
case wxINVERT: mode = GDK_INVERT; break; case wxINVERT: mode = GDK_INVERT; break;
#if (GTK_MINOR_VERSION > 0) #if (GTK_MINOR_VERSION > 0) || (GTK_MAJOR_VERSION > 1)
case wxOR_REVERSE: mode = GDK_OR_REVERSE; break; case wxOR_REVERSE: mode = GDK_OR_REVERSE; break;
case wxAND_REVERSE: mode = GDK_AND_REVERSE; break; case wxAND_REVERSE: mode = GDK_AND_REVERSE; break;
case wxCLEAR: mode = GDK_CLEAR; break; case wxCLEAR: mode = GDK_CLEAR; break;
@@ -2013,12 +2013,10 @@ void wxWindowDC::SetLogicalFunction( int function )
// unsupported by GTK // unsupported by GTK
case wxNOR: mode = GDK_COPY; break; case wxNOR: mode = GDK_COPY; break;
#endif #endif // GTK+ > 1.0
default: default:
{
wxFAIL_MSG( wxT("unsupported logical function") ); wxFAIL_MSG( wxT("unsupported logical function") );
break; mode = GDK_COPY;
}
} }
m_logicalFunction = function; m_logicalFunction = function;