Apply patch [ 1548750 ] wxVsnprintf() various fixes

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 621fcf2dd920e5891bbfb9beca20ac4f226db3ad..a255f50665fca6797f6971c4dbf6b485fbe92217 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        wx/os2/palette.h
 // Purpose:     wxPalette class
 // Author:      David Webster
 // Modified by:
@@ -13,6 +13,7 @@
 #define _WX_PALETTE_H_
 
 #include "wx/gdiobj.h"
+#include "wx/os2/private.h"
 
 class WXDLLEXPORT wxPalette;
 
@@ -21,42 +22,56 @@ class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxPalette;
 public:
     wxPaletteRefData();
-    ~wxPaletteRefData();
-protected:
- WXHPALETTE m_hPalette;
-};
+    virtual ~wxPaletteRefData();
+// protected:
+    WXHPALETTE                      m_hPalette;
+    HPS                             m_hPS;
+}; // end of CLASS wxPaletteRefData
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLEXPORT wxPalette: public wxPaletteBase
 {
-  DECLARE_DYNAMIC_CLASS(wxPalette)
+    DECLARE_DYNAMIC_CLASS(wxPalette)
 
 public:
-  wxPalette();
-  inline wxPalette(const wxPalette& palette) { Ref(palette); }
+    wxPalette();
 
-  wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  ~wxPalette();
-  bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-  int GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const;
-  bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+    wxPalette( int                  n
+              ,const unsigned char* pRed
+              ,const unsigned char* pGreen
+              ,const unsigned char* pBlue
+             );
+    virtual ~wxPalette();
 
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    bool Create( int                  n
+                ,const unsigned char* pRed
+                ,const unsigned char* pGreen
+                ,const unsigned char* pBlue
+               );
+    int  GetPixel( unsigned char cRed
+                  ,unsigned char cGreen
+                  ,unsigned char cBlue
+                 ) const;
+    bool GetRGB( int            nPixel
+                ,unsigned char* pRed
+                ,unsigned char* pGreen
+                ,unsigned char* pBlue
+               ) const;
 
-  inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
+    virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
-  virtual bool FreeResource(bool force = FALSE);
+    inline bool       operator == (const wxPalette& rPalette) const
+        { return m_refData == rPalette.m_refData; }
+    inline bool       operator != (const wxPalette& rPalette) const
+        { return m_refData != rPalette.m_refData; }
 
-  inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
-  void SetHPALETTE(WXHPALETTE pal);
-};
+    virtual bool FreeResource(bool bForce = false);
 
-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
+    inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
+    void              SetHPALETTE(WXHPALETTE hPalette);
+    void              SetPS(HPS hPS);
+}; // end of CLASS wxPalette
 
 #endif
     // _WX_PALETTE_H_
-