Added wxComboCtrl::SetHint(), GetHint()

[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 9dafa9f7d6e78f9ae274100ecee4e4d827a4475a..79be33f6bae81d8de4e04d5d30040f6b06280e30 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -1,7 +1,7 @@
 // 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>
 // The License.txt file describes the conditions under which this software may be distributed.
  **/
 // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org>
 // The License.txt file describes the conditions under which this software may be distributed.


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


@@ -37,12 +38,19 @@
 #define PLAT_GTK_WIN32 1
 #endif
 
 #define PLAT_GTK_WIN32 1
 #endif
 

+#elif defined(MACOSX)
+#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 +122,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);
+       }

 };
 
 /**
 };
 
 /**


@@ -360,9 +371,23 @@ typedef void (*CallBackAction)(void*);
 class Window {
 protected:
        WindowID id;
 class Window {
 protected:
        WindowID id;

+#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() : id(0), cursorLast(cursorInvalid) {
+#if PLAT_MACOSX
+         windowRef = 0;
+         control = 0;
+#endif
+       }
+       Window(const Window &source) : id(source.id), cursorLast(cursorInvalid) {
+#if PLAT_MACOSX
+         windowRef = 0;
+         control = 0;
+#endif
+       }

        virtual ~Window();
        Window &operator=(WindowID id_) {
                id = id_;
        virtual ~Window();
        Window &operator=(WindowID id_) {
                id = id_;


@@ -383,6 +408,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;
 };


@@ -506,8 +536,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