Ticket #17671: stcdepitems.patch

File stcdepitems.patch, 21.6 KB (added by NewPagodi, 4 years ago)
  • include/wx/stc/stc.h

    diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
    index 1b73462..a16c8ee 100644
    a b class WXDLLIMPEXP_FWD_CORE wxScrollBar; 
    208208#define wxSTC_INDIC_IME_MAX 35
    209209#define wxSTC_INDIC_MAX 35
    210210#define wxSTC_INDIC_CONTAINER 8
    211 #define wxSTC_INDIC0_MASK 0x20
    212 #define wxSTC_INDIC1_MASK 0x40
    213 #define wxSTC_INDIC2_MASK 0x80
    214 #define wxSTC_INDICS_MASK 0xE0
    215211#define wxSTC_INDICVALUEBIT 0x1000000
    216212#define wxSTC_INDICVALUEMASK 0xFFFFFF
    217213#define wxSTC_INDICFLAG_VALUEFORE 1
    class WXDLLIMPEXP_FWD_CORE wxScrollBar; 
    373369#define wxSTC_VS_NOWRAPLINESTART 4
    374370#define wxSTC_TECHNOLOGY_DEFAULT 0
    375371#define wxSTC_TECHNOLOGY_DIRECTWRITE 1
    376 #define wxSTC_TECHNOLOGY_DIRECTWRITERETAIN 2
    377 #define wxSTC_TECHNOLOGY_DIRECTWRITEDC 3
    378372
    379373/// Line end types which may be used in addition to LF, CR, and CRLF
    380374/// SC_LINE_END_TYPE_UNICODE includes U+2028 Line Separator,
    class WXDLLIMPEXP_FWD_CORE wxScrollBar; 
    24722466
    24732467//}}}
    24742468//----------------------------------------------------------------------
    2475 // The following entries have non-conformant prefixes.  Although preserved
    2476 // here for backwards compatibility, these should be considered deprecated.
    24772469
    2478 // Instead of the following, use the wxSTC_KEYMOD_* entries defined above
    2479 #define wxSTC_SCMOD_NORM 0
    2480 #define wxSTC_SCMOD_SHIFT 1
    2481 #define wxSTC_SCMOD_CTRL 2
    2482 #define wxSTC_SCMOD_ALT 4
    2483 #define wxSTC_SCMOD_SUPER 8
    2484 #define wxSTC_SCMOD_META 16
    24852470
    2486 // Instead of the following, use the wxSTC_VS_* entries defined above
    2487 #define wxSTC_SCVS_NONE 0
    2488 #define wxSTC_SCVS_RECTANGULARSELECTION 1
    2489 #define wxSTC_SCVS_USERACCESSIBLE 2
    2490 #define wxSTC_SCVS_NOWRAPLINESTART 4
     2471#if defined(__clang__) || wxCHECK_GCC_VERSION(4, 5)
     2472    #define wxSTC_STRINGIFY(X) #X
     2473    #define wxSTC_DEPRECATED_MACRO_VALUE(value,msg) \
     2474        _Pragma(wxSTC_STRINGIFY(GCC warning msg)) value
     2475#else
     2476    #define wxSTC_DEPRECATED_MACRO_VALUE(value,msg) value
     2477#endif
     2478
     2479
     2480// The wxSTC_INDIC{0,1,2,S}_MASK values are no longer used in Scintilla
     2481
     2482#if wxCHECK_VISUALC_VERSION(10)
     2483    #pragma deprecated(wxSTC_INDIC0_MASK, wxSTC_INDIC1_MASK, \
     2484                       wxSTC_INDIC2_MASK, wxSTC_INDICS_MASK)
     2485#endif
     2486
     2487#define wxSTC_INDIC0_MASK wxSTC_DEPRECATED_MACRO_VALUE(0x20,\
     2488    "wxSTC_INDIC0_MASK is deprecated. Style byte indicators are no longer used.")
     2489#define wxSTC_INDIC1_MASK wxSTC_DEPRECATED_MACRO_VALUE(0x40,\
     2490    "wxSTC_INDIC1_MASK is deprecated. Style byte indicators are no longer used.")
     2491#define wxSTC_INDIC2_MASK wxSTC_DEPRECATED_MACRO_VALUE(0x80,\
     2492    "wxSTC_INDIC2_MASK is deprecated. Style byte indicators are no longer used.")
     2493#define wxSTC_INDICS_MASK wxSTC_DEPRECATED_MACRO_VALUE(0xE0,\
     2494    "wxSTC_INDICS_MASK is deprecated. Style byte indicators are no longer used.")
     2495
     2496
     2497// The following entries have non-conformant prefixes.
     2498
     2499#if wxCHECK_VISUALC_VERSION(10)
     2500    #pragma deprecated(wxSTC_SCMOD_NORM, wxSTC_SCMOD_SHIFT, wxSTC_SCMOD_CTRL, \
     2501                       wxSTC_SCMOD_ALT, wxSTC_SCMOD_SUPER, wxSTC_SCMOD_META, \
     2502                       wxSTC_SCVS_NONE, wxSTC_SCVS_RECTANGULARSELECTION, \
     2503                       wxSTC_SCVS_USERACCESSIBLE, wxSTC_SCVS_NOWRAPLINESTART)
     2504#endif
     2505
     2506#define wxSTC_SCMOD_NORM wxSTC_DEPRECATED_MACRO_VALUE(0,\
     2507    "wxSTC_SCMOD_NORM is deprecated. Use wxSTC_KEYMOD_NORM instead.")
     2508#define wxSTC_SCMOD_SHIFT wxSTC_DEPRECATED_MACRO_VALUE(1,\
     2509    "wxSTC_SCMOD_SHIFT is deprecated. Use wxSTC_KEYMOD_SHIFT instead.")
     2510#define wxSTC_SCMOD_CTRL wxSTC_DEPRECATED_MACRO_VALUE(2,\
     2511    "wxSTC_SCMOD_CTRL is deprecated. Use wxSTC_KEYMOD_CTRL instead.")
     2512#define wxSTC_SCMOD_ALT wxSTC_DEPRECATED_MACRO_VALUE(4,\
     2513    "wxSTC_SCMOD_ALT is deprecated. Use wxSTC_KEYMOD_ALT instead.")
     2514#define wxSTC_SCMOD_SUPER wxSTC_DEPRECATED_MACRO_VALUE(8,\
     2515    "wxSTC_SCMOD_SUPER is deprecated. Use wxSTC_KEYMOD_SUPER instead.")
     2516#define wxSTC_SCMOD_META wxSTC_DEPRECATED_MACRO_VALUE(16,\
     2517    "wxSTC_SCMOD_META is deprecated. Use wxSTC_KEYMOD_META instead.")
     2518
     2519#define wxSTC_SCVS_NONE wxSTC_DEPRECATED_MACRO_VALUE(0, \
     2520    "wxSTC_SCVS_NONE is deprecated. Use wxSTC_VS_NONE instead.")
     2521#define wxSTC_SCVS_RECTANGULARSELECTION wxSTC_DEPRECATED_MACRO_VALUE(1, \
     2522    "wxSTC_SCVS_RECTANGULARSELECTION is deprecated. Use wxSTC_VS_RECTANGULARSELECTION instead.")
     2523#define wxSTC_SCVS_USERACCESSIBLE wxSTC_DEPRECATED_MACRO_VALUE(2, \
     2524    "wxSTC_SCVS_USERACCESSIBLE is deprecated. Use wxSTC_VS_USERACCESSIBLE instead.")
     2525#define wxSTC_SCVS_NOWRAPLINESTART wxSTC_DEPRECATED_MACRO_VALUE(4, \
     2526    "wxSTC_SCVS_NOWRAPLINESTART is deprecated. Use wxSTC_VS_NOWRAPLINESTART instead.")
    24912527
    24922528
    24932529//----------------------------------------------------------------------
    public: 
    29773013    void SetEOLMode(int eolMode);
    29783014
    29793015    // Set the current styling position to start.
    2980     // The unused parameter is no longer used and should be set to 0.
    2981     void StartStyling(int start, int unused=0);
     3016    void StartStyling(int start);
    29823017
    29833018    // Change style from current styling position for length characters to a style
    29843019    // and move the current styling position to after this newly styled segment.
    public: 
    33013336    // Divide each styling byte into lexical class bits (default: 5) and indicator
    33023337    // bits (default: 3). If a lexer requires more than 32 lexical states, then this
    33033338    // is used to expand the possible states.
     3339    wxDEPRECATED_MSG( "This method uses a function deprecated in the Scintilla library." )
    33043340    void SetStyleBits(int bits);
    33053341
    33063342    // Retrieve number of bits in style bytes used to hold the lexical state.
     3343    wxDEPRECATED_MSG( "This method uses a function deprecated in the Scintilla library." )
    33073344    int GetStyleBits() const;
    33083345
    33093346    // Used to hold extra styling information for each line.
    public: 
    49655002    int GetPropertyInt(const wxString &key, int defaultValue=0) const;
    49665003
    49675004    // Retrieve the number of bits the current lexer needs for styling.
     5005    wxDEPRECATED_MSG( "This method uses a function deprecated in the Scintilla library." )
    49685006    int GetStyleBitsNeeded() const;
    49695007
    49705008    // Retrieve the lexing language of the document.
    public: 
    53595397    wxDEPRECATED_MSG("use UsePopUp(int) instead.")
    53605398    void UsePopUp(bool allowPopUp);
    53615399
     5400    wxDEPRECATED_MSG("use StartStyling(int start) instead.")
     5401    void StartStyling(int start, int unused);
     5402
    53625403
    53635404    static wxVersionInfo GetLibraryVersionInfo();
    53645405
  • interface/wx/stc/stc.h

    diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h
    index d059b6b..c3fafbb 100644
    a b  
    164164#define wxSTC_INDIC_IME_MAX 35
    165165#define wxSTC_INDIC_MAX 35
    166166#define wxSTC_INDIC_CONTAINER 8
    167 #define wxSTC_INDIC0_MASK 0x20
    168 #define wxSTC_INDIC1_MASK 0x40
    169 #define wxSTC_INDIC2_MASK 0x80
    170 #define wxSTC_INDICS_MASK 0xE0
    171167#define wxSTC_INDICVALUEBIT 0x1000000
    172168#define wxSTC_INDICVALUEMASK 0xFFFFFF
    173169#define wxSTC_INDICFLAG_VALUEFORE 1
     
    329325#define wxSTC_VS_NOWRAPLINESTART 4
    330326#define wxSTC_TECHNOLOGY_DEFAULT 0
    331327#define wxSTC_TECHNOLOGY_DIRECTWRITE 1
    332 #define wxSTC_TECHNOLOGY_DIRECTWRITERETAIN 2
    333 #define wxSTC_TECHNOLOGY_DIRECTWRITEDC 3
    334328
    335329/// Line end types which may be used in addition to LF, CR, and CRLF
    336330/// SC_LINE_END_TYPE_UNICODE includes U+2028 Line Separator,
     
    24282422
    24292423//}}}
    24302424
     2425
     2426//The following values are deprecated in the Scintilla library
     2427
     2428///@deprecated
     2429#define wxSTC_INDIC0_MASK 0x20
     2430
     2431///@deprecated
     2432#define wxSTC_INDIC1_MASK 0x40
     2433
     2434///@deprecated
     2435#define wxSTC_INDIC2_MASK 0x80
     2436
     2437///@deprecated
     2438#define wxSTC_INDICS_MASK 0xE0
     2439
     2440
    24312441// Commands that can be bound to keystrokes {{{
    24322442
    24332443
    public: 
    43174327
    43184328    /**
    43194329        Set the current styling position to start.
    4320         The unused parameter is no longer used and should be set to 0.
    43214330    */
    4322     void StartStyling(int start, int unused=0);
     4331    void StartStyling(int start);
    43234332
    43244333    /**
    43254334        Change style from current styling position for length characters to a style
  • src/stc/gen_docs.py

    diff --git a/src/stc/gen_docs.py b/src/stc/gen_docs.py
    index 41f6974..42b0680 100644
    a b docSubstitutions = { 
    806806    'TextWidth':{'NUL terminated text argument.':''},
    807807    'GetCurLine':{'Result is NUL-terminated.':'',
    808808        'Returns the index of the caret on the line.':''},
     809    'StartStyling':
     810        {'The unused parameter is no longer used and should be set to 0.':''},
    809811
    810812    'DescribeKeyWordSets':{'\\n':'\\\\n','Result is NUL-terminated.':''},
    811813    'PropertyNames':{'\\n':'\\\\n','Result is NUL-terminated.':''},
    sinceAnnotations= { 
    13551357
    13561358#----------------------------------------------------------------------------
    13571359
    1358 def buildDocs(name, docs):
     1360def buildDocs(name, docs, icat):
    13591361    docsLong = 0
    13601362
    13611363    # If an item does not have a category or the category to which it is
    def buildDocs(name, docs): 
    13841386    if name in extendedDocs:
    13851387        docsLong = extendedDocs[name]
    13861388
     1389    if icat=='Provisional':
     1390        note = ('','This method is provisional and is subject to change'
     1391                'in future versions of wxStyledTextCtrl.',)
     1392        if docsLong==0:
     1393            docsLong = note
     1394        else:
     1395            docsLong = docsLong + note
     1396
    13871397    if name in sinceAnnotations:
    13881398        note = ('@since '+sinceAnnotations[name],)
    13891399        if docsLong==0:
    def buildDocs(name, docs): 
    13911401        else:
    13921402            docsLong = docsLong + note
    13931403
    1394     if category=='DeprecatedMessages':
     1404    if category=='DeprecatedMessages' or icat=='Deprecated':
    13951405        note = ('@deprecated',)
    13961406        if docsLong==0:
    13971407            docsLong = note
  • src/stc/gen_iface.py

    diff --git a/src/stc/gen_iface.py b/src/stc/gen_iface.py
    index 67a235a..38a45e9 100755
    a b cmdValues = [ 2011, 
    6868# Should a function be also generated for the CMDs?
    6969FUNC_FOR_CMD = 1
    7070
     71# Should methods and values be generated for the provisional Scintilla items?
     72GENERATE_PROVISIONAL_ITEMS = 0
     73
     74# No wxSTC value will be generated for the following Scintilla values.
     75notMappedSciValues = {
     76    'SC_TECHNOLOGY_DIRECTWRITERETAIN',
     77    'SC_TECHNOLOGY_DIRECTWRITEDC',
     78    'INDIC0_MASK',
     79    'INDIC1_MASK',
     80    'INDIC2_MASK',
     81    'INDICS_MASK'
     82}
    7183
    7284# Map some generic typenames to wx types, using return value syntax
    7385retTypeMap = {
    methodOverrideMap = { 
    452464
    453465    'StartStyling' :
    454466    (0,
    455      'void %s(int start, int unused=0);',
    456 
    457      '''void %s(int start, int unused) {
    458         wxASSERT_MSG(unused==0,
    459                      "The second argument passed to StartStyling should be 0");
     467     'void %s(int start);',
    460468
    461         SendMsg(%s, start, unused);'''
     469     '''void %s(int start) {
     470        SendMsg(%s, start, 0);'''
    462471    ),
    463472
    464473    'SetStylingEx' :
    methodOverrideMap = { 
    11111120         return stc2wx(buf);'''
    11121121    ),
    11131122
     1123    'SetKeysUnicode' : (None,0,0),
     1124    'GetKeysUnicode' : (None,0,0),
     1125
    11141126    '' : ('', 0, 0),
    11151127
    11161128    }
    def processIface(iface, h_tmplt, cpp_tmplt, ih_tmplt, h_dest, cpp_dest, docstr_d 
    11501162    values = []
    11511163    methods = []
    11521164    cmds = []
     1165    icat = 'Basics'
    11531166
    11541167    # parse iface file
    11551168    fi = FileInput(iface)
    def processIface(iface, h_tmplt, cpp_tmplt, ih_tmplt, h_dest, cpp_dest, docstr_d 
    11641177            curDocStrings.append(line[2:])
    11651178
    11661179        elif op == 'val ':
    1167             parseVal(line[4:], values, curDocStrings)
     1180            parseVal(line[4:], values, curDocStrings, icat)
    11681181            curDocStrings = []
    11691182
    11701183        elif op == 'fun ' or op == 'set ' or op == 'get ':
    1171             parseFun(line[4:], methods, curDocStrings, cmds, op == 'get ', msgcodes)
     1184            parseFun(line[4:], methods, curDocStrings, cmds, op == 'get ', msgcodes, icat)
    11721185            curDocStrings = []
    11731186
    11741187        elif op == 'cat ':
    1175             if line[4:].strip() == 'Deprecated':
    1176                 break    # skip the rest of the file
     1188            icat = line[4:].strip()
     1189            curDocStrings = []
    11771190
    11781191        elif op == 'evt ':
    11791192            pass
    def processMethods(methods): 
    12771290    for c in categoriesList:
    12781291        piecesForInterface[c[0]]=[]
    12791292
    1280     for retType, interfName, number, param1, param2, docs, is_const, is_override in methods:
     1293    for retType, interfName, number, param1, param2, docs, is_const, is_override, icat in methods:
    12811294        retType = retTypeMap.get(retType, retType)
    12821295        params = makeParamString(param1, param2)
    12831296
     1297        if icat=='Provisional' and not GENERATE_PROVISIONAL_ITEMS:
     1298            continue
     1299
    12841300        name, theDef, theImp = checkMethodOverride(interfName, number)
    12851301
    12861302        if name is None:
    12871303            continue
    12881304
    1289         category, docs, docsLong = buildDocs(interfName, docs)
     1305        category, docs, docsLong = buildDocs(interfName, docs, icat)
    12901306
    12911307        # Build docstrings
    12921308        st = 'DocStr(wxStyledTextCtrl::%s,\n' \
    def processMethods(methods): 
    13051321            if is_override:
    13061322                theDef = theDef + ' wxOVERRIDE'
    13071323            theDef = theDef + ';'
     1324        if category=='DeprecatedMessages' or icat=='Deprecated':
     1325            defs.append('    wxDEPRECATED_MSG( "This method uses a function '
     1326                        'deprecated in the Scintilla library." )')
    13081327        defs.append(theDef)
    13091328
    13101329        # Skip override from the interface file
    def makeParamString(param1, param2): 
    14341453
    14351454#----------------------------------------------------------------------------
    14361455
    1437 def parseVal(line, values, docs):
     1456def parseVal(line, values, docs, icat):
    14381457    name, val = line.split('=')
    14391458
     1459    if name in notMappedSciValues:
     1460            return
     1461
     1462    if icat=='Deprecated':
     1463        docs.append('@deprecated')
     1464
     1465    if icat=='Provisional':
     1466        if GENERATE_PROVISIONAL_ITEMS:
     1467            docs.append('This item is a provisional value and is subject '
     1468                        'to change')
     1469            docs.append('in future versions of wxStyledTextCtrl.')
     1470        else:
     1471            return
     1472
    14401473    # remove prefixes such as SCI, etc.
    14411474    for old, new in valPrefixes:
    14421475        lo = len(old)
    funregex = re.compile(r'\s*([a-zA-Z0-9_]+)' # <ws>return type 
    14561489                      '\(([ a-zA-Z0-9_]*),'  # (param,
    14571490                      '([ a-zA-Z0-9_]*),*\)')  # param)
    14581491
    1459 def parseFun(line, methods, docs, values, is_const, msgcodes):
     1492def parseFun(line, methods, docs, values, is_const, msgcodes, icat):
    14601493    def parseParam(param):
    14611494        param = param.strip()
    14621495        if param == '':
    def parseFun(line, methods, docs, values, is_const, msgcodes): 
    14781511    num = int(number)
    14791512    for v in cmdValues:
    14801513        if (type(v) == type(()) and v[0] <= num <= v[1]) or v == num:
    1481             parseVal('CMD_%s=%s' % (name.upper(), number), values, docs)
     1514            parseVal('CMD_%s=%s' % (name.upper(), number), values, docs, 'Basics')
    14821515
    14831516            # if we are not also doing a function for CMD values, then
    14841517            # just return, otherwise fall through to the append blow.
    def parseFun(line, methods, docs, values, is_const, msgcodes): 
    14911524    else:
    14921525        code = number
    14931526    methods.append( (retType, name, code, param1, param2, tuple(docs),
    1494                      is_const or name in constNonGetterMethods, name in overrideNeeded) )
     1527                     is_const or name in constNonGetterMethods,
     1528                     name in overrideNeeded, icat) )
    14951529
    14961530
    14971531#----------------------------------------------------------------------------
  • src/stc/stc.cpp

    diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
    index c45d240..25e3b44 100644
    a b void wxStyledTextCtrl::SetEOLMode(int eolMode) 
    508508}
    509509
    510510// Set the current styling position to start.
    511 // The unused parameter is no longer used and should be set to 0.
    512 void wxStyledTextCtrl::StartStyling(int start, int unused) {
    513         wxASSERT_MSG(unused==0,
    514                      "The second argument passed to StartStyling should be 0");
    515 
    516         SendMsg(SCI_STARTSTYLING, start, unused);
     511void wxStyledTextCtrl::StartStyling(int start) {
     512        SendMsg(SCI_STARTSTYLING, start, 0);
    517513}
    518514
    519515// Change style from current styling position for length characters to a style
    void wxStyledTextCtrl::UsePopUp(bool allowPopUp) 
    51955191    SendMsg(SCI_USEPOPUP, allowPopUp ? SC_POPUP_ALL : SC_POPUP_NEVER, 0);
    51965192}
    51975193
     5194void wxStyledTextCtrl::StartStyling(int start, int unused)
     5195{
     5196        wxASSERT_MSG(unused==0,
     5197                     "The second argument passed to StartStyling should be 0");
     5198
     5199        SendMsg(SCI_STARTSTYLING, start, unused);
     5200}
     5201
    51985202//----------------------------------------------------------------------
    51995203// Event handlers
    52005204
  • src/stc/stc.cpp.in

    diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in
    index 9b56e3a..411505f 100644
    a b void wxStyledTextCtrl::UsePopUp(bool allowPopUp) 
    670670    SendMsg(SCI_USEPOPUP, allowPopUp ? SC_POPUP_ALL : SC_POPUP_NEVER, 0);
    671671}
    672672
     673void wxStyledTextCtrl::StartStyling(int start, int unused)
     674{
     675        wxASSERT_MSG(unused==0,
     676                     "The second argument passed to StartStyling should be 0");
     677
     678        SendMsg(SCI_STARTSTYLING, start, unused);
     679}
     680
    673681//----------------------------------------------------------------------
    674682// Event handlers
    675683
  • src/stc/stc.h.in

    diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
    index d39c3b5..86baff0 100644
    a b class WXDLLIMPEXP_FWD_CORE wxScrollBar; 
    6262
    6363//}}}
    6464//----------------------------------------------------------------------
    65 // The following entries have non-conformant prefixes.  Although preserved
    66 // here for backwards compatibility, these should be considered deprecated.
    6765
    68 // Instead of the following, use the wxSTC_KEYMOD_* entries defined above
    69 #define wxSTC_SCMOD_NORM 0
    70 #define wxSTC_SCMOD_SHIFT 1
    71 #define wxSTC_SCMOD_CTRL 2
    72 #define wxSTC_SCMOD_ALT 4
    73 #define wxSTC_SCMOD_SUPER 8
    74 #define wxSTC_SCMOD_META 16
    7566
    76 // Instead of the following, use the wxSTC_VS_* entries defined above
    77 #define wxSTC_SCVS_NONE 0
    78 #define wxSTC_SCVS_RECTANGULARSELECTION 1
    79 #define wxSTC_SCVS_USERACCESSIBLE 2
    80 #define wxSTC_SCVS_NOWRAPLINESTART 4
     67#if defined(__clang__) || wxCHECK_GCC_VERSION(4, 5)
     68    #define wxSTC_STRINGIFY(X) #X
     69    #define wxSTC_DEPRECATED_MACRO_VALUE(value,msg) \
     70        _Pragma(wxSTC_STRINGIFY(GCC warning msg)) value
     71#else
     72    #define wxSTC_DEPRECATED_MACRO_VALUE(value,msg) value
     73#endif
     74
     75
     76// The wxSTC_INDIC{0,1,2,S}_MASK values are no longer used in Scintilla
     77
     78#if wxCHECK_VISUALC_VERSION(10)
     79    #pragma deprecated(wxSTC_INDIC0_MASK, wxSTC_INDIC1_MASK, \
     80                       wxSTC_INDIC2_MASK, wxSTC_INDICS_MASK)
     81#endif
     82
     83#define wxSTC_INDIC0_MASK wxSTC_DEPRECATED_MACRO_VALUE(0x20,\
     84    "wxSTC_INDIC0_MASK is deprecated. Style byte indicators are no longer used.")
     85#define wxSTC_INDIC1_MASK wxSTC_DEPRECATED_MACRO_VALUE(0x40,\
     86    "wxSTC_INDIC1_MASK is deprecated. Style byte indicators are no longer used.")
     87#define wxSTC_INDIC2_MASK wxSTC_DEPRECATED_MACRO_VALUE(0x80,\
     88    "wxSTC_INDIC2_MASK is deprecated. Style byte indicators are no longer used.")
     89#define wxSTC_INDICS_MASK wxSTC_DEPRECATED_MACRO_VALUE(0xE0,\
     90    "wxSTC_INDICS_MASK is deprecated. Style byte indicators are no longer used.")
     91
     92
     93// The following entries have non-conformant prefixes.
     94
     95#if wxCHECK_VISUALC_VERSION(10)
     96    #pragma deprecated(wxSTC_SCMOD_NORM, wxSTC_SCMOD_SHIFT, wxSTC_SCMOD_CTRL, \
     97                       wxSTC_SCMOD_ALT, wxSTC_SCMOD_SUPER, wxSTC_SCMOD_META, \
     98                       wxSTC_SCVS_NONE, wxSTC_SCVS_RECTANGULARSELECTION, \
     99                       wxSTC_SCVS_USERACCESSIBLE, wxSTC_SCVS_NOWRAPLINESTART)
     100#endif
     101
     102#define wxSTC_SCMOD_NORM wxSTC_DEPRECATED_MACRO_VALUE(0,\
     103    "wxSTC_SCMOD_NORM is deprecated. Use wxSTC_KEYMOD_NORM instead.")
     104#define wxSTC_SCMOD_SHIFT wxSTC_DEPRECATED_MACRO_VALUE(1,\
     105    "wxSTC_SCMOD_SHIFT is deprecated. Use wxSTC_KEYMOD_SHIFT instead.")
     106#define wxSTC_SCMOD_CTRL wxSTC_DEPRECATED_MACRO_VALUE(2,\
     107    "wxSTC_SCMOD_CTRL is deprecated. Use wxSTC_KEYMOD_CTRL instead.")
     108#define wxSTC_SCMOD_ALT wxSTC_DEPRECATED_MACRO_VALUE(4,\
     109    "wxSTC_SCMOD_ALT is deprecated. Use wxSTC_KEYMOD_ALT instead.")
     110#define wxSTC_SCMOD_SUPER wxSTC_DEPRECATED_MACRO_VALUE(8,\
     111    "wxSTC_SCMOD_SUPER is deprecated. Use wxSTC_KEYMOD_SUPER instead.")
     112#define wxSTC_SCMOD_META wxSTC_DEPRECATED_MACRO_VALUE(16,\
     113    "wxSTC_SCMOD_META is deprecated. Use wxSTC_KEYMOD_META instead.")
     114
     115#define wxSTC_SCVS_NONE wxSTC_DEPRECATED_MACRO_VALUE(0, \
     116    "wxSTC_SCVS_NONE is deprecated. Use wxSTC_VS_NONE instead.")
     117#define wxSTC_SCVS_RECTANGULARSELECTION wxSTC_DEPRECATED_MACRO_VALUE(1, \
     118    "wxSTC_SCVS_RECTANGULARSELECTION is deprecated. Use wxSTC_VS_RECTANGULARSELECTION instead.")
     119#define wxSTC_SCVS_USERACCESSIBLE wxSTC_DEPRECATED_MACRO_VALUE(2, \
     120    "wxSTC_SCVS_USERACCESSIBLE is deprecated. Use wxSTC_VS_USERACCESSIBLE instead.")
     121#define wxSTC_SCVS_NOWRAPLINESTART wxSTC_DEPRECATED_MACRO_VALUE(4, \
     122    "wxSTC_SCVS_NOWRAPLINESTART is deprecated. Use wxSTC_VS_NOWRAPLINESTART instead.")
    81123
    82124
    83125//----------------------------------------------------------------------
    public: 
    482524    wxDEPRECATED_MSG("use UsePopUp(int) instead.")
    483525    void UsePopUp(bool allowPopUp);
    484526
     527    wxDEPRECATED_MSG("use StartStyling(int start) instead.")
     528    void StartStyling(int start, int unused);
     529
    485530
    486531    static wxVersionInfo GetLibraryVersionInfo();
    487532
  • src/stc/stc.interface.h.in

    diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in
    index 2e4d121..7a47fbc 100644
    a b  
    1818
    1919//}}}
    2020
     21
     22//The following values are deprecated in the Scintilla library
     23
     24///@deprecated
     25#define wxSTC_INDIC0_MASK 0x20
     26
     27///@deprecated
     28#define wxSTC_INDIC1_MASK 0x40
     29
     30///@deprecated
     31#define wxSTC_INDIC2_MASK 0x80
     32
     33///@deprecated
     34#define wxSTC_INDICS_MASK 0xE0
     35
     36
    2137// Commands that can be bound to keystrokes {{{
    2238
    2339%(CMDS)s