corrected/removed forward declarations

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 3482b339341aa25b7df0f354f1ed9f7b0f998b68..3f094805f2689ce91b92382f9a9c70eba36b73a8 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -1,64 +1,73 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        palette.h
+// Name:        wx/os2/palette.h
 // Purpose:     wxPalette class
-// Author:      AUTHOR
+// Author:      David Webster
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/12/99
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) David Webster
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALETTE_H_
 #define _WX_PALETTE_H_
 
-#ifdef __GNUG__
-#pragma interface "palette.h"
-#endif
-
 #include "wx/gdiobj.h"
+#include "wx/os2/private.h"
 
-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
-    friend class WXDLLEXPORT wxPalette;
+    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 public:
     wxPaletteRefData();
-    ~wxPaletteRefData();
-/* TODO: implementation
-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* pRed
+              ,const unsigned char* pGreen
+              ,const unsigned char* pBlue
+             );
+    virtual ~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;
+    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;
 
-  virtual bool Ok() const { return (m_refData != NULL) ; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(void) const { return (m_refData != NULL) ; }
 
-  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 FreeResource(bool bForce = false);
 
-/* TODO: implementation
-  inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
-  void SetHPALETTE(WXHPALETTE pal);
-*/
-};
+    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_