From f1e5f646901582779fd73a151a42cb63d5849ca3 Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Tue, 17 Oct 2017 10:59:23 +0200
Subject: [PATCH] wxwidgets.cfg: Added support for wxMenu:Append().

---
 cfg/wxwidgets.cfg      | 16 ++++++++++++++++
 lib/symboldatabase.cpp | 23 ++++++++++-------------
 lib/token.h            |  6 +++---
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/cfg/wxwidgets.cfg b/cfg/wxwidgets.cfg
index a504fe852..0c80eb9b0 100644
--- a/cfg/wxwidgets.cfg
+++ b/cfg/wxwidgets.cfg
@@ -882,6 +882,22 @@
     <noreturn>false</noreturn>
     <leak-ignore/>
   </function>
+  <!-- http://docs.wxwidgets.org/3.1/classwx_menu.html-->
+  <!-- wxMenuItem * Append (int id, const wxString &item=wxEmptyString, const wxString &helpString=wxEmptyString, wxItemKind kind=wxITEM_NORMAL) -->
+  <function name="wxMenu::Append">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <returnValue type="wxMenuItem *"/>
+    <use-retval/>
+    <arg nr="1">
+      <not-uninit/>
+    </arg>
+    <arg nr="2" default="wxEmptyString"/>
+    <arg nr="3" default="wxEmptyString"/>
+    <arg nr="4" default="wxITEM_NORMAL">
+      <not-uninit/>
+    </arg>
+  </function>
   <!-- Override macros which don't necessarily require semicolons at the end -->
   <define name="DECLARE_CLASS(n)" value=""/>
   <define name="DECLARE_DYNAMIC_CLASS(n)" value=""/>
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
index 6e258c211..672348892 100644
--- a/lib/symboldatabase.cpp
+++ b/lib/symboldatabase.cpp
@@ -292,9 +292,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
 
             typeList.push_back(Type(tok, new_scope, scope));
             {
-               Type* new_type = &typeList.back();
-               new_scope->definedType = new_type;
-               scope->definedTypesMap[new_type->name()] = new_type;
+                Type* new_type = &typeList.back();
+                new_scope->definedType = new_type;
+                scope->definedTypesMap[new_type->name()] = new_type;
             }
 
             scope->addVariable(varNameTok, tok, tok, access[scope], new_scope->definedType, scope, &_settings->library);
@@ -333,9 +333,9 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
 
             typeList.push_back(Type(tok, new_scope, scope));
             {
-               Type* new_type = &typeList.back();
-               new_scope->definedType = new_type;
-               scope->definedTypesMap[new_type->name()] = new_type;
+                Type* new_type = &typeList.back();
+                new_scope->definedType = new_type;
+                scope->definedTypesMap[new_type->name()] = new_type;
             }
 
             // make sure we have valid code
@@ -4350,13 +4350,10 @@ const Type* Scope::findType(const std::string & name) const
 {
     auto it = definedTypesMap.find(name);
 
-    if (definedTypesMap.end() == it)
-    {
-       return nullptr;
-    }
-    else
-    {
-       return (*it).second;
+    if (definedTypesMap.end() == it) {
+        return nullptr;
+    } else {
+        return (*it).second;
     }
 }
 
diff --git a/lib/token.h b/lib/token.h
index 58431095c..d6c7c68a9 100644
--- a/lib/token.h
+++ b/lib/token.h
@@ -240,12 +240,12 @@ public:
         _tokType = t;
 
         bool memoizedIsName = (_tokType == eName || _tokType == eType || _tokType == eVariable ||
-              _tokType == eFunction || _tokType == eKeyword || _tokType == eBoolean ||
-              _tokType == eEnumerator); // TODO: "true"/"false" aren't really a name...
+                               _tokType == eFunction || _tokType == eKeyword || _tokType == eBoolean ||
+                               _tokType == eEnumerator); // TODO: "true"/"false" aren't really a name...
         setFlag(fIsName, memoizedIsName);
 
         bool memoizedIsLiteral = (_tokType == eNumber || _tokType == eString || _tokType == eChar ||
-               _tokType == eBoolean || _tokType == eLiteral || _tokType == eEnumerator);
+                                  _tokType == eBoolean || _tokType == eLiteral || _tokType == eEnumerator);
         setFlag(fIsLiteral, memoizedIsLiteral);
     }
     void isKeyword(bool kwd) {