Added wxWrapSizer (modified patch: [1826950] Wrapping Sizer) from Arne Steinarson

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

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index 35e5555fb30f6bf0998f9c233c82789869f393c3..bbeab7e7ddf3f04e4f0edf06d934383f22b14192 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -14,11 +14,11 @@
 
 #include "wx/gdiobj.h"
 
 
 #include "wx/gdiobj.h"
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {

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

 public:
     wxPaletteRefData(void);
     virtual ~wxPaletteRefData(void);
 public:
     wxPaletteRefData(void);
     virtual ~wxPaletteRefData(void);


@@ -41,10 +41,8 @@ public:
 
     virtual int GetColoursCount() const;
 
 
     virtual int GetColoursCount() const;
 

-    virtual bool Ok(void) const { return (m_refData != NULL) ; }
-
-    inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
-    inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk(void) const { return (m_refData != NULL) ; }

 
     virtual bool FreeResource(bool force = false);
 
 
     virtual bool FreeResource(bool force = false);