Apply patch 1520776, partial completion on wxOwnerDrawnComboBox

[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 7f5985c7657bd39d2fec7197cd487aa1be985bd6..88a05272fdc66b0d577e5668c1b5bef4392e8096 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 wxWindows.
+ ** Implemented in PlatGTK.cxx for GTK+/Linux, PlatWin.cxx for Windows, and PlatWX.cxx for wxWidgets.

  **/
 // 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,7 +12,7 @@
 // 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 wxWindows on any supported platform
+// PLAT_WX is wxWidgets on any supported platform

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


@@ -44,11 +44,6 @@
 #endif
 
 
 #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
 
 // 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
 


@@ -57,6 +52,8 @@ typedef void *SurfaceID;
 typedef void *WindowID;
 typedef void *MenuID;
 typedef void *TickerID;
 typedef void *WindowID;
 typedef void *MenuID;
 typedef void *TickerID;

+typedef void *Function;
+typedef void *IdlerID;

 
 /**
  * A geometric point class.
 
 /**
  * A geometric point class.


@@ -67,7 +64,7 @@ public:
        int x;
        int y;
 
        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
        }
 
        // Other automatically defined methods (assignment, copy constructor, destructor) are fine


@@ -282,7 +279,8 @@ public:
        Font();
        virtual ~Font();
 
        Font();
        virtual ~Font();
 

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

        virtual void Release();
 
        FontID GetID() { return id; }
        virtual void Release();
 
        FontID GetID() { return id; }


@@ -395,9 +393,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;


@@ -407,10 +406,10 @@ public:
        virtual int GetSelection()=0;
        virtual int Find(const char *prefix)=0;
        virtual void GetValue(int n, char *value, int len)=0;
        virtual int GetSelection()=0;
        virtual int Find(const char *prefix)=0;
        virtual void GetValue(int n, char *value, int len)=0;

-       virtual void Sort()=0;

        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;

 };
 
 /**
 };
 
 /**


@@ -434,6 +433,23 @@ public:
        double Duration(bool reset=false);
 };
 
        double Duration(bool reset=false);
 };
 

+/**
+ * Dynamic Library (DLL/SO/...) loading
+ */
+class DynamicLibrary {
+public:
+       virtual ~DynamicLibrary() {};
+
+       /// @return Pointer to function "name", or NULL on failure.
+       virtual Function FindFunction(const char *name) = 0;
+
+       /// @return true if the library was loaded successfully.
+       virtual bool IsValid() = 0;
+
+       /// @return An instance of a DynamicLibrary subclass with "modulePath" loaded.
+       static DynamicLibrary *Load(const char *modulePath);
+};
+

 /**
  * Platform class used to retrieve system wide parameters such as double click speed
  * and chrome colour. Not a creatable object, more of a module with several functions.
 /**
  * Platform class used to retrieve system wide parameters such as double click speed
  * and chrome colour. Not a creatable object, more of a module with several functions.