changed make_int, make_exp .. to wxmake_int..

[wxWidgets.git] / include / wx / motif / palette.h

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index 6364d677d944ec6c345b33769e63114d0bdb742f..18302f09dfbde3f52a77c445e6b04558d4a7ff70 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -17,19 +17,34 @@
 #endif
 
 #include "wx/gdiobj.h"
+#include "wx/list.h"
 
 class WXDLLEXPORT wxPalette;
 
+// Palette for one display
+class wxXPalette : public wxObject
+{
+DECLARE_DYNAMIC_CLASS(wxXPalette)
+
+public:
+    wxXPalette();
+
+    WXDisplay*        m_display;
+    int               m_pix_array_n;
+    unsigned long*    m_pix_array;
+    WXColormap        m_cmap;
+    bool              m_destroyable;
+};
+
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
     ~wxPaletteRefData();
-/* TODO: implementation
+
 protected:
- WXHPALETTE m_hPalette;
-*/
+    wxList  m_palettes;
 };
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
@@ -41,7 +56,6 @@ class WXDLLEXPORT wxPalette: public wxGDIObject
 public:
   wxPalette();
   inline wxPalette(const wxPalette& palette) { Ref(palette); }
-  inline wxPalette(const wxPalette* palette) { UnRef(); if (palette) Ref(*palette); }
 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   ~wxPalette();
@@ -55,10 +69,12 @@ public:
   inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
 
-/* TODO: implementation
-  inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
-  void SetHPALETTE(WXHPALETTE pal);
-*/
+  // Motif-specific
+  WXColormap GetXColormap(WXDisplay* display = NULL) const;
+  bool TransferBitmap(void *data, int depth, int size);
+  bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
+  unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
+  void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);
 };
 
 #endif