more fixes to radio menu items: fixed Check() for them; allow separators inside the...

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

diff --git a/src/x11/palette.cpp b/src/x11/palette.cpp
index 36bd8cfafc5b13decd841e13a171cceefb570a18..8ee782b8e4d1522fdbd82d565fe96aa50065a92a 100644 (file)
--- a/src/x11/palette.cpp
+++ b/src/x11/palette.cpp
@@ -50,7 +50,7 @@ not the functionality that wxPalette::Create() aims to provide.
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif

-#include "wx/motif/private.h"
+#include "wx/x11/private.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxXPalette, wxObject)


@@ -89,6 +89,7 @@ wxPaletteRefData::~wxPaletteRefData()
 
         if (pix_array_n > 0)
         {
 
         if (pix_array_n > 0)
         {

+#if !wxUSE_NANOX

             //      XFreeColors(display, cmap, pix_array, pix_array_n, 0);
             // Be careful not to free '0' pixels...
             int i, j;
             //      XFreeColors(display, cmap, pix_array, pix_array_n, 0);
             // Be careful not to free '0' pixels...
             int i, j;


@@ -97,9 +98,10 @@ wxPaletteRefData::~wxPaletteRefData()
                 if(j > i) XFreeColors(display, cmap, &pix_array[i], j-i, 0);
                 while(j<pix_array_n && pix_array[j]==0) j++;
             }
                 if(j > i) XFreeColors(display, cmap, &pix_array[i], j-i, 0);
                 while(j<pix_array_n && pix_array[j]==0) j++;
             }

+#endif

             delete [] pix_array;
         }
             delete [] pix_array;
         }

-
+        

         if (destroyable)
             XFreeColormap(display, cmap);
 
         if (destroyable)
             XFreeColormap(display, cmap);