small change required for OLE component

[wxWidgets.git] / src / gtk / dcclient.cpp

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 4c19c24458ca8205c1a929f6a24244721a3eb3f5..2cdeb7137aeb68cd15223716cc8038c1110b810f 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -666,8 +666,6 @@ bool wxWindowDC::Blit( long xdest, long ydest, long width, long height,
     
         if ((bm_width != bm_ww) || (bm_height != bm_hh))
         {
-           printf( "scaling.\n" );
-       
             wxImage image( memDC->m_selected );
            image = image.Scale( bm_ww, bm_hh );
        
@@ -1038,8 +1036,21 @@ void wxWindowDC::SetLogicalFunction( int function )
     GdkFunction mode = GDK_COPY;
     switch (function)
     {
-        case wxXOR:    mode = GDK_INVERT; break;
-        case wxINVERT: mode = GDK_INVERT; break;
+        case wxXOR:          mode = GDK_INVERT; break;
+        case wxINVERT:       mode = GDK_INVERT; break;
+#if (GDK_MINOR_VERSION > 0)
+        case wxOR_REVERSE:   mode = GDK_OR_REVERSE; break;
+        case wxAND_REVERSE:  mode = GDK_AND_REVERSE; break;
+        case wxCLEAR:        mode = GDK_CLEAR; break;
+        case wxSET:          mode = GDK_SET; break;
+        case wxOR_INVERT:    mode = GDK_OR_INVERT; break;
+        case wxAND:          mode = GDK_AND; break;
+        case wxOR:           mode = GDK_OR; break;
+        case wxEQUIV:        mode = GDK_EQUIV; break;
+        case wxNAND:         mode = GDK_NAND; break;
+        case wxAND_INVERT:   mode = GDK_AND_INVERT; break;
+/*   ?   wxSRC_INVERT   GDK_AND_REVERSE, GDK_OR_REVERSE, GDK_OR_INVERT */
+#endif
         default:       break;
     }