Allow wxThread::Wait() and Delete() to block, even under wxMSW.

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

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 561c8ae6893009f3caa59393a03046fb6744beb9..9d28bbfc3adee479c426f7b544835c15ee0e1a8e 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -14,45 +14,38 @@
 
 #include "wx/gdiobj.h"
 
-class WXDLLEXPORT wxPalette;
-
-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
 {
-    friend class WXDLLEXPORT wxPalette;
 public:
-    wxPaletteRefData(void);
-    virtual ~wxPaletteRefData(void);
-protected:
- WXHPALETTE m_hPalette;
-};
+    wxPalette() { }
+    wxPalette(int n,
+              unsigned char *red, unsigned char *green, unsigned char *blue)
+    {
+        Create(n, red, green, blue);
+    }
 
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
-
-class WXDLLEXPORT wxPalette: public wxPaletteBase
-{
-public:
-    wxPalette();
-    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    virtual ~wxPalette(void);
-    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    
-    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
-    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
+    bool Create(int n,
+                unsigned char *red, unsigned char *green, unsigned char *blue);
 
     virtual int GetColoursCount() const;
 
-    virtual bool Ok() const { return IsOk(); }
-    virtual bool IsOk(void) const { return (m_refData != NULL) ; }
+    int
+    GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
 
-    virtual bool FreeResource(bool force = false);
+    bool
+    GetRGB(int pixel,
+           unsigned char *red, unsigned char *green, unsigned char *blue) const;
 
     // implemetation
-    inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
+    WXHPALETTE GetHPALETTE() const;
     void SetHPALETTE(WXHPALETTE pal);
-  
+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
 private:
     DECLARE_DYNAMIC_CLASS(wxPalette)
 };
 
-#endif
-    // _WX_PALETTE_H_
+#endif // _WX_PALETTE_H_