wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

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

diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h
index f7dffc57b0d2fa752963f8ba265a97ee05817462..73d5df709e60323ad5cb297ef958ff666cc23bc6 100644 (file)
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PALETTEH__
-#define __PALETTEH__
+#ifndef _WX_PALETTE_H_
+#define _WX_PALETTE_H_

 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "palette.h"
 #endif
 
 #pragma interface "palette.h"
 #endif
 


@@ -32,14 +32,13 @@ protected:
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 

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

 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 public:
   wxPalette(void);
 {
   DECLARE_DYNAMIC_CLASS(wxPalette)
 
 public:
   wxPalette(void);

-  inline wxPalette(const wxPalette& palette) { Ref(palette); }
-  inline wxPalette(const wxPalette* palette) { /* UnRef(); */ if (palette) Ref(*palette); }
+  inline wxPalette(const wxPalette& palette) : wxPaletteBase(palette) { Ref(palette); }

 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   ~wxPalette(void);
 
   wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
   ~wxPalette(void);


@@ -50,17 +49,14 @@ public:
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }
   virtual bool Ok(void) const { return (m_refData != NULL) ; }
 
   inline wxPalette& operator = (const wxPalette& palette) { if (*this == palette) return (*this); Ref(palette); return *this; }

-  inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
-  inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
+  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 FreeResource(bool force = FALSE);
+  virtual bool FreeResource(bool force = false);

 
   inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
   void SetHPALETTE(WXHPALETTE pal);
 };
 
 
   inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
   void SetHPALETTE(WXHPALETTE pal);
 };
 

-#define wxColorMap wxPalette
-#define wxColourMap wxPalette
-

 #endif
 #endif

-    // __PALETTEH__
+    // _WX_PALETTE_H_