wxMessageBox off the main thread lost result code.

[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 1058242fb36c110776e1daf27ee46011f9ebdb26..1b5dfbe3df9036fbaea26dc2efba24058c895eb7 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -1,9 +1,9 @@
 // Scintilla source code edit control
 /** @file Platform.h
  ** Interface to platform facilities. Also includes some basic utilities.
 // Scintilla source code edit control
 /** @file Platform.h
  ** Interface to platform facilities. Also includes some basic utilities.

- ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.
+ ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWindows.

  **/
  **/

-// Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
+// Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>

 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef PLATFORM_H
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef PLATFORM_H


@@ -12,12 +12,15 @@
 // PLAT_GTK = GTK+ on Linux or Win32
 // PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
 // PLAT_WIN = Win32 API on Win32 OS
 // PLAT_GTK = GTK+ on Linux or Win32
 // PLAT_GTK_WIN32 is defined additionally when running PLAT_GTK under Win32
 // PLAT_WIN = Win32 API on Win32 OS

-// PLAT_WX is wxWidgets on any supported platform
+// PLAT_WX is wxWindows on any supported platform

 
 #define PLAT_GTK 0
 #define PLAT_GTK_WIN32 0
 
 #define PLAT_GTK 0
 #define PLAT_GTK_WIN32 0

+#define PLAT_GTK_MACOSX 0
+#define PLAT_MACOSX 0

 #define PLAT_WIN 0
 #define PLAT_WX  0
 #define PLAT_WIN 0
 #define PLAT_WX  0

+#define PLAT_QT 0

 #define PLAT_FOX 0
 
 #if defined(FOX)
 #define PLAT_FOX 0
 
 #if defined(FOX)


@@ -28,26 +31,42 @@
 #undef PLAT_WX
 #define PLAT_WX  1
 
 #undef PLAT_WX
 #define PLAT_WX  1
 

+#elif defined(SCINTILLA_QT)
+#undef PLAT_QT
+#define PLAT_QT 1
+

 #elif defined(GTK)
 #undef PLAT_GTK
 #define PLAT_GTK 1
 
 #elif defined(GTK)
 #undef PLAT_GTK
 #define PLAT_GTK 1
 

-#ifdef _MSC_VER
+#if defined(__WIN32__) || defined(_MSC_VER)

 #undef PLAT_GTK_WIN32
 #define PLAT_GTK_WIN32 1
 #endif
 
 #undef PLAT_GTK_WIN32
 #define PLAT_GTK_WIN32 1
 #endif
 

+#if defined(__APPLE__)
+#undef PLAT_GTK_MACOSX
+#define PLAT_GTK_MACOSX 1
+#endif
+
+#elif defined(__APPLE__)
+
+#undef PLAT_MACOSX
+#define PLAT_MACOSX 1
+

 #else
 #undef PLAT_WIN
 #define PLAT_WIN 1
 
 #endif
 
 #else
 #undef PLAT_WIN
 #define PLAT_WIN 1
 
 #endif
 

-
-#if PLAT_WX
-#include <wx/object.h>  // For the global memory operators, if needed.
+#ifdef SCI_NAMESPACE
+namespace Scintilla {

 #endif
 
 #endif
 

+typedef float XYPOSITION;
+typedef double XYACCUMULATOR;
+//#define XYPOSITION int

 
 // 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
 
 // 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


@@ -66,10 +85,10 @@ typedef void *IdlerID;
  */
 class Point {
 public:
  */
 class Point {
 public:

-       int x;
-       int y;
+       XYPOSITION x;
+       XYPOSITION y;

 
 

-       Point(int x_=0, int y_=0) : x(x_), y(y_) {
+       explicit Point(XYPOSITION x_=0, XYPOSITION y_=0) : x(x_), y(y_) {

        }
 
        // Other automatically defined methods (assignment, copy constructor, destructor) are fine
        }
 
        // Other automatically defined methods (assignment, copy constructor, destructor) are fine


@@ -84,12 +103,12 @@ public:
  */
 class PRectangle {
 public:
  */
 class PRectangle {
 public:

-       int left;
-       int top;
-       int right;
-       int bottom;
+       XYPOSITION left;
+       XYPOSITION top;
+       XYPOSITION right;
+       XYPOSITION bottom;

 
 

-       PRectangle(int left_=0, int top_=0, int right_=0, int bottom_ = 0) :
+       PRectangle(XYPOSITION left_=0, XYPOSITION top_=0, XYPOSITION right_=0, XYPOSITION bottom_ = 0) :

                left(left_), top(top_), right(right_), bottom(bottom_) {
        }
 
                left(left_), top(top_), right(right_), bottom(bottom_) {
        }
 


@@ -111,28 +130,19 @@ public:
                return (right > other.left) && (left < other.right) &&
                        (bottom > other.top) && (top < other.bottom);
        }
                return (right > other.left) && (left < other.right) &&
                        (bottom > other.top) && (top < other.bottom);
        }

-       void Move(int xDelta, int yDelta) {
+       void Move(XYPOSITION xDelta, XYPOSITION yDelta) {

                left += xDelta;
                top += yDelta;
                right += xDelta;
                bottom += yDelta;
        }
                left += xDelta;
                top += yDelta;
                right += xDelta;
                bottom += yDelta;
        }

-       int Width() { return right - left; }
-       int Height() { return bottom - top; }
+       XYPOSITION Width() { return right - left; }
+       XYPOSITION Height() { return bottom - top; }
+       bool Empty() {
+               return (Height() <= 0) || (Width() <= 0);
+       }

 };
 
 };
 

-/**
- * In some circumstances, including Win32 in paletted mode and GTK+, each colour
- * must be allocated before use. The desired colours are held in the ColourDesired class,
- * and after allocation the allocation entry is stored in the ColourAllocated class. In other
- * circumstances, such as Win32 in true colour mode, the allocation process just copies
- * the RGB values from the desired to the allocated class.
- * As each desired colour requires allocation before it can be used, the ColourPair class
- * holds both a ColourDesired and a ColourAllocated
- * The Palette class is responsible for managing the palette of colours which contains a
- * list of ColourPair objects and performs the allocation.
- */
-

 /**
  * Holds a desired RGB colour.
  */
 /**
  * Holds a desired RGB colour.
  */


@@ -198,100 +208,63 @@ public:
 };
 
 /**
 };
 
 /**

- * Holds an allocated RGB colour which may be an approximation to the desired colour.
+ * Font management.

  */
  */

-class ColourAllocated {
-       long coAllocated;
-
-public:

 
 

-       ColourAllocated(long lcol=0) {
-               coAllocated = lcol;
+struct FontParameters {
+       const char *faceName;
+       float size;
+       int weight;
+       bool italic;
+       int extraFontFlag;
+       int technology;
+       int characterSet;
+
+       FontParameters(
+               const char *faceName_,
+               float size_=10,
+               int weight_=400,
+               bool italic_=false,
+               int extraFontFlag_=0,
+               int technology_=0,
+               int characterSet_=0) :
+
+               faceName(faceName_),
+               size(size_),
+               weight(weight_),
+               italic(italic_),
+               extraFontFlag(extraFontFlag_),
+               technology(technology_),
+               characterSet(characterSet_)
+       {

        }
 
        }
 

-       void Set(long lcol) {
-               coAllocated = lcol;
-       }
-
-       long AsLong() const {
-               return coAllocated;
-       }
-};
-
-/**
- * Colour pairs hold a desired colour and an allocated colour.
- */
-struct ColourPair {
-       ColourDesired desired;
-       ColourAllocated allocated;
-
-       ColourPair(ColourDesired desired_=ColourDesired(0,0,0)) {
-               desired = desired_;
-               allocated.Set(desired.AsLong());
-       }
-       void Copy() {
-               allocated.Set(desired.AsLong());
-       }

 };
 
 };
 

-class Window;  // Forward declaration for Palette
-
-/**
- * Colour palette management.
- */
-class Palette {
-       int used;
-       enum {numEntries = 100};
-       ColourPair entries[numEntries];
-#if PLAT_GTK
-       void *allocatedPalette; // GdkColor *
-       int allocatedLen;
-#endif
-public:
-#if PLAT_WIN
-       void *hpal;
-#endif
-       bool allowRealization;
-
-       Palette();
-       ~Palette();
-
-       void Release();
-
-       /**
-        * This method either adds a colour to the list of wanted colours (want==true)
-        * or retrieves the allocated colour back to the ColourPair.
-        * This is one method to make it easier to keep the code for wanting and retrieving in sync.
-        */
-       void WantFind(ColourPair &cp, bool want);
-
-       void Allocate(Window &w);
-};
-
-/**
- * Font management.
- */

 class Font {
 protected:
 class Font {
 protected:

-       FontID id;
+       FontID fid;

 #if PLAT_WX
        int ascent;
 #endif
        // Private so Font objects can not be copied
 #if PLAT_WX
        int ascent;
 #endif
        // Private so Font objects can not be copied

-       Font(const Font &) {}
-       Font &operator=(const Font &) { id=0; return *this; }
+       Font(const Font &);
+       Font &operator=(const Font &);

 public:
        Font();
        virtual ~Font();
 
 public:
        Font();
        virtual ~Font();
 

-       virtual void Create(const char *faceName, int characterSet, int size, bool bold, bool italic, bool extraFontFlag=false);
+       virtual void Create(const FontParameters &fp);

        virtual void Release();
 
        virtual void Release();
 

-       FontID GetID() { return id; }
+       FontID GetID() { return fid; }

        // Alias another font - caller guarantees not to Release
        // Alias another font - caller guarantees not to Release

-       void SetID(FontID id_) { id = id_; }
+       void SetID(FontID fid_) { fid = fid_; }
+#if PLAT_WX
+       void SetAscent(int ascent_) { ascent = ascent_; }
+#endif

        friend class Surface;
        friend class Surface;

-        friend class SurfaceImpl;
+       friend class SurfaceImpl;

 };
 
 /**
 };
 
 /**


@@ -303,9 +276,9 @@ private:
        Surface(const Surface &) {}
        Surface &operator=(const Surface &) { return *this; }
 public:
        Surface(const Surface &) {}
        Surface &operator=(const Surface &) { return *this; }
 public:

-       Surface() {};
-       virtual ~Surface() {};
-       static Surface *Allocate();
+       Surface() {}
+       virtual ~Surface() {}
+       static Surface *Allocate(int technology);

 
        virtual void Init(WindowID wid)=0;
        virtual void Init(SurfaceID sid, WindowID wid)=0;
 
        virtual void Init(WindowID wid)=0;
        virtual void Init(SurfaceID sid, WindowID wid)=0;


@@ -313,33 +286,35 @@ public:
 
        virtual void Release()=0;
        virtual bool Initialised()=0;
 
        virtual void Release()=0;
        virtual bool Initialised()=0;

-       virtual void PenColour(ColourAllocated fore)=0;
+       virtual void PenColour(ColourDesired fore)=0;

        virtual int LogPixelsY()=0;
        virtual int DeviceHeightFont(int points)=0;
        virtual void MoveTo(int x_, int y_)=0;
        virtual void LineTo(int x_, int y_)=0;
        virtual int LogPixelsY()=0;
        virtual int DeviceHeightFont(int points)=0;
        virtual void MoveTo(int x_, int y_)=0;
        virtual void LineTo(int x_, int y_)=0;

-       virtual void Polygon(Point *pts, int npts, ColourAllocated fore, ColourAllocated back)=0;
-       virtual void RectangleDraw(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
-       virtual void FillRectangle(PRectangle rc, ColourAllocated back)=0;
+       virtual void Polygon(Point *pts, int npts, ColourDesired fore, ColourDesired back)=0;
+       virtual void RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired back)=0;
+       virtual void FillRectangle(PRectangle rc, ColourDesired back)=0;

        virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0;
        virtual void FillRectangle(PRectangle rc, Surface &surfacePattern)=0;

-       virtual void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
-       virtual void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back)=0;
+       virtual void RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesired back)=0;
+       virtual void AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill,
+               ColourDesired outline, int alphaOutline, int flags)=0;
+       virtual void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) = 0;
+       virtual void Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back)=0;

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

-       virtual void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
-       virtual void DrawTextClipped(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore, ColourAllocated back)=0;
-       virtual void DrawTextTransparent(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore)=0;
-       virtual void MeasureWidths(Font &font_, const char *s, int len, int *positions)=0;
-       virtual int WidthText(Font &font_, const char *s, int len)=0;
-       virtual int WidthChar(Font &font_, char ch)=0;
-       virtual int Ascent(Font &font_)=0;
-       virtual int Descent(Font &font_)=0;
-       virtual int InternalLeading(Font &font_)=0;
-       virtual int ExternalLeading(Font &font_)=0;
-       virtual int Height(Font &font_)=0;
-       virtual int AverageCharWidth(Font &font_)=0;
-
-       virtual int SetPalette(Palette *pal, bool inBackGround)=0;
+       virtual void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back)=0;
+       virtual void DrawTextClipped(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore, ColourDesired back)=0;
+       virtual void DrawTextTransparent(PRectangle rc, Font &font_, XYPOSITION ybase, const char *s, int len, ColourDesired fore)=0;
+       virtual void MeasureWidths(Font &font_, const char *s, int len, XYPOSITION *positions)=0;
+       virtual XYPOSITION WidthText(Font &font_, const char *s, int len)=0;
+       virtual XYPOSITION WidthChar(Font &font_, char ch)=0;
+       virtual XYPOSITION Ascent(Font &font_)=0;
+       virtual XYPOSITION Descent(Font &font_)=0;
+       virtual XYPOSITION InternalLeading(Font &font_)=0;
+       virtual XYPOSITION ExternalLeading(Font &font_)=0;
+       virtual XYPOSITION Height(Font &font_)=0;
+       virtual XYPOSITION AverageCharWidth(Font &font_)=0;
+

        virtual void SetClip(PRectangle rc)=0;
        virtual void FlushCachedState()=0;
 
        virtual void SetClip(PRectangle rc)=0;
        virtual void FlushCachedState()=0;
 


@@ -358,17 +333,31 @@ typedef void (*CallBackAction)(void*);
  */
 class Window {
 protected:
  */
 class Window {
 protected:

-       WindowID id;
+       WindowID wid;
+#if PLAT_MACOSX
+       void *windowRef;
+       void *control;
+#endif

 public:
 public:

-       Window() : id(0), cursorLast(cursorInvalid) {}
-       Window(const Window &source) : id(source.id), cursorLast(cursorInvalid) {}
+       Window() : wid(0), cursorLast(cursorInvalid) {
+#if PLAT_MACOSX
+         windowRef = 0;
+         control = 0;
+#endif
+       }
+       Window(const Window &source) : wid(source.wid), cursorLast(cursorInvalid) {
+#if PLAT_MACOSX
+         windowRef = 0;
+         control = 0;
+#endif
+       }

        virtual ~Window();
        virtual ~Window();

-       Window &operator=(WindowID id_) {
-               id = id_;
+       Window &operator=(WindowID wid_) {
+               wid = wid_;

                return *this;
        }
                return *this;
        }

-       WindowID GetID() const { return id; }
-       bool Created() const { return id != 0; }
+       WindowID GetID() const { return wid; }
+       bool Created() const { return wid != 0; }

        void Destroy();
        bool HasFocus();
        PRectangle GetPosition();
        void Destroy();
        bool HasFocus();
        PRectangle GetPosition();


@@ -382,6 +371,11 @@ public:
        enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand };
        void SetCursor(Cursor curs);
        void SetTitle(const char *s);
        enum Cursor { cursorInvalid, cursorText, cursorArrow, cursorUp, cursorWait, cursorHoriz, cursorVert, cursorReverseArrow, cursorHand };
        void SetCursor(Cursor curs);
        void SetTitle(const char *s);

+       PRectangle GetMonitorRect(Point pt);
+#if PLAT_MACOSX
+       void SetWindow(void *ref) { windowRef = ref; }
+       void SetControl(void *_control) { control = _control; }
+#endif

 private:
        Cursor cursorLast;
 };
 private:
        Cursor cursorLast;
 };


@@ -397,9 +391,10 @@ public:
        static ListBox *Allocate();
 
        virtual void SetFont(Font &font)=0;
        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_, int technology_)=0;

        virtual void SetAverageCharWidth(int width)=0;
        virtual void SetVisibleRows(int rows)=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;
        virtual PRectangle GetDesiredRect()=0;
        virtual int CaretFromEdge()=0;
        virtual void Clear()=0;


@@ -410,18 +405,20 @@ public:
        virtual int Find(const char *prefix)=0;
        virtual void GetValue(int n, char *value, int len)=0;
        virtual void RegisterImage(int type, const char *xpm_data)=0;
        virtual int Find(const char *prefix)=0;
        virtual void GetValue(int n, char *value, int len)=0;
        virtual void RegisterImage(int type, const char *xpm_data)=0;

+       virtual void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) = 0;

        virtual void ClearRegisteredImages()=0;
        virtual void SetDoubleClickAction(CallBackAction, void *)=0;
        virtual void ClearRegisteredImages()=0;
        virtual void SetDoubleClickAction(CallBackAction, void *)=0;

+       virtual void SetList(const char* list, char separator, char typesep)=0;

 };
 
 /**
  * Menu management.
  */
 class Menu {
 };
 
 /**
  * Menu management.
  */
 class Menu {

-       MenuID id;
+       MenuID mid;

 public:
        Menu();
 public:
        Menu();

-       MenuID GetID() { return id; }
+       MenuID GetID() { return mid; }

        void CreatePopUp();
        void Destroy();
        void Show(Point pt, Window &w);
        void CreatePopUp();
        void Destroy();
        void Show(Point pt, Window &w);


@@ -440,7 +437,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;


@@ -503,12 +500,26 @@ public:
 #ifdef  NDEBUG
 #define PLATFORM_ASSERT(c) ((void)0)
 #else
 #ifdef  NDEBUG
 #define PLATFORM_ASSERT(c) ((void)0)
 #else

+#ifdef SCI_NAMESPACE
+#define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Scintilla::Platform::Assert(#c, __FILE__, __LINE__))
+#else

 #define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Platform::Assert(#c, __FILE__, __LINE__))
 #endif
 #define PLATFORM_ASSERT(c) ((c) ? (void)(0) : Platform::Assert(#c, __FILE__, __LINE__))
 #endif

+#endif
+
+#ifdef SCI_NAMESPACE
+}
+#endif

 
 // Shut up annoying Visual C++ warnings:
 #ifdef _MSC_VER
 #pragma warning(disable: 4244 4309 4514 4710)
 #endif
 
 
 // Shut up annoying Visual C++ warnings:
 #ifdef _MSC_VER
 #pragma warning(disable: 4244 4309 4514 4710)
 #endif
 

+#if defined(__GNUC__) && defined(SCINTILLA_QT)
+#pragma GCC diagnostic ignored "-Wmissing-braces"
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#pragma GCC diagnostic ignored "-Wchar-subscripts"
+#endif
+

 #endif
 #endif