Update to wx3.0, add SSE optimizations based on target_cpu, fix compile warnings

[ctsim.git] / libctgraphics / sgp.cpp

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index ffb26b8486fa1c590a47f8fd739df183339ae7e4..21aa0a650f3e4d24c8f20f7846c4c9c2198b1be9 100644 (file)
--- a/libctgraphics/sgp.cpp
+++ b/libctgraphics/sgp.cpp
@@ -359,7 +359,7 @@ SGP::setRasterOp (int ro)
 {
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
-    int wxFxn = -1;
+    wxRasterOperationMode wxFxn = wxSET;
     switch (ro) {
     case RO_AND:
       wxFxn = wxAND;
@@ -410,8 +410,7 @@ SGP::setRasterOp (int ro)
       wxFxn = wxXOR;
       break;
     }
-    if (wxFxn >= 0)
-      m_driver.idWX()->SetLogicalFunction (wxFxn);
+    m_driver.idWX()->SetLogicalFunction (wxFxn);
   }
 #endif
 }