Use the data scheme to load resources in the WebKitGTK+ implementation, rather than...

[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 1e3bd69d752e263134a739f8cda9eb722a11505c..b5d6d9bf8d4b543eaebcd364072bf52b05fa5221 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,10 +12,11 @@
 // 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_MACOSX 0

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


@@ -32,17 +33,25 @@
 #undef PLAT_GTK
 #define PLAT_GTK 1
 
 #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
 

+#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
 

+#ifdef SCI_NAMESPACE
+namespace Scintilla {
+#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
 
 // 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


@@ -114,6 +123,9 @@ public:
        }
        int Width() { return right - left; }
        int Height() { return bottom - top; }
        }
        int Width() { return right - left; }
        int Height() { return bottom - top; }

+       bool Empty() {
+               return (Height() <= 0) || (Width() <= 0);
+       }

 };
 
 /**
 };
 
 /**


@@ -236,12 +248,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;


@@ -268,24 +283,24 @@ public:
  */
 class Font {
 protected:
  */
 class Font {
 protected:

-       FontID id;
+       FontID fid;

 #if PLAT_WX
        int ascent;
 #endif
        // Private so Font objects can not be copied
        Font(const Font &) {}
 #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 &operator=(const Font &) { fid=0; return *this; }

 public:
        Font();
        virtual ~Font();
 
        virtual void Create(const char *faceName, int characterSet, int size,
 public:
        Font();
        virtual ~Font();
 
        virtual void Create(const char *faceName, int characterSet, int size,

-               bool bold, bool italic, bool extraFontFlag=false);
+               bool bold, bool italic, int extraFontFlag=0);

        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_; }

        friend class Surface;
         friend class SurfaceImpl;
 };
        friend class Surface;
         friend class SurfaceImpl;
 };


@@ -319,6 +334,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;
 


@@ -354,17 +371,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();


@@ -378,6 +409,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;
 };


@@ -393,9 +429,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_)=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;


@@ -408,16 +445,17 @@ public:
        virtual void RegisterImage(int type, const char *xpm_data)=0;
        virtual void ClearRegisteredImages()=0;
        virtual void SetDoubleClickAction(CallBackAction, void *)=0;
        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;

 };
 
 /**
  * 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);


@@ -499,8 +537,16 @@ 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
 
 // Shut up annoying Visual C++ warnings:
 #ifdef _MSC_VER