build fix for AIX

[wxWidgets.git] / src / stc / scintilla / include / Platform.h

diff --git a/src/stc/scintilla/include/Platform.h b/src/stc/scintilla/include/Platform.h
index 88a05272fdc66b0d577e5668c1b5bef4392e8096..679294cad7702fb64084a099236bee977915a129 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -236,12 +236,15 @@ class Window;     // Forward declaration for Palette
  */
 class Palette {
        int used;
  */
 class Palette {
        int used;

-       enum {numEntries = 100};
-       ColourPair entries[numEntries];
+       int size;
+       ColourPair *entries;

 #if PLAT_GTK
        void *allocatedPalette; // GdkColor *
        int allocatedLen;
 #endif
 #if PLAT_GTK
        void *allocatedPalette; // GdkColor *
        int allocatedLen;
 #endif

+       // Private so Palette objects can not be copied
+       Palette(const Palette &) {}
+       Palette &operator=(const Palette &) { return *this; }

 public:
 #if PLAT_WIN
        void *hpal;
 public:
 #if PLAT_WIN
        void *hpal;


@@ -299,8 +302,8 @@ private:
        Surface(const Surface &) {}
        Surface &operator=(const Surface &) { return *this; }
 public:
        Surface(const Surface &) {}
        Surface &operator=(const Surface &) { return *this; }
 public:

-       Surface() {};
-       virtual ~Surface() {};
+       Surface() {}
+       virtual ~Surface() {}

        static Surface *Allocate();
 
        virtual void Init(WindowID wid)=0;
        static Surface *Allocate();
 
        virtual void Init(WindowID wid)=0;


@@ -319,6 +322,8 @@ public:
        virtual void FillRectangle(PRectangle rc, ColourAllocated back)=0;
        virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0;
        virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
        virtual void FillRectangle(PRectangle rc, ColourAllocated back)=0;
        virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0;
        virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;

+       virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
+               ColourAllocated outline, int alphaOutline, int flags)=0;

        virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
        virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource)=0;
 
        virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
        virtual void Copy(PRectangle rc, Point from, Surface &surfaceSource)=0;
 


@@ -438,7 +443,7 @@ public:
  */
 class DynamicLibrary {
 public:
  */
 class DynamicLibrary {
 public:

-       virtual ~DynamicLibrary() {};
+       virtual ~DynamicLibrary() {}

 
        /// @return Pointer to function "name", or NULL on failure.
        virtual Function FindFunction(const char *name) = 0;
 
        /// @return Pointer to function "name", or NULL on failure.
        virtual Function FindFunction(const char *name) = 0;