wxGLCanvas works again

  added GTK 1.2 logical functions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2268 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 3a4c1a9a74a66b7b1cf79fc6799df2f744d4854f..2cdeb7137aeb68cd15223716cc8038c1110b810f 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1036,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;
     }
     

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 3a4c1a9a74a66b7b1cf79fc6799df2f744d4854f..2cdeb7137aeb68cd15223716cc8038c1110b810f 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1036,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;
     }
     

diff --git a/utils/glcanvas/gtk/glcanvas.cpp b/utils/glcanvas/gtk/glcanvas.cpp
index 91c919b2e43b39dbbac56332f17d215d35a6bc73..74b442c09690c180220afe5c80b07a8642ce3999 100644 (file)
--- a/utils/glcanvas/gtk/glcanvas.cpp
+++ b/utils/glcanvas/gtk/glcanvas.cpp
@@ -326,8 +326,7 @@ void wxGLCanvas::DoSetSize( int x, int y, int width, int height, int sizeFlags )
         if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
         if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
 
-        wxPoint pt( m_parent->GetClientAreaOrigin() );
-        gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x+pt.x, m_y+pt.y );
+        gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), m_widget, m_x, m_y );
 
         if ((old_width != m_width) || (old_height != m_height))
        {