use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/palmos/palette.h b/include/wx/palmos/palette.h
index 03678ac15d789849e68afb63606cffc75f363a7f..668e05116fe9c8393219b346de14edab212e1c7e 100644 (file)
--- a/include/wx/palmos/palette.h
+++ b/include/wx/palmos/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:
   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;
 
   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;
 

-  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);