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 e6385da71ddf818c245c11d665e81a64e35ffbb0..88a05272fdc66b0d577e5668c1b5bef4392e8096 100644 (file)
--- a/src/stc/scintilla/include/Platform.h
+++ b/src/stc/scintilla/include/Platform.h
@@ -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
 


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


@@ -398,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;


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

 };
 
 /**
 };
 
 /**