From 56d6a8af344938367c3d01c3969c212b3d3b9427 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 17 Feb 2023 12:50:07 +1100 Subject: Remove PropGetExpanded and treat GetPropertyExpanded as GetProperty since it no longer expands property references. --- src/ScintillaBase.cxx | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'src') diff --git a/src/ScintillaBase.cxx b/src/ScintillaBase.cxx index f8b3aefda..02b8040a4 100644 --- a/src/ScintillaBase.cxx +++ b/src/ScintillaBase.cxx @@ -581,7 +581,6 @@ public: void PropSet(const char *key, const char *val); const char *PropGet(const char *key) const; int PropGetInt(const char *key, int defaultValue=0) const; - size_t PropGetExpanded(const char *key, char *result) const; LineEndType LineEndTypesSupported() override; int AllocateSubStyles(int styleBase, int numberStyles); @@ -701,19 +700,6 @@ int LexState::PropGetInt(const char *key, int defaultValue) const { return defaultValue; } -size_t LexState::PropGetExpanded(const char *key, char *result) const { - if (instance) { - const char *value = instance->PropertyGet(key); - if (value) { - if (result) { - strcpy(result, value); - } - return strlen(value); - } - } - return 0; -} - LineEndType LexState::LineEndTypesSupported() { if (instance) { return static_cast(instance->LineEndTypesSupported()); @@ -1055,8 +1041,7 @@ sptr_t ScintillaBase::WndProc(Message iMessage, uptr_t wParam, sptr_t lParam) { return StringResult(lParam, DocumentLexState()->PropGet(ConstCharPtrFromUPtr(wParam))); case Message::GetPropertyExpanded: - return DocumentLexState()->PropGetExpanded(ConstCharPtrFromUPtr(wParam), - CharPtrFromSPtr(lParam)); + return StringResult(lParam, DocumentLexState()->PropGet(ConstCharPtrFromUPtr(wParam))); case Message::GetPropertyInt: return DocumentLexState()->PropGetInt(ConstCharPtrFromUPtr(wParam), static_cast(lParam)); -- cgit v1.2.3