typo fixed: should be lpthread, not -lpthread in THREAD_OPTS

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index d09ae2499268987d980d7276fa6872b84acf0711..073a4eb0d4e1a874441fc778be81fa0439d51010 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -28,6 +28,7 @@
 void wxSetIconsX11( WXDisplay* display, WXWindow window,
                     const wxIconBundle& ib )
 {
 void wxSetIconsX11( WXDisplay* display, WXWindow window,
                     const wxIconBundle& ib )
 {

+#if !wxUSE_NANOX

     size_t size = 0;
     size_t i, max = ib.m_icons.GetCount();
 
     size_t size = 0;
     size_t i, max = ib.m_icons.GetCount();
 


@@ -58,6 +59,12 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
                 gMask = image.GetMaskGreen();
                 bMask = image.GetMaskBlue();
             }
                 gMask = image.GetMaskGreen();
                 bMask = image.GetMaskBlue();
             }

+            else // no mask, but still init the variables to avoid warnings
+            {
+                rMask =
+                gMask =
+                bMask = 0;
+            }

 
             *ptr++ = width;
             *ptr++ = height;
 
             *ptr++ = width;
             *ptr++ = height;


@@ -91,6 +98,7 @@ void wxSetIconsX11( WXDisplay* display, WXWindow window,
                          (Window)window,
                          net_wm_icon );
     }
                          (Window)window,
                          net_wm_icon );
     }

+#endif

 }
 
 #endif
 }
 
 #endif