use wxTextEntry in wxTextValidator (modified patch 1821743)

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

diff --git a/include/wx/motif/palette.h b/include/wx/motif/palette.h
index d4e00e6efb0f96c34239fe5d47e017160497adf2..644e066af9f25b224f579f2e1a4aa663a6110413 100644 (file)
--- a/include/wx/motif/palette.h
+++ b/include/wx/motif/palette.h
@@ -15,7 +15,7 @@
 #include "wx/gdiobj.h"
 #include "wx/list.h"
 
 #include "wx/gdiobj.h"
 #include "wx/list.h"
 

-class WXDLLEXPORT wxPalette;
+class WXDLLIMPEXP_FWD_CORE wxPalette;

 
 // Palette for one display
 class wxXPalette : public wxObject
 
 // Palette for one display
 class wxXPalette : public wxObject


@@ -34,7 +34,7 @@ public:
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {
 
 class WXDLLEXPORT wxPaletteRefData: public wxGDIRefData
 {

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

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


@@ -58,10 +58,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() const { return (m_refData != NULL) ; }
-
-    bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; }
-    bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return (m_refData != NULL) ; }

 
     // Motif-specific
     WXColormap GetXColormap(WXDisplay* display = NULL) const;
 
     // Motif-specific
     WXColormap GetXColormap(WXDisplay* display = NULL) const;