A fix for VC6 compilation: define missing priority constants.

[wxWidgets.git] / src / msw / palette.cpp

diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp
index 570f4d96c80a117a27f5f24ea9d3cd06580385a4..2547d98851e78b054313b37e80cb256ace4f0cd9 100644 (file)
--- a/src/msw/palette.cpp
+++ b/src/msw/palette.cpp
@@ -32,9 +32,9 @@ public:
     wxPaletteRefData() { Init(); }
 
     wxPaletteRefData(int n,
     wxPaletteRefData() { Init(); }
 
     wxPaletteRefData(int n,

-                     unsigned char *red,
-                     unsigned char *green,
-                     unsigned char *blue)
+                     const unsigned char *red,
+                     const unsigned char *green,
+                     const unsigned char *blue)

     {
         Init();
 
     {
         Init();
 


@@ -55,6 +55,7 @@ public:
     }
 
     wxPaletteRefData(const wxPaletteRefData& data)
     }
 
     wxPaletteRefData(const wxPaletteRefData& data)

+        : wxGDIRefData()

     {
         Init();
 
     {
         Init();
 


@@ -116,9 +117,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxPalette, wxGDIObject)
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 bool wxPalette::Create(int n,
 #define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
 
 bool wxPalette::Create(int n,

-                       unsigned char *red,
-                       unsigned char *green,
-                       unsigned char *blue)
+                       const unsigned char *red,
+                       const unsigned char *green,
+                       const unsigned char *blue)

 {
     m_refData = new wxPaletteRefData(n, red, green, blue);
 
 {
     m_refData = new wxPaletteRefData(n, red, green, blue);
 


@@ -132,7 +133,7 @@ wxGDIRefData *wxPalette::CreateGDIRefData() const
 
 wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
 {
 
 wxGDIRefData *wxPalette::CloneGDIRefData(const wxGDIRefData *data) const
 {

-    return new wxPaletteRefData(*wx_static_cast(const wxPaletteRefData *, data));
+    return new wxPaletteRefData(*static_cast<const wxPaletteRefData *>(data));

 }
 
 int wxPalette::GetColoursCount() const
 }
 
 int wxPalette::GetColoursCount() const