Digital Mars compilation warnings and Unicode fixes (patch 884587)

[wxWidgets.git] / src / stc / gen_iface.py

diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
index d88aae231bc64d1d357d9b21528b379d9bc3b229..070d4cbe90e78dbbe30e99f022082745b93b33b2 100644 (file)
--- a/src/stc/gen_iface.py
+++ b/src/stc/gen_iface.py
@@ -44,6 +44,7 @@ cmdValues = [ (2300, 2349),
               (2395, 2396),
               2404,
               (2413, 2416),
               (2395, 2396),
               2404,
               (2413, 2416),

+              (2426, 2442),

               (2450, 2454),
             ]
 
               (2450, 2454),
             ]
 


@@ -275,6 +276,7 @@ methodOverrideMap = {
     'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 0,0,0),
     'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
     'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),
     'AutoCGetDropRestOfWord' : ('AutoCompGetDropRestOfWord', 0,0,0),
     'AutoCGetTypeSeparator' : ('AutoCompGetTypeSeparator', 0, 0, 0),
     'AutoCSetTypeSeparator' : ('AutoCompSetTypeSeparator', 0, 0, 0),

+    'AutoCGetCurrent'       : ('AutoCompGetCurrent', 0, 0, 0),

 
     'RegisterImage' :
     (0,
 
     'RegisterImage' :
     (0,


@@ -330,14 +332,14 @@ methodOverrideMap = {
                int    startPos,
                int    endPos,
                wxDC*  draw,
                int    startPos,
                int    endPos,
                wxDC*  draw,

-               wxDC*  target,  // Why does it use two? Can they be the same?
+               wxDC*  target, 

                wxRect renderRect,
                wxRect pageRect);''',
      ''' int %s(bool   doDraw,
                 int    startPos,
                 int    endPos,
                 wxDC*  draw,
                wxRect renderRect,
                wxRect pageRect);''',
      ''' int %s(bool   doDraw,
                 int    startPos,
                 int    endPos,
                 wxDC*  draw,

-                wxDC*  target,  // Why does it use two? Can they be the same?
+                wxDC*  target, 

                 wxRect renderRect,
                 wxRect pageRect) {
              RangeToFormat fr;
                 wxRect renderRect,
                 wxRect pageRect) {
              RangeToFormat fr;


@@ -547,9 +549,12 @@ methodOverrideMap = {
 
 
     'GrabFocus' : (None, 0, 0, 0),
 
 
     'GrabFocus' : (None, 0, 0, 0),

+
+    # Rename some that woudl otherwise hid the wxWindow methods

     'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),
     'SetFocus'  : ('SetSTCFocus', 0, 0, 0),
     'GetFocus'  : ('GetSTCFocus', 0, 0, 0),

-
+    'SetCursor' : ('SetSTCCursor', 0, 0, 0),
+    'GetCursor' : ('GetSTCCursor', 0, 0, 0),

 
     'LoadLexerLibrary' : (None, 0,0,0),
 
 
     'LoadLexerLibrary' : (None, 0,0,0),
 


@@ -612,8 +617,23 @@ methodOverrideMap = {
     'ParaDownExtend' : (None, 0, 0, 0),
     'ParaUp' : (None, 0, 0, 0),
     'ParaUpExtend' : (None, 0, 0, 0),
     'ParaDownExtend' : (None, 0, 0, 0),
     'ParaUp' : (None, 0, 0, 0),
     'ParaUpExtend' : (None, 0, 0, 0),

-
-
+    'LineDownRectExtend' : (None, 0, 0, 0),
+    'LineUpRectExtend' : (None, 0, 0, 0),
+    'CharLeftRectExtend' : (None, 0, 0, 0),
+    'CharRightRectExtend' : (None, 0, 0, 0),
+    'HomeRectExtend' : (None, 0, 0, 0),
+    'VCHomeRectExtend' : (None, 0, 0, 0),
+    'LineEndRectExtend' : (None, 0, 0, 0),
+    'PageUpRectExtend' : (None, 0, 0, 0),
+    'PageDownRectExtend' : (None, 0, 0, 0),
+    'StutteredPageUp' : (None, 0, 0, 0),
+    'StutteredPageUpExtend' : (None, 0, 0, 0),
+    'StutteredPageDown' : (None, 0, 0, 0),
+    'StutteredPageDownExtend' : (None, 0, 0, 0),
+    'WordLeftEnd' : (None, 0, 0, 0),
+    'WordLeftEndExtend' : (None, 0, 0, 0),
+    'WordRightEnd' : (None, 0, 0, 0),
+    'WordRightEndExtend' : (None, 0, 0, 0),

 
     '' : ('', 0, 0, 0),
 
 
     '' : ('', 0, 0, 0),