Added helper functions for string -> XmString conversion.

[wxWidgets.git] / src / x11 / colour.cpp

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 058c00d84dddbe030d27c67fa3a0fd44f7d1ed6b..e10c2f486b903121fc35db0a8ae3615d711ed371 100644 (file)
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -92,7 +92,7 @@ void wxColourRefData::FreeColour()
 {
     if (!m_colormap)
         return;
 {
     if (!m_colormap)
         return;

-        
+#if !wxUSE_NANOX        

     if ((wxTheApp->m_visualType == GrayScale) ||
         (wxTheApp->m_visualType == PseudoColor))
     {
     if ((wxTheApp->m_visualType == GrayScale) ||
         (wxTheApp->m_visualType == PseudoColor))
     {


@@ -105,6 +105,7 @@ void wxColourRefData::FreeColour()
             XFreeColors( wxGlobalDisplay(), (Colormap) m_colormap, &pixel, 1, 0 );
         }
     }
             XFreeColors( wxGlobalDisplay(), (Colormap) m_colormap, &pixel, 1, 0 );
         }
     }

+#endif

 }
 
 void wxColourRefData::AllocColour( WXColormap cmap )
 }
 
 void wxColourRefData::AllocColour( WXColormap cmap )


@@ -114,6 +115,7 @@ void wxColourRefData::AllocColour( WXColormap cmap )
 
     FreeColour();
 
 
     FreeColour();
 

+#if !wxUSE_NANOX

     if ((wxTheApp->m_visualType == GrayScale) ||
         (wxTheApp->m_visualType == PseudoColor))
     {
     if ((wxTheApp->m_visualType == GrayScale) ||
         (wxTheApp->m_visualType == PseudoColor))
     {


@@ -122,6 +124,7 @@ void wxColourRefData::AllocColour( WXColormap cmap )
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1;
     }
     else
         colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1;
     }
     else

+#endif

     {
         m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color );
     }
     {
         m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color );
     }