The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

[wxWidgets.git] / contrib / src / stc / scintilla / include / PropSet.h

diff --git a/contrib/src/stc/scintilla/include/PropSet.h b/contrib/src/stc/scintilla/include/PropSet.h
index 0b4c2f58de2046a4a95d06e9769ff79cae2f187d..32aea8a0c7f59ce6b7f7873d3d47593e44c9e060 100644 (file)
--- a/contrib/src/stc/scintilla/include/PropSet.h
+++ b/contrib/src/stc/scintilla/include/PropSet.h
@@ -39,12 +39,14 @@ protected:
                return ret;
        }
        static bool IncludesVar(const char *value, const char *key);
                return ret;
        }
        static bool IncludesVar(const char *value, const char *key);

+

 public:
        PropSet *superPS;
        PropSet();
        ~PropSet();
        void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1);
        void Set(const char *keyVal);
 public:
        PropSet *superPS;
        PropSet();
        ~PropSet();
        void Set(const char *key, const char *val, int lenKey=-1, int lenVal=-1);
        void Set(const char *keyVal);

+       void Unset(const char *key, int lenKey=-1);

        void SetMultiple(const char *s);
        SString Get(const char *key);
        SString GetExpanded(const char *key);
        void SetMultiple(const char *s);
        SString Get(const char *key);
        SString GetExpanded(const char *key);


@@ -85,9 +87,9 @@ public:
        char *Allocate(int size);
        void SetFromAllocated();
        bool InList(const char *s);
        char *Allocate(int size);
        void SetFromAllocated();
        bool InList(const char *s);

-       const char *GetNearestWord(const char *wordStart, int searchLen = -1,
+       const char *GetNearestWord(const char *wordStart, int searchLen,

                bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);
                bool ignoreCase = false, SString wordCharacters="", int wordIndex = -1);

-       char *GetNearestWords(const char *wordStart, int searchLen=-1,
+       char *GetNearestWords(const char *wordStart, int searchLen,

                bool ignoreCase=false, char otherSeparator='\0', bool exactLen=false);
 };
 
                bool ignoreCase=false, char otherSeparator='\0', bool exactLen=false);
 };