Move wxColourData and wxFontData into separate files.

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

diff --git a/include/wx/os2/palette.h b/include/wx/os2/palette.h
index ba3109be260e206ea64fc1e2f5d694a706b5257c..b489ec88e45f2432f5073c18e9d5300c45a66eb3 100644 (file)
--- a/include/wx/os2/palette.h
+++ b/include/wx/os2/palette.h
@@ -17,7 +17,7 @@
 
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 
 
 class WXDLLIMPEXP_FWD_CORE wxPalette;
 

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

 {
     friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 public:
 {
     friend class WXDLLIMPEXP_FWD_CORE wxPalette;
 public:


@@ -30,10 +30,8 @@ public:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

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

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxPalette)
-

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


@@ -64,6 +62,13 @@ public:
     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);

+
+protected:
+    virtual wxGDIRefData *CreateGDIRefData() const;
+    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPalette)

 }; // end of CLASS wxPalette
 
 #endif
 }; // end of CLASS wxPalette
 
 #endif