non-PCH build fix (according to Tinderbox).

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

diff --git a/contrib/src/stc/scintilla/include/Platform.h b/contrib/src/stc/scintilla/include/Platform.h
index e6385da71ddf818c245c11d665e81a64e35ffbb0..9dafa9f7d6e78f9ae274100ecee4e4d827a4475a 100644 (file)
--- a/contrib/src/stc/scintilla/include/Platform.h
+++ b/contrib/src/stc/scintilla/include/Platform.h
@@ -44,11 +44,6 @@
 #endif
 
 
-#if PLAT_WX
-#include <wx/object.h>  // For the global memory operators, if needed.
-#endif
-
-
 // Underlying the implementation of the platform classes are platform specific types.
 // Sometimes these need to be passed around by client code so they are defined here
 
@@ -69,7 +64,7 @@ public:
        int x;
        int y;
 
-       Point(int x_=0, int y_=0) : x(x_), y(y_) {
+       explicit Point(int x_=0, int y_=0) : x(x_), y(y_) {
        }
 
        // Other automatically defined methods (assignment, copy constructor, destructor) are fine
@@ -241,12 +236,15 @@ class Window;     // Forward declaration for Palette
  */
 class Palette {
        int used;
-       enum {numEntries = 100};
-       ColourPair entries[numEntries];
+       int size;
+       ColourPair *entries;
 #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;
@@ -324,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 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;
 
@@ -398,9 +398,10 @@ public:
        static ListBox *Allocate();
 
        virtual void SetFont(Font &font)=0;
-       virtual void Create(Window &parent, int ctrlID, int lineHeight_, bool unicodeMode_)=0;
+       virtual void Create(Window &parent, int ctrlID, Point location, int lineHeight_, bool unicodeMode_)=0;
        virtual void SetAverageCharWidth(int width)=0;
        virtual void SetVisibleRows(int rows)=0;
+       virtual int GetVisibleRows() const=0;
        virtual PRectangle GetDesiredRect()=0;
        virtual int CaretFromEdge()=0;
        virtual void Clear()=0;
@@ -413,6 +414,7 @@ public:
        virtual void RegisterImage(int type, const char *xpm_data)=0;
        virtual void ClearRegisteredImages()=0;
        virtual void SetDoubleClickAction(CallBackAction, void *)=0;
+       virtual void SetList(const char* list, char separator, char typesep)=0;
 };
 
 /**