added wxUSE_NOTEBOOK to include/wx/msw/setup0.h, removed wxUSE_RADIOBUTTON (we

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

diff --git a/src/motif/palette.cpp b/src/motif/palette.cpp
index 58262fb1bef2807637b7225d01db41dc6f7cc471..ef2b2597a6dacf5ddfee089eef663a775cd16a6d 100644 (file)
--- a/src/motif/palette.cpp
+++ b/src/motif/palette.cpp
@@ -6,7 +6,7 @@
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -17,7 +17,7 @@
  * in Create().  The cells are freed on the next call to Create()
  * or when the destructor is called.
  */
  * in Create().  The cells are freed on the next call to Create()
  * or when the destructor is called.
  */

- 
+

 /* Wolfram Gloger <u7y22ab@sunmail.lrz-muenchen.de>
 I have implemented basic colormap support for the X11 versions of
 wxWindows, notably wxPalette::Create().  The way I did it is to
 /* Wolfram Gloger <u7y22ab@sunmail.lrz-muenchen.de>
 I have implemented basic colormap support for the X11 versions of
 wxWindows, notably wxPalette::Create().  The way I did it is to


@@ -43,18 +43,22 @@ not the functionality that wxPalette::Create() aims to provide.
 #include "wx/app.h"
 #include "wx/utils.h"
 
 #include "wx/app.h"
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Xm.h>
 #include <Xm/Xm.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

 #include "wx/motif/private.h"
 
 #include "wx/motif/private.h"
 

-#if !USE_SHARED_LIBRARIES

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

-#endif

 
 /*
 
 /*

- * Palette
- *
- */
+* Palette
+*
+*/

 
 wxXPalette::wxXPalette()
 {
 
 wxXPalette::wxXPalette()
 {


@@ -71,39 +75,38 @@ wxPaletteRefData::wxPaletteRefData()
 
 wxPaletteRefData::~wxPaletteRefData()
 {
 
 wxPaletteRefData::~wxPaletteRefData()
 {

-  XColor xcol;
-  Display *display = (Display*) NULL;
-
-  wxNode *node, *next;
-  
-  for (node = m_palettes.First(); node; node = next) {
-    wxXPalette *c = (wxXPalette *)node->Data();
-    unsigned long *pix_array = c->m_pix_array;
-    Colormap cmap = (Colormap) c->m_cmap;
-    bool destroyable = c->m_destroyable;
-    int pix_array_n = c->m_pix_array_n;
-    display = (Display*) c->m_display;
-
-    if (pix_array_n > 0)
-    {
-//      XFreeColors(display, cmap, pix_array, pix_array_n, 0);
-      // Be careful not to free '0' pixels...
-      int i, j;
-      for(i=j=0; i<pix_array_n; i=j) {
-        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++;
-      }
-      delete [] pix_array;
-    }
+    Display *display = (Display*) NULL;

 
 

-    if (destroyable)
-      XFreeColormap(display, cmap);
+    wxNode *node, *next;

 
 

-    next = node->Next();
-    m_palettes.DeleteNode(node);
-    delete c;
-  }
+    for (node = m_palettes.First(); node; node = next) {
+        wxXPalette *c = (wxXPalette *)node->Data();
+        unsigned long *pix_array = c->m_pix_array;
+        Colormap cmap = (Colormap) c->m_cmap;
+        bool destroyable = c->m_destroyable;
+        int pix_array_n = c->m_pix_array_n;
+        display = (Display*) c->m_display;
+
+        if (pix_array_n > 0)
+        {
+            //      XFreeColors(display, cmap, pix_array, pix_array_n, 0);
+            // Be careful not to free '0' pixels...
+            int i, j;
+            for(i=j=0; i<pix_array_n; i=j) {
+                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++;
+            }
+            delete [] pix_array;
+        }
+
+        if (destroyable)
+            XFreeColormap(display, cmap);
+
+        next = node->Next();
+        m_palettes.DeleteNode(node);
+        delete c;
+    }

 }
 
 wxPalette::wxPalette()
 }
 
 wxPalette::wxPalette()


@@ -121,61 +124,61 @@ wxPalette::~wxPalette()
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
 
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {

-  UnRef();
+    UnRef();

 
 

-  if (!n) {
-    return FALSE;
-  }
+    if (!n) {
+        return FALSE;
+    }

 
 

-  m_refData = new wxPaletteRefData;
+    m_refData = new wxPaletteRefData;

 
 

-  XColor xcol;
-  Display* display = (Display*) wxGetDisplay();
+    XColor xcol;
+    Display* display = (Display*) wxGetDisplay();

 
 

-  unsigned long *pix_array;
-  Colormap cmap;
-  int pix_array_n;
+    unsigned long *pix_array;
+    Colormap cmap;
+    int pix_array_n;

 
 

-  cmap = (Colormap) wxTheApp->GetMainColormap(display);
+    cmap = (Colormap) wxTheApp->GetMainColormap(display);

 
 

-  pix_array = new unsigned long[n];
-  if (!pix_array)
-    return FALSE;
+    pix_array = new unsigned long[n];
+    if (!pix_array)
+        return FALSE;

 
 

-  pix_array_n = n;
-  xcol.flags = DoRed | DoGreen | DoBlue;
-  for(int i = 0; i < n; i++) {
-    xcol.red = (unsigned short)red[i] << 8;
-    xcol.green = (unsigned short)green[i] << 8;
-    xcol.blue = (unsigned short)blue[i] << 8;
-    pix_array[i] = (XAllocColor(display, cmap, &xcol) == 0) ? 0 : xcol.pixel;
-  }
-
-  wxXPalette *c = new wxXPalette;
-
-  c->m_pix_array_n = pix_array_n;
-  c->m_pix_array = pix_array;
-  c->m_cmap = (WXColormap) cmap;
-  c->m_display = (WXDisplay*) display;
-  c->m_destroyable = FALSE;
-  M_PALETTEDATA->m_palettes.Append(c);
-
-  return TRUE;
+    pix_array_n = n;
+    xcol.flags = DoRed | DoGreen | DoBlue;
+    for(int i = 0; i < n; i++) {
+        xcol.red = (unsigned short)red[i] << 8;
+        xcol.green = (unsigned short)green[i] << 8;
+        xcol.blue = (unsigned short)blue[i] << 8;
+        pix_array[i] = (XAllocColor(display, cmap, &xcol) == 0) ? 0 : xcol.pixel;
+    }
+
+    wxXPalette *c = new wxXPalette;
+
+    c->m_pix_array_n = pix_array_n;
+    c->m_pix_array = pix_array;
+    c->m_cmap = (WXColormap) cmap;
+    c->m_display = (WXDisplay*) display;
+    c->m_destroyable = FALSE;
+    M_PALETTEDATA->m_palettes.Append(c);
+
+    return TRUE;

 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
     if ( !m_refData )
 }
 
 int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const
 {
     if ( !m_refData )

-           return FALSE;
+        return FALSE;

 
     // TODO
     return FALSE;
 }
 
 
     // TODO
     return FALSE;
 }
 

-bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const
+bool wxPalette::GetRGB(int index, unsigned char *WXUNUSED(red), unsigned char *WXUNUSED(green), unsigned char *WXUNUSED(blue)) const

 {
     if ( !m_refData )
 {
     if ( !m_refData )

-           return FALSE;
+        return FALSE;

 
     if (index < 0 || index > 255)
         return FALSE;
 
     if (index < 0 || index > 255)
         return FALSE;


@@ -209,7 +212,7 @@ WXColormap wxPalette::GetXColormap(WXDisplay* display) const
     wxXPalette *first = (wxXPalette *)M_PALETTEDATA->m_palettes.First()->Data();
     XColor xcol;
     int pix_array_n = first->m_pix_array_n;
     wxXPalette *first = (wxXPalette *)M_PALETTEDATA->m_palettes.First()->Data();
     XColor xcol;
     int pix_array_n = first->m_pix_array_n;

-  
+

     c->m_pix_array_n = pix_array_n;
     c->m_pix_array = new unsigned long[pix_array_n];
     c->m_display = display;
     c->m_pix_array_n = pix_array_n;
     c->m_pix_array = new unsigned long[pix_array_n];
     c->m_display = display;


@@ -235,77 +238,77 @@ WXColormap wxPalette::GetXColormap(WXDisplay* display) const
 
 bool wxPalette::TransferBitmap(void *data, int depth, int size)
 {
 
 bool wxPalette::TransferBitmap(void *data, int depth, int size)
 {

-  switch(depth) {
-  case 8:
-  {
-    unsigned char *uptr = (unsigned char *)data;
-    int pix_array_n;
-    unsigned long *pix_array = GetXPixArray((Display*) wxGetDisplay(), &pix_array_n);
-    while(size-- > 0)
-    {
-      if((int)*uptr < pix_array_n)
-        *uptr = (unsigned char)pix_array[*uptr];
-      uptr++;
+    switch(depth) {
+    case 8:
+        {
+            unsigned char *uptr = (unsigned char *)data;
+            int pix_array_n;
+            unsigned long *pix_array = GetXPixArray((Display*) wxGetDisplay(), &pix_array_n);
+            while(size-- > 0)
+            {
+                if((int)*uptr < pix_array_n)
+                    *uptr = (unsigned char)pix_array[*uptr];
+                uptr++;
+            }
+
+            return TRUE;
+        }
+    default:
+        return FALSE;

     }
     }

-
-    return TRUE;
-  }
-  default:
-    return FALSE;
-  }

 }
 
 bool wxPalette::TransferBitmap8(unsigned char *data, unsigned long sz,
 }
 
 bool wxPalette::TransferBitmap8(unsigned char *data, unsigned long sz,

-                 void *dest, unsigned int bpp)
+                                void *dest, unsigned int bpp)

 {
 {

-  int pix_array_n;
-  unsigned long *pix_array = GetXPixArray((Display*) wxGetDisplay(), &pix_array_n);
+    int pix_array_n;
+    unsigned long *pix_array = GetXPixArray((Display*) wxGetDisplay(), &pix_array_n);

     switch(bpp) {
     case 8: {
     switch(bpp) {
     case 8: {

-    unsigned char *dptr = (unsigned char *)dest;
-    while(sz-- > 0) {
-        if((int)*data < pix_array_n)
-         *dptr = (unsigned char)pix_array[*data];
-        data++;
-        dptr++;
-    }
-    break;
-    }
+        unsigned char *dptr = (unsigned char *)dest;
+        while(sz-- > 0) {
+            if((int)*data < pix_array_n)
+                *dptr = (unsigned char)pix_array[*data];
+            data++;
+            dptr++;
+        }
+        break;
+            }

     case 16: {
     case 16: {

-    unsigned short *dptr = (unsigned short *)dest;
-    while(sz-- > 0) {
-        if((int)*data < pix_array_n)
-         *dptr = (unsigned short)pix_array[*data];
-        data++;
-        dptr++;
-    }
-    break;
-    }
+        unsigned short *dptr = (unsigned short *)dest;
+        while(sz-- > 0) {
+            if((int)*data < pix_array_n)
+                *dptr = (unsigned short)pix_array[*data];
+            data++;
+            dptr++;
+        }
+        break;
+             }

     case 24: {
     case 24: {

-    struct rgb24 { unsigned char r, g, b; } *dptr = (struct rgb24 *)dest;
-    while(sz-- > 0) {
-        if((int)*data < pix_array_n) {
-        dptr->r = pix_array[*data] & 0xFF;
-        dptr->g = (pix_array[*data] >> 8) & 0xFF;
-        dptr->b = (pix_array[*data] >> 16) & 0xFF;
+        struct rgb24 { unsigned char r, g, b; } *dptr = (struct rgb24 *)dest;
+        while(sz-- > 0) {
+            if((int)*data < pix_array_n) {
+                dptr->r = pix_array[*data] & 0xFF;
+                dptr->g = (pix_array[*data] >> 8) & 0xFF;
+                dptr->b = (pix_array[*data] >> 16) & 0xFF;
+            }
+            data++;
+            dptr++;

         }
         }

-        data++;
-        dptr++;
-    }
-    break;
-    }
+        break;
+             }

     case 32: {
     case 32: {

-    unsigned long *dptr = (unsigned long *)dest;
-    while(sz-- > 0) {
-        if((int)*data < pix_array_n)
-         *dptr = pix_array[*data];
-        data++;
-        dptr++;
-    }
-    break;
-    }
+        unsigned long *dptr = (unsigned long *)dest;
+        while(sz-- > 0) {
+            if((int)*data < pix_array_n)
+                *dptr = pix_array[*data];
+            data++;
+            dptr++;
+        }
+        break;
+             }

     default:
     default:

-    return FALSE;
+        return FALSE;

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -326,7 +329,7 @@ unsigned long *wxPalette::GetXPixArray(WXDisplay *display, int *n)
             return c->m_pix_array;
         }
     }
             return c->m_pix_array;
         }
     }

-  
+

     /* Not found; call GetXColormap, which will create it, then this again */
     if (GetXColormap(display))
         return GetXPixArray(display, n);
     /* Not found; call GetXColormap, which will create it, then this again */
     if (GetXColormap(display))
         return GetXPixArray(display, n);