Merge changes from Debian Med packaging of 5.2.0-4

[ctsim.git] / libctgraphics / sgp.cpp

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index ffb26b8486fa1c590a47f8fd739df183339ae7e4..feedcbbf9b699fcff549f2320dc079ba24ddef3c 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;
     switch (ro) {
     case RO_AND:
       wxFxn = wxAND;
@@ -409,9 +409,10 @@ SGP::setRasterOp (int ro)
     case RO_XOR:
       wxFxn = wxXOR;
       break;
+    default:
+      return;
     }
-    if (wxFxn >= 0)
-      m_driver.idWX()->SetLogicalFunction (wxFxn);
+    m_driver.idWX()->SetLogicalFunction (wxFxn);
   }
 #endif
 }