Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index 78d794277b19ae41e0ee0feb7a4e6f6970ba2f86..b489ec88e45f2432f5073c18e9d5300c45a66eb3 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:
 // Purpose:     wxPalette class
 // Author:      David Webster
 // Modified by:


@@ -13,15 +13,16 @@
 #define _WX_PALETTE_H_
 
 #include "wx/gdiobj.h"
 #define _WX_PALETTE_H_
 
 #include "wx/gdiobj.h"

+#include "wx/os2/private.h"

 
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 

-class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
+class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData

 {
 {

-    friend class WXDLLEXPORT wxPalette;
+    friend class WXDLLIMPEXP_FWD_CORE wxPalette;

 public:
     wxPaletteRefData();
 public:
     wxPaletteRefData();

-    ~wxPaletteRefData();
+    virtual ~wxPaletteRefData();

 // protected:
     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;
 // protected:
     WXHPALETTE                      m_hPalette;
     HPS                             m_hPS;


@@ -29,29 +30,26 @@ public:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

-class WXDLLEXPORT wxPalette: public wxGDIObject
+class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPalette)
-

 public:
     wxPalette();
 public:
     wxPalette();

-    inline wxPalette(const wxPalette& rPalette) { Ref(rPalette); }

 
     wxPalette( int                  n
               ,const unsigned char* pRed
               ,const unsigned char* pGreen
               ,const unsigned char* pBlue
              );
 
     wxPalette( int                  n
               ,const unsigned char* pRed
               ,const unsigned char* pGreen
               ,const unsigned char* pBlue
              );

-    ~wxPalette();
+    virtual ~wxPalette();

 
     bool Create( int                  n
                 ,const unsigned char* pRed
                 ,const unsigned char* pGreen
                 ,const unsigned char* pBlue
                );
 
     bool Create( int                  n
                 ,const unsigned char* pRed
                 ,const unsigned char* pGreen
                 ,const unsigned char* pBlue
                );

-    int  GetPixel( const unsigned char cRed
-                  ,const unsigned char cGreen
-                  ,const unsigned char cBlue
+    int  GetPixel( unsigned char cRed
+                  ,unsigned char cGreen
+                  ,unsigned char cBlue

                  ) const;
     bool GetRGB( int            nPixel
                 ,unsigned char* pRed
                  ) const;
     bool GetRGB( int            nPixel
                 ,unsigned char* pRed


@@ -59,22 +57,19 @@ public:
                 ,unsigned char* pBlue
                ) const;
 
                 ,unsigned char* pBlue
                ) const;
 

-    virtual bool Ok(void) const { return (m_refData != NULL) ; }
-
-    inline wxPalette& operator = (const wxPalette& rPalette) { if (*this == rPalette) return (*this); Ref(rPalette); return *this; }
-    inline bool       operator == (const wxPalette& rPalette) { return m_refData == rPalette.m_refData; }
-    inline bool       operator != (const wxPalette& rPalette) { return m_refData != rPalette.m_refData; }
-
-    virtual bool FreeResource(bool bForce = FALSE);
+    virtual bool FreeResource(bool bForce = false);

 
     inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
     void              SetHPALETTE(WXHPALETTE hPalette);
     void              SetPS(HPS hPS);
 
     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

 
 

-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)
+}; // end of CLASS wxPalette

 
 #endif
     // _WX_PALETTE_H_
 
 #endif
     // _WX_PALETTE_H_

-