aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/PropSet.h
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2000-07-03 08:28:47 +0000
committernyamatongwe <devnull@localhost>2000-07-03 08:28:47 +0000
commit067aef7d295fe623e6b6bf7fe90b31819e37c8ba (patch)
treea1c4a6bc312af180eb260af10d76aff9ec267718 /include/PropSet.h
parentc5164f693e8468a022e2b67add63b653b889cac9 (diff)
downloadscintilla-mirror-067aef7d295fe623e6b6bf7fe90b31819e37c8ba.tar.gz
Added 'if' and 'import' statements to properties files.
Diffstat (limited to 'include/PropSet.h')
-rw-r--r--include/PropSet.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/PropSet.h b/include/PropSet.h
index 2326ba5c4..4e30c37c5 100644
--- a/include/PropSet.h
+++ b/include/PropSet.h
@@ -108,11 +108,11 @@ private:
char **vals;
int size;
int used;
+ void EnsureCanAddEntry();
public:
PropSet *superPS;
PropSet();
~PropSet();
- void EnsureCanAddEntry();
void Set(const char *key, const char *val);
void Set(char *keyval);
SString Get(const char *key);
@@ -120,8 +120,8 @@ public:
SString GetWild(const char *keybase, const char *filename);
SString GetNewExpand(const char *keybase, const char *filename);
void Clear();
- void ReadFromMemory(const char *data, int len);
- void Read(const char *filename);
+ void ReadFromMemory(const char *data, int len, const char *directoryForImports=0);
+ void Read(const char *filename, const char *directoryForImports);
};
// This is a fixed length list of strings suitable for display in combo boxes