diff --git a/CMakePlugin/CMakePlugin.cpp b/CMakePlugin/CMakePlugin.cpp index e6b4a7818f..a7be28a3bb 100644 --- a/CMakePlugin/CMakePlugin.cpp +++ b/CMakePlugin/CMakePlugin.cpp @@ -251,18 +251,16 @@ BuildConfigPtr CMakePlugin::GetSelectedBuildConfig() const wxArrayString CMakePlugin::GetSupportedGenerators() const { - wxArrayString generators; - #ifdef __WXMSW__ // Windows supported generators - generators.Add("MinGW Makefiles"); + return StdToWX::ToArrayString({ "MinGW Makefiles" }); #else // Linux / Mac supported generators - generators.Add("Unix Makefiles"); -// generators.Add("Ninja"); + return StdToWX::ToArrayString({ + "Unix Makefiles", + // "Ninja", + }); #endif - - return generators; } /* ************************************************************************ */ @@ -619,8 +617,7 @@ bool CMakePlugin::IsCMakeListsExists() const wxString CMakePlugin::WriteCMakeListsAndOpenIt(const std::vector& lines) const { wxFileName cmakelists_txt{ ::wxGetCwd(), "CMakeLists.txt" }; - wxArrayString wx_lines; - StdToWX::ToArrayString(lines, &wx_lines); + const wxArrayString wx_lines = StdToWX::ToArrayString(lines); FileUtils::WriteFileContent(cmakelists_txt, wxJoin(wx_lines, '\n')); clGetManager()->OpenFile(cmakelists_txt.GetFullPath()); return cmakelists_txt.GetFullPath(); diff --git a/CodeLite/AsyncProcess/asyncprocess.cpp b/CodeLite/AsyncProcess/asyncprocess.cpp index 323ee2c0c8..da7d7af486 100644 --- a/CodeLite/AsyncProcess/asyncprocess.cpp +++ b/CodeLite/AsyncProcess/asyncprocess.cpp @@ -28,6 +28,7 @@ class IProcess; #include "asyncprocess.h" +#include "StdToWX.h" #include "StringUtils.h" #include "clTempFile.hpp" #include "cl_command_event.h" @@ -106,7 +107,6 @@ static wxArrayString __WrapInShell(const wxArrayString& args, size_t flags) } wxString cmd = wxJoin(tmparr, ' ', 0); - wxArrayString command; bool is_ssh = flags & IProcessCreateSSH; if (shell_is_cmd && !is_ssh) { @@ -114,16 +114,10 @@ static wxArrayString __WrapInShell(const wxArrayString& args, size_t flags) if (shell.IsEmpty()) { shell = "CMD.EXE"; } - command.Add(shell); - command.Add("/C"); - command.Add("\"" + cmd + "\""); - + return StdToWX::ToArrayString({ shell, "/C", "\"" + cmd + "\"" }); } else { - command.Add("/bin/sh"); - command.Add("-c"); - command.Add("'" + cmd + "'"); + return StdToWX::ToArrayString({ "/bin/sh", "-c", "'" + cmd + "'" }); } - return command; } static wxArrayString __AddSshCommand(const wxArrayString& args, const wxString& wd, const wxString& sshAccountName, diff --git a/CodeLite/Console/clConsoleBase.cpp b/CodeLite/Console/clConsoleBase.cpp index 7924903bec..2c308746f9 100644 --- a/CodeLite/Console/clConsoleBase.cpp +++ b/CodeLite/Console/clConsoleBase.cpp @@ -1,5 +1,6 @@ #include "clConsoleBase.h" +#include "StdToWX.h" #include "clConsoleAlacritty.hpp" #include "clConsoleCMD.h" #include "clConsoleGnomeTerminal.h" @@ -95,25 +96,16 @@ clConsoleBase::Ptr_t clConsoleBase::GetTerminal() wxArrayString clConsoleBase::GetAvailableTerminals() { - wxArrayString terminals; + return StdToWX::ToArrayString({ #ifdef __WXMSW__ - terminals.Add("CMD"); + "CMD", #elif defined(__WXGTK__) - terminals.Add("konsole"); - terminals.Add("gnome-terminal"); - terminals.Add("lxterminal"); - terminals.Add("mate-terminal"); - terminals.Add("qterminal"); - terminals.Add("xfce4-terminal"); - terminals.Add("rxvt-unicode"); - terminals.Add("Kitty"); + "konsole", "gnome-terminal", "lxterminal", "mate-terminal", "qterminal", "xfce4-terminal", "rxvt-unicode", + "Kitty", #else - terminals.Add("Terminal"); - terminals.Add("iTerm2"); - terminals.Add("Kitty"); + "Terminal", "iTerm2", "Kitty", #endif - terminals.Add("alacritty"); - return terminals; + "alacritty" }); } void clConsoleBase::AddEnvVariable(const wxString& name, const wxString& value) diff --git a/CodeLite/Console/clConsoleRXVTerminal.cpp b/CodeLite/Console/clConsoleRXVTerminal.cpp index 1a1c634543..6e7b92e129 100644 --- a/CodeLite/Console/clConsoleRXVTerminal.cpp +++ b/CodeLite/Console/clConsoleRXVTerminal.cpp @@ -1,14 +1,12 @@ #include "clConsoleRXVTerminal.h" #include "Platform/Platform.hpp" +#include "StdToWX.h" clConsoleRXVTTerminal::clConsoleRXVTTerminal() { wxString executable = "rxvt-unicode"; - wxArrayString commands; - commands.Add("rxvt-unicode"); - commands.Add("urxvt"); - commands.Add("rxvt"); + const wxArrayString commands = StdToWX::ToArrayString({"rxvt-unicode", "urxvt", "rxvt"}); ThePlatform->AnyWhich(commands, &executable); SetTerminalCommand(executable + " -cd %WD% -e /bin/bash -c '%COMMAND%'"); diff --git a/CodeLite/Cxx/CxxCodeCompletion.cpp b/CodeLite/Cxx/CxxCodeCompletion.cpp index 2fd0cb05b3..b5664800e4 100644 --- a/CodeLite/Cxx/CxxCodeCompletion.cpp +++ b/CodeLite/Cxx/CxxCodeCompletion.cpp @@ -4,6 +4,7 @@ #include "CxxExpression.hpp" #include "CxxScannerTokens.h" #include "CxxVariableScanner.h" +#include "StdToWX.h" #include "ctags_manager.h" #include "file_logger.h" #include "fileextmanager.h" @@ -213,15 +214,8 @@ void CxxCodeCompletion::shrink_scope(const wxString& text, std::unordered_map anonymous_tags; get_anonymous_tags(wxEmptyString, kinds, anonymous_tags); diff --git a/CodeLite/StdToWX.cpp b/CodeLite/StdToWX.cpp index 5c5bbb96b5..3f3632ff6d 100644 --- a/CodeLite/StdToWX.cpp +++ b/CodeLite/StdToWX.cpp @@ -37,10 +37,7 @@ void StdToWX::RemoveLast(std::string& str, size_t count) } } -void StdToWX::ToArrayString(const std::vector& vec, wxArrayString* arr) +wxArrayString StdToWX::ToArrayString(const std::vector& vec) { - arr->reserve(vec.size()); - for(const wxString& s : vec) { - arr->Add(s); - } + return { vec.size(), vec.data() }; } diff --git a/CodeLite/StdToWX.h b/CodeLite/StdToWX.h index feebf7c6f1..3d7ded9780 100644 --- a/CodeLite/StdToWX.h +++ b/CodeLite/StdToWX.h @@ -64,7 +64,7 @@ class WXDLLIMPEXP_CL StdToWX /** * @brief convert std::vector into wxArrayString */ - static void ToArrayString(const std::vector& vec, wxArrayString* arr); + static wxArrayString ToArrayString(const std::vector& vec); }; #endif // STDTOWX_H diff --git a/CodeLite/ctags_manager.cpp b/CodeLite/ctags_manager.cpp index 26b597e54e..a8a80f713c 100644 --- a/CodeLite/ctags_manager.cpp +++ b/CodeLite/ctags_manager.cpp @@ -28,6 +28,7 @@ #include "Cxx/CxxTemplateFunction.h" #include "Cxx/CxxVariableScanner.h" #include "Cxx/cpp_comment_creator.h" +#include "StdToWX.h" #include "cl_command_event.h" #include "code_completion_api.h" #include "codelite_events.h" @@ -423,10 +424,7 @@ bool TagsManager::GetDerivationListInternal(const wxString& path, TagEntryPtr de { std::vector tags; TagEntryPtr tag; - - wxArrayString kind; - kind.Add(wxT("class")); - kind.Add(wxT("struct")); + const wxArrayString kind = StdToWX::ToArrayString({ wxT("class"), wxT("struct") }); GetDatabase()->GetTagsByKindAndPath(kind, path, tags); @@ -762,10 +760,7 @@ bool TagsManager::ProcessExpression(const wxString& expression, wxString& type, void TagsManager::GetClasses(std::vector& tags, bool onlyWorkspace) { - wxArrayString kind; - kind.Add(wxT("class")); - kind.Add(wxT("struct")); - kind.Add(wxT("union")); + const wxArrayString kind = StdToWX::ToArrayString({ wxT("class"), wxT("struct"), wxT("union") }); GetDatabase()->GetTagsByKind(kind, wxT("name"), ITagsStorage::OrderAsc, tags); } @@ -844,9 +839,7 @@ void TagsManager::CacheFile(const wxString& fileName) m_cachedFile = fileName; m_cachedFileFunctionsTags.clear(); - wxArrayString kinds; - kinds.Add(wxT("function")); - kinds.Add(wxT("prototype")); + const wxArrayString kinds = StdToWX::ToArrayString({ wxT("function"), wxT("prototype") }); // disable the cache GetDatabase()->SetUseCache(false); GetDatabase()->GetTagsByKindAndFile(kinds, fileName, wxT("line"), ITagsStorage::OrderDesc, @@ -1159,93 +1152,49 @@ void TagsManager::GetCXXKeywords(wxStringSet_t& words) void TagsManager::GetCXXKeywords(wxArrayString& words) { - words.Clear(); - words.Add("alignas"); - words.Add("alignof"); - words.Add("and"); - words.Add("and_eq"); - words.Add("asm"); - words.Add("auto"); - words.Add("bitand"); - words.Add("bitor"); - words.Add("bool"); - words.Add("break"); - words.Add("case"); - words.Add("catch"); - words.Add("char"); - words.Add("char16_t"); - words.Add("char32_t"); - words.Add("class"); - words.Add("compl"); - words.Add("const"); - words.Add("constexpr"); - words.Add("const_cast"); - words.Add("continue"); - words.Add("decltype"); - words.Add("default"); - words.Add("delete"); - words.Add("do"); - words.Add("double"); - words.Add("dynamic_cast"); - words.Add("else"); - words.Add("enum"); - words.Add("explicit"); - words.Add("export"); - words.Add("extern"); - words.Add("false"); - words.Add("final"); - words.Add("float"); - words.Add("for"); - words.Add("friend"); - words.Add("goto"); - words.Add("if"); - words.Add("inline"); - words.Add("int"); - words.Add("long"); - words.Add("mutable"); - words.Add("namespace"); - words.Add("new"); - words.Add("noexcept"); - words.Add("not"); - words.Add("not_eq"); - words.Add("nullptr"); - words.Add("operator"); - words.Add("or"); - words.Add("or_eq"); - words.Add("override"); - words.Add("private"); - words.Add("protected"); - words.Add("public"); - words.Add("register"); - words.Add("reinterpret_cast"); - words.Add("return"); - words.Add("short"); - words.Add("signed"); - words.Add("sizeof"); - words.Add("static"); - words.Add("static_assert"); - words.Add("static_cast"); - words.Add("struct"); - words.Add("switch"); - words.Add("template"); - words.Add("this"); - words.Add("thread_local"); - words.Add("throw"); - words.Add("true"); - words.Add("try"); - words.Add("typedef"); - words.Add("typeid"); - words.Add("typename"); - words.Add("union"); - words.Add("unsigned"); - words.Add("using"); - words.Add("virtual"); - words.Add("void"); - words.Add("volatile"); - words.Add("wchar_t"); - words.Add("while"); - words.Add("xor"); - words.Add("xor_eq"); + words = StdToWX::ToArrayString({ "alignas", "alignof", + "and", "and_eq", + "asm", "auto", + "bitand", "bitor", + "bool", "break", + "case", "catch", + "char", "char16_t", + "char32_t", "class", + "compl", "const", + "constexpr", "const_cast", + "continue", "decltype", + "default", "delete", + "do", "double", + "dynamic_cast", "else", + "enum", "explicit", + "export", "extern", + "false", "final", + "float", "for", + "friend", "goto", + "if", "inline", + "int", "long", + "mutable", "namespace", + "new", "noexcept", + "not", "not_eq", + "nullptr", "operator", + "or", "or_eq", + "override", "private", + "protected", "public", + "register", "reinterpret_cast", + "return", "short", + "signed", "sizeof", + "static", "static_assert", + "static_cast", "struct", + "switch", "template", + "this", "thread_local", + "throw", "true", + "try", "typedef", + "typeid", "typename", + "union", "unsigned", + "using", "virtual", + "void", "volatile", + "wchar_t", "while", + "xor", "xor_eq" }); } TagEntryPtrVector_t TagsManager::ParseBuffer(const wxString& content, const wxString& filename, const wxString& kinds) diff --git a/DatabaseExplorer/MySqlDbAdapter.cpp b/DatabaseExplorer/MySqlDbAdapter.cpp index 9c9d2ca757..3a9dc3ff04 100644 --- a/DatabaseExplorer/MySqlDbAdapter.cpp +++ b/DatabaseExplorer/MySqlDbAdapter.cpp @@ -24,11 +24,14 @@ ////////////////////////////////////////////////////////////////////////////// #include "MySqlDbAdapter.h" + +#include "StdToWX.h" #include "constraint.h" #include "database.h" #include "dbconnection.h" #include "table.h" #include "view.h" + #include MySqlDbAdapter::MySqlDbAdapter() @@ -183,28 +186,10 @@ IDbType* MySqlDbAdapter::GetDbTypeByName(const wxString& typeName) wxArrayString* MySqlDbAdapter::GetDbTypes() { - wxArrayString* pNames = new wxArrayString(); - pNames->Add(wxT("INT")); - pNames->Add(wxT("SMALLINT")); - pNames->Add(wxT("BIGINT")); - pNames->Add(wxT("TINYINT")); - pNames->Add(wxT("VARCHAR")); - pNames->Add(wxT("DOUBLE")); - pNames->Add(wxT("FLOAT")); - pNames->Add(wxT("DECIMAL")); - pNames->Add(wxT("BOOL")); - pNames->Add(wxT("DATETIME")); - pNames->Add(wxT("CHAR")); - pNames->Add(wxT("TIMESTAMP")); - pNames->Add(wxT("ENUM")); - pNames->Add(wxT("SET")); - pNames->Add(wxT("LONGBLOB")); - pNames->Add(wxT("BLOB")); - pNames->Add(wxT("MEDIUMTEXT")); - pNames->Add(wxT("TEXT")); - pNames->Add(wxT("LONGTEXT")); - - return pNames; + return new wxArrayString(StdToWX::ToArrayString( + { wxT("INT"), wxT("SMALLINT"), wxT("BIGINT"), wxT("TINYINT"), wxT("VARCHAR"), wxT("DOUBLE"), wxT("FLOAT"), + wxT("DECIMAL"), wxT("BOOL"), wxT("DATETIME"), wxT("CHAR"), wxT("TIMESTAMP"), wxT("ENUM"), wxT("SET"), + wxT("LONGBLOB"), wxT("BLOB"), wxT("MEDIUMTEXT"), wxT("TEXT"), wxT("LONGTEXT") })); } wxString MySqlDbAdapter::GetDefaultSelect(const wxString& dbName, const wxString& tableName) { diff --git a/DatabaseExplorer/PostgreSqlDbAdapter.cpp b/DatabaseExplorer/PostgreSqlDbAdapter.cpp index 8b4f870765..861125c5fe 100644 --- a/DatabaseExplorer/PostgreSqlDbAdapter.cpp +++ b/DatabaseExplorer/PostgreSqlDbAdapter.cpp @@ -24,6 +24,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "PostgreSqlDbAdapter.h" + +#include "StdToWX.h" #include "constraint.h" #include "database.h" #include "dbconnection.h" @@ -251,69 +253,42 @@ IDbType* PostgreSqlDbAdapter::GetDbTypeByName(const wxString& typeName) wxArrayString* PostgreSqlDbAdapter::GetDbTypes() { - wxArrayString* pNames = new wxArrayString(); - - pNames->Add(wxT("SMALLINT")); - pNames->Add(wxT("INTEGER")); - pNames->Add(wxT("BIGINT")); - pNames->Add(wxT("DECIMAL")); - pNames->Add(wxT("NUMERIC")); - pNames->Add(wxT("REAL")); - pNames->Add(wxT("DOUBLE PRECISION")); - pNames->Add(wxT("SERIAL")); - pNames->Add(wxT("BIGSERIAL")); - - // Monetary types - pNames->Add(wxT("CHARACTER VARYING")); - // Character types - pNames->Add(wxT("VARCHAR")); - pNames->Add(wxT("CHARACTER")); - pNames->Add(wxT("CHAR")); - pNames->Add(wxT("TEXT")); - - // Binary types - pNames->Add(wxT("BYTEA")); - - // Date/Time types - pNames->Add(wxT("TIMESTAMP")); - pNames->Add(wxT("DATE")); - pNames->Add(wxT("TIME")); - pNames->Add(wxT("INTERVAL")); - - // Boolean types - pNames->Add(wxT("BOOLEAN")); - - // Geometric types - pNames->Add(wxT("POINT")); - pNames->Add(wxT("LINE")); - pNames->Add(wxT("LSEG")); - pNames->Add(wxT("BOX")); - pNames->Add(wxT("PATH")); - pNames->Add(wxT("POLYGON")); - pNames->Add(wxT("CIRCLE")); - - // Network address types - pNames->Add(wxT("CIDR")); - pNames->Add(wxT("INET")); - pNames->Add(wxT("MACADDR")); - - // Bit String types - pNames->Add(wxT("BIT")); - pNames->Add(wxT("BIT VARYING")); - - // UUID type - pNames->Add(wxT("UUID")); - - // XML type - pNames->Add(wxT("XML")); - - // OTHER TYPES - pNames->Add(wxT("OID")); - pNames->Add(wxT("XID")); - pNames->Add(wxT("ARRAY")); - pNames->Add(wxT("REGPROX")); - - return pNames; + return new wxArrayString(StdToWX::ToArrayString( + { wxT("SMALLINT"), wxT("INTEGER"), wxT("BIGINT"), wxT("DECIMAL"), wxT("NUMERIC"), wxT("REAL"), + wxT("DOUBLE PRECISION"), wxT("SERIAL"), wxT("BIGSERIAL"), + + // Monetary types + wxT("CHARACTER VARYING"), + + // Character types + wxT("VARCHAR"), wxT("CHARACTER"), wxT("CHAR"), wxT("TEXT"), + + // Binary types + wxT("BYTEA"), + + // Date/Time types + wxT("TIMESTAMP"), wxT("DATE"), wxT("TIME"), wxT("INTERVAL"), + + // Boolean types + wxT("BOOLEAN"), + + // Geometric types + wxT("POINT"), wxT("LINE"), wxT("LSEG"), wxT("BOX"), wxT("PATH"), wxT("POLYGON"), wxT("CIRCLE"), + + // Network address types + wxT("CIDR"), wxT("INET"), wxT("MACADDR"), + + // Bit String types + wxT("BIT"), wxT("BIT VARYING"), + + // UUID type + wxT("UUID"), + + // XML type + wxT("XML"), + + // OTHER TYPES + wxT("OID"), wxT("XID"), wxT("ARRAY"), wxT("REGPROX") })); } wxString PostgreSqlDbAdapter::GetDefaultSelect(const wxString& dbName, const wxString& tableName) { diff --git a/DatabaseExplorer/SqliteDbAdapter.cpp b/DatabaseExplorer/SqliteDbAdapter.cpp index c7fe0a40c5..2637aed3e2 100644 --- a/DatabaseExplorer/SqliteDbAdapter.cpp +++ b/DatabaseExplorer/SqliteDbAdapter.cpp @@ -24,6 +24,8 @@ ////////////////////////////////////////////////////////////////////////////// #include "SqliteDbAdapter.h" + +#include "StdToWX.h" #include "database.h" #include "dbconnection.h" #include "table.h" @@ -102,14 +104,8 @@ IDbType* SQLiteDbAdapter::GetDbTypeByName(const wxString& typeName) } wxArrayString* SQLiteDbAdapter::GetDbTypes() { - wxArrayString* pNames = new wxArrayString(); - pNames->Add(wxT("NULL")); - pNames->Add(wxT("INT")); - pNames->Add(wxT("INTEGER")); - pNames->Add(wxT("REAL")); - pNames->Add(wxT("TEXT")); - pNames->Add(wxT("BLOB")); - return pNames; + return new wxArrayString( + StdToWX::ToArrayString({ wxT("NULL"), wxT("INT"), wxT("INTEGER"), wxT("REAL"), wxT("TEXT"), wxT("BLOB") })); } bool SQLiteDbAdapter::IsConnected() { return CanConnect(); } diff --git a/Docker/DockerOutputPane.cpp b/Docker/DockerOutputPane.cpp index 6db2959e9e..7f74cbedc2 100644 --- a/Docker/DockerOutputPane.cpp +++ b/Docker/DockerOutputPane.cpp @@ -1,5 +1,7 @@ -#include "ColoursAndFontsManager.h" #include "DockerOutputPane.h" + +#include "ColoursAndFontsManager.h" +#include "StdToWX.h" #include "bitmap_loader.h" #include "clDockerContainer.h" #include "clDockerEvents.h" @@ -19,22 +21,9 @@ DockerOutputPane::DockerOutputPane(wxWindow* parent, clDockerDriver::Ptr_t drive EventNotifier::Get()->Bind(wxEVT_WORKSPACE_CLOSED, &DockerOutputPane::OnWorkspaceClosed, this); m_styler.reset(new clGenericSTCStyler(m_stc)); - { - wxArrayString words; - words.Add("successfully"); - m_styler->AddStyle(words, clGenericSTCStyler::kInfo); - } - { - wxArrayString words; - words.Add("abort "); - words.Add("Error response from daemon"); - m_styler->AddStyle(words, clGenericSTCStyler::kError); - } - { - wxArrayString words; - words.Add("SECURITY WARNING"); - m_styler->AddStyle(words, clGenericSTCStyler::kWarning); - } + m_styler->AddStyle(StdToWX::ToArrayString({ "successfully" }), clGenericSTCStyler::kInfo); + m_styler->AddStyle(StdToWX::ToArrayString({ "abort ", "Error response from daemon" }), clGenericSTCStyler::kError); + m_styler->AddStyle(StdToWX::ToArrayString({ "SECURITY WARNING" }), clGenericSTCStyler::kWarning); // ===------------------------- // Output tab diff --git a/Docker/clDockerSettings.cpp b/Docker/clDockerSettings.cpp index 3a9579ec3e..2ee48c7139 100644 --- a/Docker/clDockerSettings.cpp +++ b/Docker/clDockerSettings.cpp @@ -1,4 +1,6 @@ #include "clDockerSettings.h" + +#include "StdToWX.h" #include "cl_standard_paths.h" #include "globals.h" @@ -10,9 +12,7 @@ clDockerSettings::clDockerSettings() : clConfigItem("Docker") { // The defaults - wxArrayString hints; - hints.Add("/usr/local/bin"); - hints.Add("/usr/bin"); + wxArrayString hints = StdToWX::ToArrayString({ "/usr/local/bin", "/usr/bin" }); #ifdef __WXMSW__ { wxRegKey regkey(wxRegKey::HKCU, "Environment"); diff --git a/Gizmos/newclassdlg.cpp b/Gizmos/newclassdlg.cpp index 73b558cedb..69a1372b5c 100644 --- a/Gizmos/newclassdlg.cpp +++ b/Gizmos/newclassdlg.cpp @@ -268,9 +268,6 @@ void NewClassDlg::OnBrowseNamespace(wxCommandEvent& e) { wxUnusedVar(e); - wxArrayString kinds; - kinds.Add(wxT("namespace")); - OpenResourceDialog dlg(this, m_mgr, ""); if(dlg.ShowModal() == wxID_OK) { std::vector selections = dlg.GetSelections(); @@ -430,10 +427,6 @@ void NewClassDlg::OnBrowseParentClass(wxCommandEvent& event) { wxUnusedVar(event); - wxArrayString kinds; - kinds.Add(wxT("class")); - kinds.Add(wxT("struct")); - OpenResourceDialog dlg(this, m_mgr, ""); if(dlg.ShowModal() == wxID_OK) { std::vector selections = dlg.GetSelections(); diff --git a/LanguageServer/detectors/LSPTypeScriptDetector.cpp b/LanguageServer/detectors/LSPTypeScriptDetector.cpp index c07516b992..2d699843c8 100644 --- a/LanguageServer/detectors/LSPTypeScriptDetector.cpp +++ b/LanguageServer/detectors/LSPTypeScriptDetector.cpp @@ -1,6 +1,7 @@ #include "LSPTypeScriptDetector.hpp" #include "NodeJSLocator.h" +#include "StdToWX.h" #include "clNodeJS.h" #include "fileutils.h" #include "globals.h" @@ -36,10 +37,7 @@ bool LSPTypeScriptDetector::DoLocate() command << " --stdio"; SetCommand(command); - wxArrayString langs; - langs.Add("javascript"); - langs.Add("typescript"); - SetLangugaes(langs); + SetLangugaes(StdToWX::ToArrayString({ "javascript", "typescript" })); SetConnectionString("stdio"); return true; } diff --git a/LiteEditor/EditorOptionsGeneralGuidesPanel.cpp b/LiteEditor/EditorOptionsGeneralGuidesPanel.cpp index 3dcfe6e4c2..46bbe46ddf 100644 --- a/LiteEditor/EditorOptionsGeneralGuidesPanel.cpp +++ b/LiteEditor/EditorOptionsGeneralGuidesPanel.cpp @@ -1,5 +1,6 @@ #include "EditorOptionsGeneralGuidesPanel.h" +#include "StdToWX.h" #include "cl_config.h" #include "editor_config.h" @@ -57,11 +58,7 @@ EditorOptionsGeneralGuidesPanel::EditorOptionsGeneralGuidesPanel(wxWindow* paren } { - wxArrayString options; - options.Add("Default"); - options.Add("Mac (CR)"); - options.Add("Unix (LF)"); - options.Add("Windows (CRLF)"); + const wxArrayString options = StdToWX::ToArrayString({ "Default", "Mac (CR)", "Unix (LF)", "Windows (CRLF)" }); AddProperty(_("EOL Style"), options, m_options->GetEolMode(), UPDATE_TEXT_CB(SetEolMode)); } diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp index c7fae9e8c4..1f6182ae17 100644 --- a/LiteEditor/frame.cpp +++ b/LiteEditor/frame.cpp @@ -37,6 +37,7 @@ #include "Notebook.h" #include "NotebookNavigationDlg.h" #include "SideBar.hpp" +#include "StdToWX.h" #include "SwitchToWorkspaceDlg.h" #include "WelcomePage.h" #include "acceltabledlg.h" @@ -3527,9 +3528,7 @@ void clMainFrame::CompleteInitialization() clGotoAnythingManager::Get().Initialise(); // Update the toolbar view - wxArrayString dummy; - dummy.Add("No Entries"); - wxArrayString hiddenItems = clConfig::Get().Read("ToolBarHiddenItems", dummy); + wxArrayString hiddenItems = clConfig::Get().Read("ToolBarHiddenItems", StdToWX::ToArrayString({ "No Entries" })); if (hiddenItems.GetCount() == 1 && hiddenItems.Item(0) == "No Entries") { // By default, hide these entries std::vector v = { "New", diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp index f379baa810..02f0dce839 100644 --- a/LiteEditor/manager.cpp +++ b/LiteEditor/manager.cpp @@ -37,6 +37,7 @@ #include "Keyboard/clKeyboardManager.h" #include "NewProjectDialog.h" #include "SideBar.hpp" +#include "StdToWX.h" #include "WorkspaceImporter/WSImporter.h" #include "app.h" #include "attachdbgprocdlg.h" @@ -1598,15 +1599,11 @@ bool Manager::ShowOutputPane(const wxString& focusWin, bool show, bool take_focu void Manager::ShowDebuggerPane(bool show) { // make the output pane visible - wxArrayString dbgPanes; - dbgPanes.Add(wxT("Debugger")); - dbgPanes.Add(wxGetTranslation(DebuggerPane::LOCALS)); - dbgPanes.Add(wxGetTranslation(DebuggerPane::FRAMES)); - dbgPanes.Add(wxGetTranslation(DebuggerPane::WATCHES)); - dbgPanes.Add(wxGetTranslation(DebuggerPane::BREAKPOINTS)); - dbgPanes.Add(wxGetTranslation(DebuggerPane::THREADS)); - dbgPanes.Add(wxGetTranslation(DebuggerPane::MEMORY)); - dbgPanes.Add(wxGetTranslation(DebuggerPane::ASCII_VIEWER)); + const wxArrayString dbgPanes = StdToWX::ToArrayString( + { wxT("Debugger"), wxGetTranslation(DebuggerPane::LOCALS), wxGetTranslation(DebuggerPane::FRAMES), + wxGetTranslation(DebuggerPane::WATCHES), wxGetTranslation(DebuggerPane::BREAKPOINTS), + wxGetTranslation(DebuggerPane::THREADS), wxGetTranslation(DebuggerPane::MEMORY), + wxGetTranslation(DebuggerPane::ASCII_VIEWER) }); wxAuiManager* aui = &clMainFrame::Get()->GetDockingManager(); if (show) { diff --git a/LiteEditor/pluginmanager.cpp b/LiteEditor/pluginmanager.cpp index e9cd5db0f3..811bf7f731 100644 --- a/LiteEditor/pluginmanager.cpp +++ b/LiteEditor/pluginmanager.cpp @@ -27,6 +27,7 @@ #include "BuildTab.hpp" #include "Keyboard/clKeyboardManager.h" #include "SideBar.hpp" +#include "StdToWX.h" #include "app.h" #include "bitmap_loader.h" #include "build_settings_config.h" @@ -288,10 +289,7 @@ void PluginManager::Load() // Now that all the plugins are loaded, load from the configuration file // list of visible tabs - static wxArrayString DefaultArray; - if (DefaultArray.IsEmpty()) { - DefaultArray.Add("NOT-FOUND"); - } + static const wxArrayString DefaultArray = StdToWX::ToArrayString({ "NOT-FOUND" }); DetachedPanesInfo dpi; GetConfigTool()->ReadObject(wxT("DetachedPanesList"), &dpi); diff --git a/Plugin/CompilerLocator/CompilerLocatorMSVC.cpp b/Plugin/CompilerLocator/CompilerLocatorMSVC.cpp index 45d48b3ee4..3e4b0e57eb 100644 --- a/Plugin/CompilerLocator/CompilerLocatorMSVC.cpp +++ b/Plugin/CompilerLocator/CompilerLocatorMSVC.cpp @@ -25,17 +25,17 @@ #include "CompilerLocatorMSVC.h" +#include "StdToWX.h" #include "compiler.h" +#include "globals.h" -#include #include CompilerLocatorMSVC::CompilerLocatorMSVC() + : // We only deal with x86/x64 Native Tools here for simplicity + // Other platforms (such as ARM64 Cross Tools) can be added manually by cloning the compiler + m_vcPlatforms(StdToWX::ToArrayString({ "x86", "x64" })) { - // We only deal with x86/x64 Native Tools here for simplicity - // Other platforms (such as ARM64 Cross Tools) can be added manually by cloning the compiler - m_vcPlatforms.Add("x86"); - m_vcPlatforms.Add("x64"); } CompilerLocatorMSVC::~CompilerLocatorMSVC() {} diff --git a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp index dd0cb338ac..cb4dab0d58 100644 --- a/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp +++ b/Plugin/FileSystemWorkspace/clFileSystemWorkspaceConfig.cpp @@ -2,6 +2,7 @@ #include "Debugger/debuggermanager.h" #include "ICompilerLocator.h" +#include "StdToWX.h" #include "build_settings_config.h" #include "clFileSystemWorkspace.hpp" #include "compiler_command_line_parser.h" @@ -169,15 +170,13 @@ clFileSystemWorkspaceConfig::Ptr_t clFileSystemWorkspaceConfig::Clone() const static wxArrayString GetExtraFlags(CompilerPtr compiler) { - wxArrayString flags; if(compiler->HasMetadata()) { auto md = compiler->GetMetadata(); if(!md.GetTarget().IsEmpty()) { - flags.Add("-target"); - flags.Add(md.GetTarget()); + return StdToWX::ToArrayString({ "-target", md.GetTarget() }); } } - return flags; + return {}; } wxArrayString clFileSystemWorkspaceConfig::GetCompilerOptions(clBacktickCache::ptr_t backticks) const diff --git a/Plugin/clSFTPManager.hpp b/Plugin/clSFTPManager.hpp index 4e62e8615e..c310cd2173 100644 --- a/Plugin/clSFTPManager.hpp +++ b/Plugin/clSFTPManager.hpp @@ -264,8 +264,7 @@ class WXDLLIMPEXP_SDK clSFTPManager : public wxEvtHandler ReadOutput_t AwaitExecute(const wxString& accountName, const std::vector& command, const wxString& wd, clEnvList_t* env = nullptr) { - wxArrayString arr; - StdToWX::ToArrayString(command, &arr); + const wxArrayString arr = StdToWX::ToArrayString(command); return AwaitExecute(accountName, StringUtils::BuildCommandStringFromArray(arr), wd, env); } @@ -282,8 +281,7 @@ class WXDLLIMPEXP_SDK clSFTPManager : public wxEvtHandler void AsyncExecute(wxEvtHandler* sink, const wxString& accountName, const std::vector& command, const wxString& wd, clEnvList_t* env = nullptr) { - wxArrayString arr; - StdToWX::ToArrayString(command, &arr); + const wxArrayString arr = StdToWX::ToArrayString(command); return AsyncExecute(sink, accountName, StringUtils::BuildCommandStringFromArray(arr), wd, env); } }; diff --git a/Subversion2/subversion2.cpp b/Subversion2/subversion2.cpp index ef514d2ea2..d3bfcbfca1 100644 --- a/Subversion2/subversion2.cpp +++ b/Subversion2/subversion2.cpp @@ -26,6 +26,7 @@ #include "subversion2.h" #include "Keyboard/clKeyboardManager.h" +#include "StdToWX.h" #include "SvnCommitDialog.h" #include "SvnLogDialog.h" #include "SvnShowFileChangesHandler.h" @@ -483,12 +484,7 @@ void Subversion2::OnFolderAdd(wxCommandEvent& event) void Subversion2::OnCommit(wxCommandEvent& event) { // Coming from file explorer - wxArrayString paths; - if(!m_selectedFile.IsOk()) { - paths.Add("."); - } else { - paths.Add(m_selectedFile.GetFullName()); - } + const wxArrayString paths = StdToWX::ToArrayString({ m_selectedFile.IsOk() ? m_selectedFile.GetFullName() : "." }); DoCommit(paths, m_selectedFolder, event); } diff --git a/codelitephp/php-plugin/php_editor_context_menu.cpp b/codelitephp/php-plugin/php_editor_context_menu.cpp index ab152b5b4b..75e5497e08 100644 --- a/codelitephp/php-plugin/php_editor_context_menu.cpp +++ b/codelitephp/php-plugin/php_editor_context_menu.cpp @@ -6,6 +6,7 @@ #include "PHP/PHPSourceFile.h" #include "PHPRefactoring.h" #include "PHPSettersGettersDialog.h" +#include "StdToWX.h" #include "clEditorStateLocker.h" #include "clSTCLineKeeper.h" #include "cl_command_event.h" @@ -187,10 +188,12 @@ void PHPEditorContextMenu::DoGotoBeginningOfScope() GET_EDITOR_SCI_VOID(); int caret_pos = sci->GetCurrentPos(); - wxArrayString tokensBlackList; // there isn't a black list for '}' - tokensBlackList.Add(wxT("{$")); // T_CURLY_OPEN: complex variable parsed syntax - tokensBlackList.Add(wxT("${")); // T_DOLLAR_OPEN_CURLY_BRACES: complex variable parsed syntax - tokensBlackList.Add(wxT("\"${a")); // T_STRING_VARNAME: complex variable parsed syntax + const wxArrayString tokensBlackList = StdToWX::ToArrayString({ + // there isn't a black list for '}' + wxT("{$"), // T_CURLY_OPEN: complex variable parsed syntax + wxT("${"), // T_DOLLAR_OPEN_CURLY_BRACES: complex variable parsed syntax + wxT("\"${a") // T_STRING_VARNAME: complex variable parsed syntax + }); int startOfScopePos = GetTokenPosInScope(sci, wxT("{"), 0, caret_pos, false, tokensBlackList); if(startOfScopePos == wxSTC_INVALID_POSITION) startOfScopePos = caret_pos; diff --git a/git/GitConsole.cpp b/git/GitConsole.cpp index 87ed35cf97..75905c778a 100644 --- a/git/GitConsole.cpp +++ b/git/GitConsole.cpp @@ -474,9 +474,8 @@ void GitConsole::OnFileActivated(wxDataViewEvent& event) wxString difftool = data.GetDifftool(); if(difftool.empty()) { - const std::vector options = { "built-in", "vimdiff", "vimdiff1", "vimdiff2", "vimdiff3", "winmerge" }; - wxArrayString wx_options; - StdToWX::ToArrayString(options, &wx_options); + const wxArrayString wx_options = + StdToWX::ToArrayString({ "built-in", "vimdiff", "vimdiff1", "vimdiff2", "vimdiff3", "winmerge" }); difftool = ::wxGetSingleChoice(_("Choose a tool to use:"), "CodeLite", wx_options, 0); if(difftool.empty()) { // user hit cancel diff --git a/wxcrafter/aui/aui_manager_wrapper.cpp b/wxcrafter/aui/aui_manager_wrapper.cpp index 72993a9d21..0dec7ae47f 100644 --- a/wxcrafter/aui/aui_manager_wrapper.cpp +++ b/wxcrafter/aui/aui_manager_wrapper.cpp @@ -1,4 +1,6 @@ #include "aui_manager_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "color_property.h" @@ -36,10 +38,7 @@ AuiManagerWrapper::AuiManagerWrapper() AddProperty(new IntProperty(PROP_AUI_SASH_SIZE, -1, _("Set the wxAUI sash size"))); AddProperty(new CategoryProperty(_("Caption"))); - wxArrayString gradientTypes; - gradientTypes.Add("wxAUI_GRADIENT_NONE"); - gradientTypes.Add("wxAUI_GRADIENT_VERTICAL"); - gradientTypes.Add("wxAUI_GRADIENT_HORIZONTAL"); + wxArrayString gradientTypes = StdToWX::ToArrayString({"wxAUI_GRADIENT_NONE", "wxAUI_GRADIENT_VERTICAL", "wxAUI_GRADIENT_HORIZONTAL"}); AddProperty(new ChoiceProperty(PROP_AUI_GRADIENT_TYPE, gradientTypes, 0, _("Gradient type"))); AddProperty(new ColorProperty(PROP_AUI_CAPTION_COLOUR, "", _("Active caption colour"))); diff --git a/wxcrafter/aui/aui_pane_info.cpp b/wxcrafter/aui/aui_pane_info.cpp index 1a4e67f821..d7f417dbe7 100644 --- a/wxcrafter/aui/aui_pane_info.cpp +++ b/wxcrafter/aui/aui_pane_info.cpp @@ -1,6 +1,9 @@ #include "aui_pane_info.h" + +#include "StdToWX.h" #include "json_node.h" #include "wxgui_helpers.h" + #include #define BOOL_TO_STR(b) (b ? "true" : "false") @@ -63,12 +66,8 @@ void AuiPaneInfo::Construct(wxPropertyGrid* pg) const wxPGProperty* dockings = pg->Append(new wxPropertyCategory(_("Docking"))); pg->Expand(dockings); - wxArrayString directions; - directions.Add("wxAUI_DOCK_TOP"); - directions.Add("wxAUI_DOCK_RIGHT"); - directions.Add("wxAUI_DOCK_BOTTOM"); - directions.Add("wxAUI_DOCK_LEFT"); - directions.Add("wxAUI_DOCK_CENTER"); + const wxArrayString directions = StdToWX::ToArrayString( + { "wxAUI_DOCK_TOP", "wxAUI_DOCK_RIGHT", "wxAUI_DOCK_BOTTOM", "wxAUI_DOCK_LEFT", "wxAUI_DOCK_CENTER" }); wxEnumProperty* dir = (wxEnumProperty*)pg->Append(new wxEnumProperty(_("Direction"), wxPG_LABEL, directions)); pg->Expand(dir); dir->SetChoiceSelection(directions.Index(m_dockDirection)); diff --git a/wxcrafter/controls/banner_window_wrapper.cpp b/wxcrafter/controls/banner_window_wrapper.cpp index 45ea72db95..0dd9758ff0 100644 --- a/wxcrafter/controls/banner_window_wrapper.cpp +++ b/wxcrafter/controls/banner_window_wrapper.cpp @@ -1,5 +1,6 @@ #include "banner_window_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "color_property.h" @@ -13,11 +14,7 @@ BannerWindowWrapper::BannerWindowWrapper() : wxcWidget(ID_WXBANNERWINDOW) { - wxArrayString options; - options.Add("wxTOP"); - options.Add("wxBOTTOM"); - options.Add("wxLEFT"); - options.Add("wxRIGHT"); + const wxArrayString options = StdToWX::ToArrayString({ "wxTOP", "wxBOTTOM", "wxLEFT", "wxRIGHT" }); SetPropertyString(_("Common Settings"), "wxBannerWindow"); AddProperty(new MultiStringsProperty( diff --git a/wxcrafter/controls/bitmap_wrapepr.cpp b/wxcrafter/controls/bitmap_wrapepr.cpp index 7cd1daf771..0f2541d619 100644 --- a/wxcrafter/controls/bitmap_wrapepr.cpp +++ b/wxcrafter/controls/bitmap_wrapepr.cpp @@ -1,4 +1,6 @@ #include "bitmap_wrapepr.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "file_ficker_property.h" #include "wxc_bitmap_code_generator.h" @@ -29,12 +31,7 @@ wxcWidget* BitmapWrapepr::Clone() const { return new BitmapWrapepr(); } wxString BitmapWrapepr::CppCtorCode() const { - wxArrayString exts; - exts.Add(""); - exts.Add("@2x"); - exts.Add("@1.25x"); - exts.Add("@1.5x"); - + const wxArrayString exts = StdToWX::ToArrayString({ "", "@2x", "@1.25x", "@1.5x" }); wxString bmpPath = PropertyString(PROP_BITMAP_PATH); wxFileName fn(bmpPath); // Support for hi-res images diff --git a/wxcrafter/controls/button_wrapper.cpp b/wxcrafter/controls/button_wrapper.cpp index f922f905bf..efa044c364 100644 --- a/wxcrafter/controls/button_wrapper.cpp +++ b/wxcrafter/controls/button_wrapper.cpp @@ -1,4 +1,6 @@ #include "button_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "bool_property.h" #include "choice_property.h" @@ -11,6 +13,7 @@ #include "wxgui_helpers.h" #include "xmlutils.h" #include "xy_pair.h" + #include ButtonWrapper::ButtonWrapper() @@ -22,11 +25,7 @@ ButtonWrapper::ButtonWrapper() PREPEND_STYLE(wxBU_RIGHT, false); PREPEND_STYLE(wxBU_TOP, false); - wxArrayString directions; - directions.Add("wxLEFT"); - directions.Add("wxRIGHT"); - directions.Add("wxTOP"); - directions.Add("wxBOTTOM"); + const wxArrayString directions = StdToWX::ToArrayString({ "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM" }); RegisterEvent(wxT("wxEVT_COMMAND_BUTTON_CLICKED"), wxT("wxCommandEvent"), _("Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked."), diff --git a/wxcrafter/controls/data_view_list_ctrl_column.cpp b/wxcrafter/controls/data_view_list_ctrl_column.cpp index ae83c4fa38..c94ac8adbf 100644 --- a/wxcrafter/controls/data_view_list_ctrl_column.cpp +++ b/wxcrafter/controls/data_view_list_ctrl_column.cpp @@ -1,5 +1,6 @@ #include "data_view_list_ctrl_column.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "bool_property.h" #include "choice_property.h" @@ -16,23 +17,11 @@ DataViewListCtrlColumn::DataViewListCtrlColumn() m_sizerFlags.Clear(); m_properties.DeleteValues(); - wxArrayString coltype; - coltype.Add("bitmap"); - coltype.Add("check"); - coltype.Add("text"); - coltype.Add("icontext"); - coltype.Add("progress"); - coltype.Add("choice"); - - wxArrayString alignment; - alignment.Add("wxALIGN_LEFT"); - alignment.Add("wxALIGN_RIGHT"); - alignment.Add("wxALIGN_CENTER"); - - wxArrayString cellType; - cellType.Add("wxDATAVIEW_CELL_INERT"); - cellType.Add("wxDATAVIEW_CELL_ACTIVATABLE"); - cellType.Add("wxDATAVIEW_CELL_EDITABLE"); + const wxArrayString coltype = + StdToWX::ToArrayString({ "bitmap", "check", "text", "icontext", "progress", "choice" }); + const wxArrayString alignment = StdToWX::ToArrayString({ "wxALIGN_LEFT", "wxALIGN_RIGHT", "wxALIGN_CENTER" }); + const wxArrayString cellType = + StdToWX::ToArrayString({ "wxDATAVIEW_CELL_INERT", "wxDATAVIEW_CELL_ACTIVATABLE", "wxDATAVIEW_CELL_EDITABLE" }); AddProperty(new CategoryProperty(_("wxDataViewListCtrl Column"))); AddProperty(new StringProperty(PROP_NAME, _("My Column"), _("Column Caption"))); diff --git a/wxcrafter/controls/grid_wrapper.cpp b/wxcrafter/controls/grid_wrapper.cpp index 4550c9e6a5..665e960e2d 100644 --- a/wxcrafter/controls/grid_wrapper.cpp +++ b/wxcrafter/controls/grid_wrapper.cpp @@ -1,4 +1,6 @@ #include "grid_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "bool_property.h" #include "choice_property.h" @@ -13,14 +15,8 @@ GridWrapper::GridWrapper() { EnableStyle(wxT("wxWANTS_CHARS"), true); - wxArrayString vOpts, hOpts; - vOpts.Add("wxALIGN_TOP"); - vOpts.Add("wxALIGN_CENTRE"); - vOpts.Add("wxALIGN_BOTTOM"); - - hOpts.Add("wxALIGN_LEFT"); - hOpts.Add("wxALIGN_CENTRE"); - hOpts.Add("wxALIGN_RIGHT"); + const wxArrayString vOpts = StdToWX::ToArrayString({ "wxALIGN_TOP", "wxALIGN_CENTRE", "wxALIGN_BOTTOM" }); + const wxArrayString hOpts = StdToWX::ToArrayString({ "wxALIGN_LEFT", "wxALIGN_CENTRE", "wxALIGN_RIGHT" }); SetPropertyString(_("Common Settings"), "wxGrid"); AddProperty(new CategoryProperty(_("wxGrid Header"))); diff --git a/wxcrafter/controls/media_ctrl_wrapper.cpp b/wxcrafter/controls/media_ctrl_wrapper.cpp index 89e37cc30b..8cd065d4cb 100644 --- a/wxcrafter/controls/media_ctrl_wrapper.cpp +++ b/wxcrafter/controls/media_ctrl_wrapper.cpp @@ -1,5 +1,6 @@ #include "media_ctrl_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "wxgui_defs.h" @@ -10,14 +11,15 @@ MediaCtrlWrapper::MediaCtrlWrapper() : wxcWidget(ID_WXMEDIACTRL) { - wxArrayString backendList; - backendList.Add(""); // Default empty - backendList.Add("wxMEDIABACKEND_DIRECTSHOW"); - backendList.Add("wxMEDIABACKEND_MCI"); - backendList.Add("wxMEDIABACKEND_QUICKTIME"); - backendList.Add("wxMEDIABACKEND_GSTREAMER"); - backendList.Add("wxMEDIABACKEND_REALPLAYER"); - backendList.Add("wxMEDIABACKEND_WMP10"); + const wxArrayString backendList = StdToWX::ToArrayString({ + "", // Default empty + "wxMEDIABACKEND_DIRECTSHOW", + "wxMEDIABACKEND_MCI", + "wxMEDIABACKEND_QUICKTIME", + "wxMEDIABACKEND_GSTREAMER", + "wxMEDIABACKEND_REALPLAYER", + "wxMEDIABACKEND_WMP10", + }); SetPropertyString(_("Common Settings"), "wxMediaCtrl"); AddProperty(new ChoiceProperty(PROP_MC_BACKENDNAME, backendList, 0, diff --git a/wxcrafter/controls/property_grid_wrapper.cpp b/wxcrafter/controls/property_grid_wrapper.cpp index 38e7a7084b..5c4d50ee86 100644 --- a/wxcrafter/controls/property_grid_wrapper.cpp +++ b/wxcrafter/controls/property_grid_wrapper.cpp @@ -1,5 +1,6 @@ #include "property_grid_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "bool_property.h" #include "choice_property.h" @@ -26,16 +27,17 @@ PropertyGridWrapper::PropertyGridWrapper() m_styles.Clear(); static int labelCount = 0; - wxArrayString customEditors; - customEditors.Add(""); // 0 - customEditors.Add("TextCtrl"); // 1 - customEditors.Add("Choice"); // 2 - customEditors.Add("ComboBox"); // 3 - customEditors.Add("CheckBox"); // 4 - customEditors.Add("TextCtrlAndButton"); // 5 (default) - customEditors.Add("ChoiceAndButton"); // 6 - customEditors.Add("SpinCtrl"); // 7 - customEditors.Add("DatePickerCtrl"); // 8 + const wxArrayString customEditors = StdToWX::ToArrayString({ + "", // 0 + "TextCtrl", // 1 + "Choice", // 2 + "ComboBox", // 3 + "CheckBox", // 4 + "TextCtrlAndButton", // 5 (default) + "ChoiceAndButton", // 6 + "SpinCtrl", // 7 + "DatePickerCtrl", // 8 + }); SetPropertyString(_("Common Settings"), "wxPropertyGrid"); AddProperty(new CategoryProperty("wxPGProperty")); @@ -45,23 +47,24 @@ PropertyGridWrapper::PropertyGridWrapper() AddProperty(new ColorProperty(PROP_BG, "", _("Property background colour"))); AddProperty(new ChoiceProperty(PROP_CUSTOM_EDITOR, customEditors, 0, _("Set custom editor control to a property"))); - wxArrayString kindArr; - kindArr.Add("wxPropertyCategory"); // 0 - kindArr.Add("wxIntProperty"); // 1 - kindArr.Add("wxFloatProperty"); // 2 - kindArr.Add("wxBoolProperty"); // 3 - kindArr.Add("wxStringProperty"); // 4 (default) - kindArr.Add("wxLongStringProperty"); // 5 - kindArr.Add("wxDirProperty"); // 6 - kindArr.Add("wxArrayStringProperty"); // 7 - kindArr.Add("wxFileProperty"); // 8 - kindArr.Add("wxEnumProperty"); // 9 - kindArr.Add("wxEditEnumProperty"); // 10 - kindArr.Add("wxFlagsProperty"); // 11 - kindArr.Add("wxDateProperty"); // 12 - kindArr.Add("wxImageFileProperty"); // 13 - kindArr.Add("wxFontProperty"); // 14 - kindArr.Add("wxSystemColourProperty"); // 15 + const wxArrayString kindArr = StdToWX::ToArrayString({ + "wxPropertyCategory", // 0 + "wxIntProperty", // 1 + "wxFloatProperty", // 2 + "wxBoolProperty", // 3 + "wxStringProperty", // 4 (default) + "wxLongStringProperty", // 5 + "wxDirProperty", // 6 + "wxArrayStringProperty", // 7 + "wxFileProperty", // 8 + "wxEnumProperty", // 9 + "wxEditEnumProperty", // 10 + "wxFlagsProperty", // 11 + "wxDateProperty", // 12 + "wxImageFileProperty", // 13 + "wxFontProperty", // 14 + "wxSystemColourProperty", // 15 + }); AddProperty(new ChoiceProperty(PROP_KIND, kindArr, 4, _("The property kind"))); diff --git a/wxcrafter/controls/ribbon_bar_wrapper.cpp b/wxcrafter/controls/ribbon_bar_wrapper.cpp index ab7194995e..f9b74556eb 100644 --- a/wxcrafter/controls/ribbon_bar_wrapper.cpp +++ b/wxcrafter/controls/ribbon_bar_wrapper.cpp @@ -1,5 +1,6 @@ #include "ribbon_bar_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "ribbon_page_wrapper.h" @@ -38,11 +39,7 @@ RibbonBarWrapper::RibbonBarWrapper() DelProperty(PROP_CONTROL_SPECIFIC_SETTINGS); AddProperty(new CategoryProperty("wxRibbonBar")); - wxArrayString themes; - themes.Add("Default"); - themes.Add("Generic"); - themes.Add("MSW"); - + const wxArrayString themes = StdToWX::ToArrayString({ "Default", "Generic", "MSW" }); AddProperty(new ChoiceProperty(PROP_RIBBON_THEME, themes, 0, _("Select the ribbon bar theme"))); m_namePattern = "m_ribbonBar"; SetName(GenerateName()); diff --git a/wxcrafter/controls/ribbon_button.cpp b/wxcrafter/controls/ribbon_button.cpp index bb12a10e20..6aed08456a 100644 --- a/wxcrafter/controls/ribbon_button.cpp +++ b/wxcrafter/controls/ribbon_button.cpp @@ -1,5 +1,6 @@ #include "ribbon_button.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "file_ficker_property.h" @@ -10,11 +11,8 @@ RibbonButtonBase::RibbonButtonBase(int type) : wxcWidget(type) { - wxArrayString kind; - kind.Add("wxRIBBON_BUTTON_NORMAL"); - kind.Add("wxRIBBON_BUTTON_DROPDOWN"); - kind.Add("wxRIBBON_BUTTON_HYBRID"); - kind.Add("wxRIBBON_BUTTON_TOGGLE"); + const wxArrayString kind = StdToWX::ToArrayString( + { "wxRIBBON_BUTTON_NORMAL", "wxRIBBON_BUTTON_DROPDOWN", "wxRIBBON_BUTTON_HYBRID", "wxRIBBON_BUTTON_TOGGLE" }); m_isButtonBar = !(type == ID_WXRIBBONTOOL || type == ID_WXRIBBONDROPDOWNTOOL || type == ID_WXRIBBONHYBRIDTOOL || type == ID_WXRIBBONTOGGLETOOL); diff --git a/wxcrafter/controls/simple_book_wrapper.cpp b/wxcrafter/controls/simple_book_wrapper.cpp index 8c239cef45..93847ea1cc 100644 --- a/wxcrafter/controls/simple_book_wrapper.cpp +++ b/wxcrafter/controls/simple_book_wrapper.cpp @@ -1,4 +1,6 @@ #include "simple_book_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "wxgui_defs.h" @@ -18,19 +20,11 @@ SimpleBookWrapper::SimpleBookWrapper() RegisterEvent(wxT("wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING"), wxT("wxNotebookEvent"), _("The page selection is about to be changed. This event can be vetoed")); - wxArrayString effects; - effects.Add("wxSHOW_EFFECT_NONE"); - effects.Add("wxSHOW_EFFECT_ROLL_TO_LEFT"); - effects.Add("wxSHOW_EFFECT_ROLL_TO_RIGHT"); - effects.Add("wxSHOW_EFFECT_ROLL_TO_TOP"); - effects.Add("wxSHOW_EFFECT_ROLL_TO_BOTTOM"); - effects.Add("wxSHOW_EFFECT_SLIDE_TO_LEFT"); - effects.Add("wxSHOW_EFFECT_SLIDE_TO_RIGHT"); - effects.Add("wxSHOW_EFFECT_SLIDE_TO_TOP"); - effects.Add("wxSHOW_EFFECT_SLIDE_TO_BOTTOM"); - effects.Add("wxSHOW_EFFECT_BLEND"); - effects.Add("wxSHOW_EFFECT_EXPAND"); - + const wxArrayString effects = StdToWX::ToArrayString( + { "wxSHOW_EFFECT_NONE", "wxSHOW_EFFECT_ROLL_TO_LEFT", "wxSHOW_EFFECT_ROLL_TO_RIGHT", + "wxSHOW_EFFECT_ROLL_TO_TOP", "wxSHOW_EFFECT_ROLL_TO_BOTTOM", "wxSHOW_EFFECT_SLIDE_TO_LEFT", + "wxSHOW_EFFECT_SLIDE_TO_RIGHT", "wxSHOW_EFFECT_SLIDE_TO_TOP", "wxSHOW_EFFECT_SLIDE_TO_BOTTOM", + "wxSHOW_EFFECT_BLEND", "wxSHOW_EFFECT_EXPAND" }); SetPropertyString(_("Common Settings"), "wxSimplebook"); AddProperty(new ChoiceProperty(PROP_EFFECT, effects, 0, _("Set the same effect to use for both showing and hiding the pages"))); diff --git a/wxcrafter/controls/styled_text_ctrl_wrapper.cpp b/wxcrafter/controls/styled_text_ctrl_wrapper.cpp index 1bc72b6435..e5fc4905ac 100644 --- a/wxcrafter/controls/styled_text_ctrl_wrapper.cpp +++ b/wxcrafter/controls/styled_text_ctrl_wrapper.cpp @@ -1,4 +1,6 @@ #include "styled_text_ctrl_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "bool_property.h" #include "category_property.h" @@ -6,6 +8,7 @@ #include "font_property.h" #include "multi_strings_property.h" #include "wxgui_helpers.h" + #include StyledTextCtrlWrapper::LexersMap_t StyledTextCtrlWrapper::m_lexers; @@ -14,6 +17,9 @@ StyledTextCtrlWrapper::LexersMap_t StyledTextCtrlWrapper::m_lexers; StyledTextCtrlWrapper::StyledTextCtrlWrapper() : wxcWidget(ID_WXSTC) + , m_wrapOptions(StdToWX::ToArrayString({ "None", "Word", "Char" })) + , m_eolMode(StdToWX::ToArrayString({ "CRLF", "CR", "LF", "Default" })) + , m_indentGuides(StdToWX::ToArrayString({ "None", "Real", "Look Forward", "Look Both" })) { // Register the known lexers if(m_lexers.empty()) { @@ -179,24 +185,12 @@ StyledTextCtrlWrapper::StyledTextCtrlWrapper() AddProperty(new BoolProperty(PROP_STC_MARGIN_SEPARATOR, false, "")); AddProperty(new BoolProperty(PROP_STC_MARGIN_SYMBOL, false, "")); - m_wrapOptions.Add("None"); // 0 - m_wrapOptions.Add("Word"); // 1 - m_wrapOptions.Add("Char"); // 2 AddProperty(new ChoiceProperty(PROP_STC_WRAP, m_wrapOptions, 0, _("Wrap text"))); - m_indentGuides.Add("None"); - m_indentGuides.Add("Real"); - m_indentGuides.Add("Look Forward"); - m_indentGuides.Add("Look Both"); - AddProperty(new ChoiceProperty(PROP_STC_INDENT_GUIDES, m_indentGuides, 0, _("Display indentation guides (vertical lines)"))); - m_eolMode.Add("CRLF"); // 0 - m_eolMode.Add("CR"); // 1 - m_eolMode.Add("LF"); // 2 - m_eolMode.Add("Default"); // 3 AddProperty(new ChoiceProperty(PROP_STC_EOL_MODE, m_eolMode, 3, _("EOL Mode"))); AddProperty(new BoolProperty(PROP_STC_VIEW_EOL, false, _("Display the line endings characters"))); diff --git a/wxcrafter/controls/task_bar_icon_wrapper.cpp b/wxcrafter/controls/task_bar_icon_wrapper.cpp index 21249b4679..4177925e3e 100644 --- a/wxcrafter/controls/task_bar_icon_wrapper.cpp +++ b/wxcrafter/controls/task_bar_icon_wrapper.cpp @@ -1,5 +1,6 @@ #include "task_bar_icon_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "bitmap_picker_property.h" #include "choice_property.h" @@ -14,10 +15,8 @@ TaskBarIconWrapper::TaskBarIconWrapper() { m_styles.Clear(); AddText(PROP_TOOLTIP, _("Set the wxTaskBarIcon tooltip")); - wxArrayString types; - types.Add("wxTBI_DEFAULT_TYPE"); - types.Add("wxTBI_DOCK"); - types.Add("wxTBI_CUSTOM_STATUSITEM"); + const wxArrayString types = + StdToWX::ToArrayString({ "wxTBI_DEFAULT_TYPE", "wxTBI_DOCK", "wxTBI_CUSTOM_STATUSITEM" }); SetPropertyString(_("Common Settings"), "wxTaskBarIcon"); AddProperty( diff --git a/wxcrafter/controls/top_level_win_wrapper.cpp b/wxcrafter/controls/top_level_win_wrapper.cpp index da41369dc3..db907d1b68 100644 --- a/wxcrafter/controls/top_level_win_wrapper.cpp +++ b/wxcrafter/controls/top_level_win_wrapper.cpp @@ -1,5 +1,6 @@ #include "top_level_win_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "virtual_folder_property.h" @@ -51,12 +52,7 @@ TopLevelWinWrapper::TopLevelWinWrapper(int type) true); } - wxArrayString arr; - arr.Add(""); - arr.Add("wxBOTH"); - arr.Add("wxVERTICAL"); - arr.Add("wxHORIZONTAL"); - + const wxArrayString arr = StdToWX::ToArrayString({ "", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL" }); AddProperty(new StringProperty(PROP_TITLE, "", _("The title, if any"))); AddProperty( new VirtualFolderProperty(PROP_VIRTUAL_FOLDER, "", _("CodeLite's virtual folder for the generated files"))); diff --git a/wxcrafter/controls/tree_list_ctrl_column_wrapper.cpp b/wxcrafter/controls/tree_list_ctrl_column_wrapper.cpp index 00a92b8dda..4d4194f414 100644 --- a/wxcrafter/controls/tree_list_ctrl_column_wrapper.cpp +++ b/wxcrafter/controls/tree_list_ctrl_column_wrapper.cpp @@ -1,5 +1,6 @@ #include "tree_list_ctrl_column_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "col_header_flags_property.h" @@ -14,10 +15,7 @@ TreeListCtrlColumnWrapper::TreeListCtrlColumnWrapper() m_sizerFlags.Clear(); m_properties.DeleteValues(); - wxArrayString alignment; - alignment.Add("wxALIGN_LEFT"); - alignment.Add("wxALIGN_RIGHT"); - alignment.Add("wxALIGN_CENTER"); + const wxArrayString alignment = StdToWX::ToArrayString({ "wxALIGN_LEFT", "wxALIGN_RIGHT", "wxALIGN_CENTER" }); // FIXME: add alignment + column flags here AddProperty(new CategoryProperty(_("wxTreeListCtrl Column"))); diff --git a/wxcrafter/sizers/box_sizer_wrapper.cpp b/wxcrafter/sizers/box_sizer_wrapper.cpp index 70768303b5..d233802edf 100644 --- a/wxcrafter/sizers/box_sizer_wrapper.cpp +++ b/wxcrafter/sizers/box_sizer_wrapper.cpp @@ -1,5 +1,6 @@ #include "box_sizer_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "wxgui_defs.h" @@ -11,9 +12,7 @@ BoxSizerWrapper::BoxSizerWrapper() m_type = ID_WXBOXSIZER; m_styles.Clear(); // Sizer has no styles - wxArrayString arr; - arr.Add("wxVERTICAL"); - arr.Add("wxHORIZONTAL"); + const wxArrayString arr = StdToWX::ToArrayString({ "wxVERTICAL", "wxHORIZONTAL" }); SetPropertyString(_("Common Settings"), "wxBoxSizer"); AddProperty(new ChoiceProperty(PROP_ORIENTATION, arr, 0, _("Sizer orientation"))); diff --git a/wxcrafter/sizers/static_box_sizer_wrapper.cpp b/wxcrafter/sizers/static_box_sizer_wrapper.cpp index c4e2c4afd7..87a4459d05 100644 --- a/wxcrafter/sizers/static_box_sizer_wrapper.cpp +++ b/wxcrafter/sizers/static_box_sizer_wrapper.cpp @@ -1,5 +1,6 @@ #include "static_box_sizer_wrapper.h" +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "string_property.h" @@ -11,9 +12,7 @@ StaticBoxSizerWrapper::StaticBoxSizerWrapper() m_type = ID_WXSTATICBOXSIZER; m_styles.Clear(); // Sizer has no styles - wxArrayString arr; - arr.Add("Vertical"); - arr.Add("Horizontal"); + const wxArrayString arr = StdToWX::ToArrayString({ "Vertical", "Horizontal" }); SetPropertyString(_("Common Settings"), "wxStaticBoxSizer"); AddProperty(new ChoiceProperty(PROP_ORIENTATION, arr, 0, _("Sizer orientation"))); diff --git a/wxcrafter/sizers/std_button_wrapper.cpp b/wxcrafter/sizers/std_button_wrapper.cpp index 2239621f1d..26d3cf8665 100644 --- a/wxcrafter/sizers/std_button_wrapper.cpp +++ b/wxcrafter/sizers/std_button_wrapper.cpp @@ -1,4 +1,6 @@ #include "std_button_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "bool_property.h" #include "choice_property.h" @@ -10,16 +12,8 @@ StdButtonWrapper::StdButtonWrapper() : wxcWidget(ID_WXSTDBUTTON) { m_properties.DeleteValues(); - wxArrayString ids; - ids.Add("wxID_OK"); - ids.Add("wxID_YES"); - ids.Add("wxID_SAVE"); - ids.Add("wxID_APPLY"); - ids.Add("wxID_CLOSE"); - ids.Add("wxID_NO"); - ids.Add("wxID_CANCEL"); - ids.Add("wxID_HELP"); - ids.Add("wxID_CONTEXT_HELP"); + const wxArrayString ids = StdToWX::ToArrayString({ "wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", + "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP" }); RegisterEvent(wxT("wxEVT_COMMAND_BUTTON_CLICKED"), wxT("wxCommandEvent"), _("Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked."), diff --git a/wxcrafter/src/BitmapSelectorDlg.cpp b/wxcrafter/src/BitmapSelectorDlg.cpp index 2f7fe86179..3ab9e125a9 100644 --- a/wxcrafter/src/BitmapSelectorDlg.cpp +++ b/wxcrafter/src/BitmapSelectorDlg.cpp @@ -1,68 +1,70 @@ #include "BitmapSelectorDlg.h" + +#include "StdToWX.h" +#include "windowattrmanager.h" #include "wxc_project_metadata.h" #include "wxc_settings.h" #include "wxgui_helpers.h" -#include + #include #include BitmapSelectorDlg::BitmapSelectorDlg(wxWindow* parent, const wxString& selection) : BitmapSelectorDlgBase(parent) { - wxArrayString arr; - arr.Add(wxT("wxART_ERROR")); - arr.Add(wxT("wxART_QUESTION")); - arr.Add(wxT("wxART_WARNING")); - arr.Add(wxT("wxART_INFORMATION")); - arr.Add(wxT("wxART_ADD_BOOKMARK")); - arr.Add(wxT("wxART_DEL_BOOKMARK")); - arr.Add(wxT("wxART_HELP_SIDE_PANEL")); - arr.Add(wxT("wxART_HELP_SETTINGS")); - arr.Add(wxT("wxART_HELP_BOOK")); - arr.Add(wxT("wxART_HELP_FOLDER")); - arr.Add(wxT("wxART_HELP_PAGE")); - arr.Add(wxT("wxART_GO_BACK")); - arr.Add(wxT("wxART_GO_FORWARD")); - arr.Add(wxT("wxART_GO_UP")); - arr.Add(wxT("wxART_GO_DOWN")); - arr.Add(wxT("wxART_GO_TO_PARENT")); - arr.Add(wxT("wxART_GO_HOME")); - arr.Add(wxT("wxART_GOTO_FIRST")); - arr.Add(wxT("wxART_GOTO_LAST")); - arr.Add(wxT("wxART_PRINT")); - arr.Add(wxT("wxART_HELP")); - arr.Add(wxT("wxART_TIP")); - arr.Add(wxT("wxART_REPORT_VIEW")); - arr.Add(wxT("wxART_LIST_VIEW")); - arr.Add(wxT("wxART_NEW_DIR")); - arr.Add(wxT("wxART_FOLDER")); - arr.Add(wxT("wxART_FOLDER_OPEN")); - arr.Add(wxT("wxART_GO_DIR_UP")); - arr.Add(wxT("wxART_EXECUTABLE_FILE")); - arr.Add(wxT("wxART_NORMAL_FILE")); - arr.Add(wxT("wxART_TICK_MARK")); - arr.Add(wxT("wxART_CROSS_MARK")); - arr.Add(wxT("wxART_MISSING_IMAGE")); - arr.Add(wxT("wxART_NEW")); - arr.Add(wxT("wxART_FILE_OPEN")); - arr.Add(wxT("wxART_FILE_SAVE")); - arr.Add(wxT("wxART_FILE_SAVE_AS")); - arr.Add(wxT("wxART_DELETE")); - arr.Add(wxT("wxART_COPY")); - arr.Add(wxT("wxART_CUT")); - arr.Add(wxT("wxART_PASTE")); - arr.Add(wxT("wxART_UNDO")); - arr.Add(wxT("wxART_REDO")); - arr.Add(wxT("wxART_PLUS")); - arr.Add(wxT("wxART_MINUS")); - arr.Add(wxT("wxART_CLOSE")); - arr.Add(wxT("wxART_QUIT")); - arr.Add(wxT("wxART_FIND")); - arr.Add(wxT("wxART_FIND_AND_REPLACE")); - arr.Add(wxT("wxART_HARDDISK")); - arr.Add(wxT("wxART_FLOPPY")); - arr.Add(wxT("wxART_CDROM")); - arr.Add(wxT("wxART_REMOVABLE")); + wxArrayString arr = StdToWX::ToArrayString({ wxT("wxART_ERROR"), + wxT("wxART_QUESTION"), + wxT("wxART_WARNING"), + wxT("wxART_INFORMATION"), + wxT("wxART_ADD_BOOKMARK"), + wxT("wxART_DEL_BOOKMARK"), + wxT("wxART_HELP_SIDE_PANEL"), + wxT("wxART_HELP_SETTINGS"), + wxT("wxART_HELP_BOOK"), + wxT("wxART_HELP_FOLDER"), + wxT("wxART_HELP_PAGE"), + wxT("wxART_GO_BACK"), + wxT("wxART_GO_FORWARD"), + wxT("wxART_GO_UP"), + wxT("wxART_GO_DOWN"), + wxT("wxART_GO_TO_PARENT"), + wxT("wxART_GO_HOME"), + wxT("wxART_GOTO_FIRST"), + wxT("wxART_GOTO_LAST"), + wxT("wxART_PRINT"), + wxT("wxART_HELP"), + wxT("wxART_TIP"), + wxT("wxART_REPORT_VIEW"), + wxT("wxART_LIST_VIEW"), + wxT("wxART_NEW_DIR"), + wxT("wxART_FOLDER"), + wxT("wxART_FOLDER_OPEN"), + wxT("wxART_GO_DIR_UP"), + wxT("wxART_EXECUTABLE_FILE"), + wxT("wxART_NORMAL_FILE"), + wxT("wxART_TICK_MARK"), + wxT("wxART_CROSS_MARK"), + wxT("wxART_MISSING_IMAGE"), + wxT("wxART_NEW"), + wxT("wxART_FILE_OPEN"), + wxT("wxART_FILE_SAVE"), + wxT("wxART_FILE_SAVE_AS"), + wxT("wxART_DELETE"), + wxT("wxART_COPY"), + wxT("wxART_CUT"), + wxT("wxART_PASTE"), + wxT("wxART_UNDO"), + wxT("wxART_REDO"), + wxT("wxART_PLUS"), + wxT("wxART_MINUS"), + wxT("wxART_CLOSE"), + wxT("wxART_QUIT"), + wxT("wxART_FIND"), + wxT("wxART_FIND_AND_REPLACE"), + wxT("wxART_HARDDISK"), + wxT("wxART_FLOPPY"), + wxT("wxART_CDROM"), + wxT("wxART_REMOVABLE") }); arr.Sort(); m_choiceArtID->Append(arr); diff --git a/wxcrafter/src/col_header_flags_property.cpp b/wxcrafter/src/col_header_flags_property.cpp index 77dc4fc64c..f9a5d43b6a 100644 --- a/wxcrafter/src/col_header_flags_property.cpp +++ b/wxcrafter/src/col_header_flags_property.cpp @@ -1,5 +1,8 @@ #include "col_header_flags_property.h" + +#include "StdToWX.h" #include "wxgui_helpers.h" + #include #include @@ -10,10 +13,12 @@ ColHeaderFlagsProperty::ColHeaderFlagsProperty(const wxString& label, int initia { SetLabel(label); if(kind == eColumnKind::kListCtrl) { - m_names.Add("wxCOL_RESIZABLE"); - m_names.Add("wxCOL_SORTABLE"); - m_names.Add("wxCOL_REORDERABLE"); - m_names.Add("wxCOL_HIDDEN"); + m_names = StdToWX::ToArrayString({ + "wxCOL_RESIZABLE", + "wxCOL_SORTABLE", + "wxCOL_REORDERABLE", + "wxCOL_HIDDEN", + }); m_values.Add(wxCOL_RESIZABLE); m_values.Add(wxCOL_SORTABLE); @@ -21,11 +26,8 @@ ColHeaderFlagsProperty::ColHeaderFlagsProperty(const wxString& label, int initia m_values.Add(wxCOL_HIDDEN); } else { - m_names.Add("wxDATAVIEW_COL_RESIZABLE"); - m_names.Add("wxDATAVIEW_COL_SORTABLE"); - m_names.Add("wxDATAVIEW_COL_REORDERABLE"); - m_names.Add("wxDATAVIEW_COL_HIDDEN"); - + m_names = StdToWX::ToArrayString({ "wxDATAVIEW_COL_RESIZABLE", "wxDATAVIEW_COL_SORTABLE", + "wxDATAVIEW_COL_REORDERABLE", "wxDATAVIEW_COL_HIDDEN" }); m_values.Add(wxDATAVIEW_COL_RESIZABLE); m_values.Add(wxDATAVIEW_COL_SORTABLE); m_values.Add(wxDATAVIEW_COL_REORDERABLE); diff --git a/wxcrafter/src/winid_property.cpp b/wxcrafter/src/winid_property.cpp index 514c81eca7..dd89ad4ccf 100644 --- a/wxcrafter/src/winid_property.cpp +++ b/wxcrafter/src/winid_property.cpp @@ -1,5 +1,8 @@ #include "winid_property.h" + +#include "StdToWX.h" #include "wxgui_defs.h" + #include #include #include @@ -16,110 +19,110 @@ WinIdProperty::WinIdProperty() m_winid = wxT("wxID_ANY"); if(s_options.IsEmpty()) { - s_options.Add(wxT("wxID_ANY")); - s_options.Add(wxT("wxID_SEPARATOR")); - s_options.Add(wxT("wxID_OPEN")); - s_options.Add(wxT("wxID_CLOSE")); - s_options.Add(wxT("wxID_NEW")); - s_options.Add(wxT("wxID_SAVE")); - s_options.Add(wxT("wxID_SAVEAS")); - s_options.Add(wxT("wxID_REVERT")); - s_options.Add(wxT("wxID_EXIT")); - s_options.Add(wxT("wxID_UNDO")); - s_options.Add(wxT("wxID_REDO")); - s_options.Add(wxT("wxID_HELP")); - s_options.Add(wxT("wxID_PRINT")); - s_options.Add(wxT("wxID_PRINT_SETUP")); - s_options.Add(wxT("wxID_PAGE_SETUP")); - s_options.Add(wxT("wxID_PREVIEW")); - s_options.Add(wxT("wxID_ABOUT")); - s_options.Add(wxT("wxID_HELP_CONTENTS")); - s_options.Add(wxT("wxID_HELP_INDEX")); - s_options.Add(wxT("wxID_HELP_SEARCH")); - s_options.Add(wxT("wxID_HELP_COMMANDS")); - s_options.Add(wxT("wxID_HELP_PROCEDURES")); - s_options.Add(wxT("wxID_HELP_CONTEXT")); - s_options.Add(wxT("wxID_CLOSE_ALL")); - s_options.Add(wxT("wxID_PREFERENCES")); - s_options.Add(wxT("wxID_EDIT")); - s_options.Add(wxT("wxID_CUT")); - s_options.Add(wxT("wxID_COPY")); - s_options.Add(wxT("wxID_PASTE")); - s_options.Add(wxT("wxID_CLEAR")); - s_options.Add(wxT("wxID_FIND")); - s_options.Add(wxT("wxID_DUPLICATE")); - s_options.Add(wxT("wxID_SELECTALL")); - s_options.Add(wxT("wxID_DELETE")); - s_options.Add(wxT("wxID_REPLACE")); - s_options.Add(wxT("wxID_REPLACE_ALL")); - s_options.Add(wxT("wxID_PROPERTIES")); - s_options.Add(wxT("wxID_VIEW_DETAILS")); - s_options.Add(wxT("wxID_VIEW_LARGEICONS")); - s_options.Add(wxT("wxID_VIEW_SMALLICONS")); - s_options.Add(wxT("wxID_VIEW_LIST")); - s_options.Add(wxT("wxID_VIEW_SORTDATE")); - s_options.Add(wxT("wxID_VIEW_SORTNAME")); - s_options.Add(wxT("wxID_VIEW_SORTSIZE")); - s_options.Add(wxT("wxID_VIEW_SORTTYPE")); - s_options.Add(wxT("wxID_OK")); - s_options.Add(wxT("wxID_CANCEL")); - s_options.Add(wxT("wxID_APPLY")); - s_options.Add(wxT("wxID_YES")); - s_options.Add(wxT("wxID_NO")); - s_options.Add(wxT("wxID_STATIC")); - s_options.Add(wxT("wxID_FORWARD")); - s_options.Add(wxT("wxID_BACKWARD")); - s_options.Add(wxT("wxID_DEFAULT")); - s_options.Add(wxT("wxID_MORE")); - s_options.Add(wxT("wxID_SETUP")); - s_options.Add(wxT("wxID_RESET")); - s_options.Add(wxT("wxID_CONTEXT_HELP")); - s_options.Add(wxT("wxID_YESTOALL")); - s_options.Add(wxT("wxID_NOTOALL")); - s_options.Add(wxT("wxID_ABORT")); - s_options.Add(wxT("wxID_RETRY")); - s_options.Add(wxT("wxID_IGNORE")); - s_options.Add(wxT("wxID_ADD")); - s_options.Add(wxT("wxID_REMOVE")); - s_options.Add(wxT("wxID_UP")); - s_options.Add(wxT("wxID_DOWN")); - s_options.Add(wxT("wxID_HOME")); - s_options.Add(wxT("wxID_REFRESH")); - s_options.Add(wxT("wxID_STOP")); - s_options.Add(wxT("wxID_INDEX")); - s_options.Add(wxT("wxID_BOLD")); - s_options.Add(wxT("wxID_ITALIC")); - s_options.Add(wxT("wxID_JUSTIFY_CENTER")); - s_options.Add(wxT("wxID_JUSTIFY_FILL")); - s_options.Add(wxT("wxID_JUSTIFY_RIGHT")); - s_options.Add(wxT("wxID_JUSTIFY_LEFT")); - s_options.Add(wxT("wxID_UNDERLINE")); - s_options.Add(wxT("wxID_INDENT")); - s_options.Add(wxT("wxID_UNINDENT")); - s_options.Add(wxT("wxID_ZOOM_100")); - s_options.Add(wxT("wxID_ZOOM_FIT")); - s_options.Add(wxT("wxID_ZOOM_IN")); - s_options.Add(wxT("wxID_ZOOM_OUT")); - s_options.Add(wxT("wxID_UNDELETE")); - s_options.Add(wxT("wxID_REVERT_TO_SAVED")); - s_options.Add(wxT("wxID_CDROM")); - s_options.Add(wxT("wxID_CONVERT")); - s_options.Add(wxT("wxID_EXECUTE")); - s_options.Add(wxT("wxID_FLOPPY")); - s_options.Add(wxT("wxID_HARDDISK")); - s_options.Add(wxT("wxID_BOTTOM")); - s_options.Add(wxT("wxID_FIRST")); - s_options.Add(wxT("wxID_LAST")); - s_options.Add(wxT("wxID_TOP")); - s_options.Add(wxT("wxID_INFO")); - s_options.Add(wxT("wxID_JUMP_TO")); - s_options.Add(wxT("wxID_NETWORK")); - s_options.Add(wxT("wxID_SELECT_COLOR")); - s_options.Add(wxT("wxID_SELECT_FONT")); - s_options.Add(wxT("wxID_SORT_ASCENDING")); - s_options.Add(wxT("wxID_SORT_DESCENDING")); - s_options.Add(wxT("wxID_SPELL_CHECK")); - s_options.Add(wxT("wxID_STRIKETHROUGH")); + s_options = StdToWX::ToArrayString({ wxT("wxID_ANY"), + wxT("wxID_SEPARATOR"), + wxT("wxID_OPEN"), + wxT("wxID_CLOSE"), + wxT("wxID_NEW"), + wxT("wxID_SAVE"), + wxT("wxID_SAVEAS"), + wxT("wxID_REVERT"), + wxT("wxID_EXIT"), + wxT("wxID_UNDO"), + wxT("wxID_REDO"), + wxT("wxID_HELP"), + wxT("wxID_PRINT"), + wxT("wxID_PRINT_SETUP"), + wxT("wxID_PAGE_SETUP"), + wxT("wxID_PREVIEW"), + wxT("wxID_ABOUT"), + wxT("wxID_HELP_CONTENTS"), + wxT("wxID_HELP_INDEX"), + wxT("wxID_HELP_SEARCH"), + wxT("wxID_HELP_COMMANDS"), + wxT("wxID_HELP_PROCEDURES"), + wxT("wxID_HELP_CONTEXT"), + wxT("wxID_CLOSE_ALL"), + wxT("wxID_PREFERENCES"), + wxT("wxID_EDIT"), + wxT("wxID_CUT"), + wxT("wxID_COPY"), + wxT("wxID_PASTE"), + wxT("wxID_CLEAR"), + wxT("wxID_FIND"), + wxT("wxID_DUPLICATE"), + wxT("wxID_SELECTALL"), + wxT("wxID_DELETE"), + wxT("wxID_REPLACE"), + wxT("wxID_REPLACE_ALL"), + wxT("wxID_PROPERTIES"), + wxT("wxID_VIEW_DETAILS"), + wxT("wxID_VIEW_LARGEICONS"), + wxT("wxID_VIEW_SMALLICONS"), + wxT("wxID_VIEW_LIST"), + wxT("wxID_VIEW_SORTDATE"), + wxT("wxID_VIEW_SORTNAME"), + wxT("wxID_VIEW_SORTSIZE"), + wxT("wxID_VIEW_SORTTYPE"), + wxT("wxID_OK"), + wxT("wxID_CANCEL"), + wxT("wxID_APPLY"), + wxT("wxID_YES"), + wxT("wxID_NO"), + wxT("wxID_STATIC"), + wxT("wxID_FORWARD"), + wxT("wxID_BACKWARD"), + wxT("wxID_DEFAULT"), + wxT("wxID_MORE"), + wxT("wxID_SETUP"), + wxT("wxID_RESET"), + wxT("wxID_CONTEXT_HELP"), + wxT("wxID_YESTOALL"), + wxT("wxID_NOTOALL"), + wxT("wxID_ABORT"), + wxT("wxID_RETRY"), + wxT("wxID_IGNORE"), + wxT("wxID_ADD"), + wxT("wxID_REMOVE"), + wxT("wxID_UP"), + wxT("wxID_DOWN"), + wxT("wxID_HOME"), + wxT("wxID_REFRESH"), + wxT("wxID_STOP"), + wxT("wxID_INDEX"), + wxT("wxID_BOLD"), + wxT("wxID_ITALIC"), + wxT("wxID_JUSTIFY_CENTER"), + wxT("wxID_JUSTIFY_FILL"), + wxT("wxID_JUSTIFY_RIGHT"), + wxT("wxID_JUSTIFY_LEFT"), + wxT("wxID_UNDERLINE"), + wxT("wxID_INDENT"), + wxT("wxID_UNINDENT"), + wxT("wxID_ZOOM_100"), + wxT("wxID_ZOOM_FIT"), + wxT("wxID_ZOOM_IN"), + wxT("wxID_ZOOM_OUT"), + wxT("wxID_UNDELETE"), + wxT("wxID_REVERT_TO_SAVED"), + wxT("wxID_CDROM"), + wxT("wxID_CONVERT"), + wxT("wxID_EXECUTE"), + wxT("wxID_FLOPPY"), + wxT("wxID_HARDDISK"), + wxT("wxID_BOTTOM"), + wxT("wxID_FIRST"), + wxT("wxID_LAST"), + wxT("wxID_TOP"), + wxT("wxID_INFO"), + wxT("wxID_JUMP_TO"), + wxT("wxID_NETWORK"), + wxT("wxID_SELECT_COLOR"), + wxT("wxID_SELECT_FONT"), + wxT("wxID_SORT_ASCENDING"), + wxT("wxID_SORT_DESCENDING"), + wxT("wxID_SPELL_CHECK"), + wxT("wxID_STRIKETHROUGH") }); std::sort(s_options.begin(), s_options.end()); m_winIdSet.insert(s_options.begin(), s_options.end()); diff --git a/wxcrafter/src/wxc_bitmap_code_generator.cpp b/wxcrafter/src/wxc_bitmap_code_generator.cpp index 81066d1e54..2d9cf9a7c0 100644 --- a/wxcrafter/src/wxc_bitmap_code_generator.cpp +++ b/wxcrafter/src/wxc_bitmap_code_generator.cpp @@ -2,6 +2,7 @@ #include "AsyncProcess/processreaderthread.h" #include "DirectoryChanger.h" +#include "StdToWX.h" #include "environmentconfig.h" #include "globals.h" #include "top_level_win_wrapper.h" @@ -56,10 +57,7 @@ bool wxcCodeGeneratorHelper::CreateXRC() MapString_t::const_iterator iter = m_bitmapMap.begin(); // Supported hi-res images extension - wxArrayString exts; - exts.Add("@2x"); - exts.Add("@1.25x"); - exts.Add("@1.5x"); + const wxArrayString exts = StdToWX::ToArrayString({ "@2x", "@1.25x", "@1.5x" }); for(; iter != m_bitmapMap.end(); ++iter) { wxFileName fn(iter->second); diff --git a/wxcrafter/src/wxc_widget.cpp b/wxcrafter/src/wxc_widget.cpp index cfc3834e9b..d44cf3bab8 100644 --- a/wxcrafter/src/wxc_widget.cpp +++ b/wxcrafter/src/wxc_widget.cpp @@ -13,6 +13,7 @@ #include "multi_strings_property.h" #include "notebook_base_wrapper.h" #include "notebook_page_wrapper.h" +#include "StdToWX.h" #include "top_level_win_wrapper.h" #include "winid_property.h" #include "wx_collapsible_pane_pane_wrapper.h" @@ -26,7 +27,6 @@ #include size_t wxcWidget::s_objCounter = 0; -wxcWidget::AntiGroupMap_t wxcWidget::s_antiGroup; wxcWidget::SizerFlagsValueSet_t wxcWidget::s_sizerFlagsValue; CustomControlTemplateMap_t wxcWidget::ms_customControlsUsed; int wxcWidget::m_copyCounter = 0; @@ -40,32 +40,6 @@ wxcWidget::wxcWidget(int type) , m_eventsMenu(NULL) , m_copyReason(CR_Copy) { - if(s_antiGroup.empty()) { - s_antiGroup.insert(std::make_pair("wxALIGN_LEFT", wxArrayString())); - s_antiGroup["wxALIGN_LEFT"].Add("wxALIGN_CENTER_HORIZONTAL"); - s_antiGroup["wxALIGN_LEFT"].Add("wxALIGN_RIGHT"); - - s_antiGroup.insert(std::make_pair("wxALIGN_CENTER_HORIZONTAL", wxArrayString())); - s_antiGroup["wxALIGN_CENTER_HORIZONTAL"].Add("wxALIGN_LEFT"); - s_antiGroup["wxALIGN_CENTER_HORIZONTAL"].Add("wxALIGN_RIGHT"); - - s_antiGroup.insert(std::make_pair("wxALIGN_RIGHT", wxArrayString())); - s_antiGroup["wxALIGN_RIGHT"].Add("wxALIGN_LEFT"); - s_antiGroup["wxALIGN_RIGHT"].Add("wxALIGN_CENTER_HORIZONTAL"); - - s_antiGroup.insert(std::make_pair("wxALIGN_TOP", wxArrayString())); - s_antiGroup["wxALIGN_TOP"].Add("wxALIGN_CENTER_VERTICAL"); - s_antiGroup["wxALIGN_TOP"].Add("wxALIGN_BOTTOM"); - - s_antiGroup.insert(std::make_pair("wxALIGN_CENTER_VERTICAL", wxArrayString())); - s_antiGroup["wxALIGN_CENTER_VERTICAL"].Add("wxALIGN_TOP"); - s_antiGroup["wxALIGN_CENTER_VERTICAL"].Add("wxALIGN_BOTTOM"); - - s_antiGroup.insert(std::make_pair("wxALIGN_BOTTOM", wxArrayString())); - s_antiGroup["wxALIGN_BOTTOM"].Add("wxALIGN_TOP"); - s_antiGroup["wxALIGN_BOTTOM"].Add("wxALIGN_CENTER_VERTICAL"); - } - if(s_sizerFlagsValue.empty()) { s_sizerFlagsValue.insert(std::make_pair(wxALL, SZ_ALL)); s_sizerFlagsValue.insert(std::make_pair(wxLEFT, SZ_LEFT)); @@ -2354,16 +2328,23 @@ void wxcWidget::SetStyles(size_t value) void wxcWidget::EnableSizerFlag(const wxString& flag, bool enable) { - if(m_sizerFlags.Contains(flag)) { + static const std::map s_antiGroup = { + { "wxALIGN_LEFT", StdToWX::ToArrayString({ "wxALIGN_CENTER_HORIZONTAL", "wxALIGN_RIGHT" }) }, + { "wxALIGN_CENTER_HORIZONTAL", StdToWX::ToArrayString({ "wxALIGN_LEFT", "wxALIGN_RIGHT" }) }, + { "wxALIGN_RIGHT", StdToWX::ToArrayString({ "wxALIGN_LEFT", "wxALIGN_CENTER_HORIZONTAL" }) }, + { "wxALIGN_TOP", StdToWX::ToArrayString({ "wxALIGN_CENTER_VERTICAL", "wxALIGN_BOTTOM" }) }, + { "wxALIGN_CENTER_VERTICAL", StdToWX::ToArrayString({ "wxALIGN_TOP", "wxALIGN_BOTTOM" }) }, + { "wxALIGN_BOTTOM", StdToWX::ToArrayString({ "wxALIGN_TOP", "wxALIGN_CENTER_VERTICAL" }) } + }; + + if (m_sizerFlags.Contains(flag)) { m_sizerFlags.Item(flag).is_set = enable; - if(enable) { + if (enable) { // Uncheck all "grouped" flags - AntiGroupMap_t::const_iterator iter = s_antiGroup.find(flag); - if(iter != s_antiGroup.end()) { - const wxArrayString& arr = iter->second; - for(size_t i = 0; i < arr.GetCount(); ++i) { - EnableSizerFlag(arr.Item(i), false); // since it false, the recursion can not occur more than once + if (auto iter = s_antiGroup.find(flag); iter != s_antiGroup.end()) { + for (const auto& item : iter->second) { + EnableSizerFlag(item, false); // since it false, the recursion can not occur more than once } } } diff --git a/wxcrafter/src/wxc_widget.h b/wxcrafter/src/wxc_widget.h index 1212e7c05d..bde7dd6553 100644 --- a/wxcrafter/src/wxc_widget.h +++ b/wxcrafter/src/wxc_widget.h @@ -140,10 +140,8 @@ class wxcWidget typedef wxOrderedMap MapProperties_t; typedef wxOrderedMap MapEvents_t; typedef std::map Map_t; - typedef std::map AntiGroupMap_t; typedef std::map SizerFlagsValueSet_t; - static AntiGroupMap_t s_antiGroup; static SizerFlagsValueSet_t s_sizerFlagsValue; protected: diff --git a/wxcrafter/src/wxgui_helpers.cpp b/wxcrafter/src/wxgui_helpers.cpp index b3ee08dd21..2e534f29b4 100644 --- a/wxcrafter/src/wxgui_helpers.cpp +++ b/wxcrafter/src/wxgui_helpers.cpp @@ -1,5 +1,6 @@ #include "wxgui_helpers.h" +#include "StdToWX.h" #include "file_logger.h" #include "main.h" #include "wxc_project_metadata.h" @@ -336,40 +337,62 @@ wxString wxCrafter::CamelCase(const wxString& str) return fooname; } -static wxArrayString s_colorNames; -static wxArrayString s_colorSysNames; +static const wxArrayString s_colorNames = StdToWX::ToArrayString({ "AppWorkspace", + "ActiveBorder", + "ActiveCaption", + "ButtonFace", + "ButtonHighlight", + "ButtonShadow", + "ButtonText", + "CaptionText", + "ControlDark", + "ControlLight", + "Desktop", + "GrayText", + "Highlight", + "HighlightText", + "InactiveBorder", + "InactiveCaption", + "InactiveCaptionText", + "Menu", + "Scrollbar", + "Tooltip", + "TooltipText", + "Window", + "WindowFrame", + "WindowText", + "Custom" }); + +static const wxArrayString s_colorSysNames = StdToWX::ToArrayString({ + "wxSYS_COLOUR_APPWORKSPACE", + "wxSYS_COLOUR_ACTIVEBORDER", + "wxSYS_COLOUR_ACTIVECAPTION", + "wxSYS_COLOUR_BTNFACE", + "wxSYS_COLOUR_BTNHIGHLIGHT", + "wxSYS_COLOUR_BTNSHADOW", + "wxSYS_COLOUR_BTNTEXT", + "wxSYS_COLOUR_CAPTIONTEXT", + "wxSYS_COLOUR_3DDKSHADOW", + "wxSYS_COLOUR_3DLIGHT", + "wxSYS_COLOUR_BACKGROUND", + "wxSYS_COLOUR_GRAYTEXT", + "wxSYS_COLOUR_HIGHLIGHT", + "wxSYS_COLOUR_HIGHLIGHTTEXT", + "wxSYS_COLOUR_INACTIVEBORDER", + "wxSYS_COLOUR_INACTIVECAPTION", + "wxSYS_COLOUR_INACTIVECAPTIONTEXT", + "wxSYS_COLOUR_MENU", + "wxSYS_COLOUR_SCROLLBAR", + "wxSYS_COLOUR_INFOBK", + "wxSYS_COLOUR_INFOTEXT", + "wxSYS_COLOUR_WINDOW", + "wxSYS_COLOUR_WINDOWFRAME", + "wxSYS_COLOUR_WINDOWTEXT", +}); static wxArrayInt s_colorIdx; static void init_color_indexes() { - if(s_colorNames.IsEmpty()) { - s_colorNames.Add("AppWorkspace"); - s_colorNames.Add("ActiveBorder"); - s_colorNames.Add("ActiveCaption"); - s_colorNames.Add("ButtonFace"); - s_colorNames.Add("ButtonHighlight"); - s_colorNames.Add("ButtonShadow"); - s_colorNames.Add("ButtonText"); - s_colorNames.Add("CaptionText"); - s_colorNames.Add("ControlDark"); - s_colorNames.Add("ControlLight"); - s_colorNames.Add("Desktop"); - s_colorNames.Add("GrayText"); - s_colorNames.Add("Highlight"); - s_colorNames.Add("HighlightText"); - s_colorNames.Add("InactiveBorder"); - s_colorNames.Add("InactiveCaption"); - s_colorNames.Add("InactiveCaptionText"); - s_colorNames.Add("Menu"); - s_colorNames.Add("Scrollbar"); - s_colorNames.Add("Tooltip"); - s_colorNames.Add("TooltipText"); - s_colorNames.Add("Window"); - s_colorNames.Add("WindowFrame"); - s_colorNames.Add("WindowText"); - s_colorNames.Add("Custom"); - } - if(s_colorIdx.IsEmpty()) { s_colorIdx.Add(wxSYS_COLOUR_APPWORKSPACE); s_colorIdx.Add(wxSYS_COLOUR_ACTIVEBORDER); @@ -397,33 +420,6 @@ static void init_color_indexes() s_colorIdx.Add(wxSYS_COLOUR_WINDOWTEXT); s_colorIdx.Add(wxPG_COLOUR_CUSTOM); } - - if(s_colorSysNames.IsEmpty()) { - s_colorSysNames.Add("wxSYS_COLOUR_APPWORKSPACE"); - s_colorSysNames.Add("wxSYS_COLOUR_ACTIVEBORDER"); - s_colorSysNames.Add("wxSYS_COLOUR_ACTIVECAPTION"); - s_colorSysNames.Add("wxSYS_COLOUR_BTNFACE"); - s_colorSysNames.Add("wxSYS_COLOUR_BTNHIGHLIGHT"); - s_colorSysNames.Add("wxSYS_COLOUR_BTNSHADOW"); - s_colorSysNames.Add("wxSYS_COLOUR_BTNTEXT"); - s_colorSysNames.Add("wxSYS_COLOUR_CAPTIONTEXT"); - s_colorSysNames.Add("wxSYS_COLOUR_3DDKSHADOW"); - s_colorSysNames.Add("wxSYS_COLOUR_3DLIGHT"); - s_colorSysNames.Add("wxSYS_COLOUR_BACKGROUND"); - s_colorSysNames.Add("wxSYS_COLOUR_GRAYTEXT"); - s_colorSysNames.Add("wxSYS_COLOUR_HIGHLIGHT"); - s_colorSysNames.Add("wxSYS_COLOUR_HIGHLIGHTTEXT"); - s_colorSysNames.Add("wxSYS_COLOUR_INACTIVEBORDER"); - s_colorSysNames.Add("wxSYS_COLOUR_INACTIVECAPTION"); - s_colorSysNames.Add("wxSYS_COLOUR_INACTIVECAPTIONTEXT"); - s_colorSysNames.Add("wxSYS_COLOUR_MENU"); - s_colorSysNames.Add("wxSYS_COLOUR_SCROLLBAR"); - s_colorSysNames.Add("wxSYS_COLOUR_INFOBK"); - s_colorSysNames.Add("wxSYS_COLOUR_INFOTEXT"); - s_colorSysNames.Add("wxSYS_COLOUR_WINDOW"); - s_colorSysNames.Add("wxSYS_COLOUR_WINDOWFRAME"); - s_colorSysNames.Add("wxSYS_COLOUR_WINDOWTEXT"); - } } wxString wxCrafter::ColourToCpp(const wxString& guiname) @@ -1234,60 +1230,60 @@ int wxCrafter::ColumnFlagsFromString(const wxString& col_flags) bool wxCrafter::IsArtProviderBitmap(const wxString& bmpString, wxString& artId, wxString& clientID, wxString& sizeHint) { static wxArrayString arr; - if(arr.IsEmpty()) { - arr.Add(wxT("wxART_ERROR")); - arr.Add(wxT("wxART_QUESTION")); - arr.Add(wxT("wxART_WARNING")); - arr.Add(wxT("wxART_INFORMATION")); - arr.Add(wxT("wxART_ADD_BOOKMARK")); - arr.Add(wxT("wxART_DEL_BOOKMARK")); - arr.Add(wxT("wxART_HELP_SIDE_PANEL")); - arr.Add(wxT("wxART_HELP_SETTINGS")); - arr.Add(wxT("wxART_HELP_BOOK")); - arr.Add(wxT("wxART_HELP_FOLDER")); - arr.Add(wxT("wxART_HELP_PAGE")); - arr.Add(wxT("wxART_GO_BACK")); - arr.Add(wxT("wxART_GO_FORWARD")); - arr.Add(wxT("wxART_GO_UP")); - arr.Add(wxT("wxART_GO_DOWN")); - arr.Add(wxT("wxART_GO_TO_PARENT")); - arr.Add(wxT("wxART_GO_HOME")); - arr.Add(wxT("wxART_GOTO_FIRST")); - arr.Add(wxT("wxART_GOTO_LAST")); - arr.Add(wxT("wxART_PRINT")); - arr.Add(wxT("wxART_HELP")); - arr.Add(wxT("wxART_TIP")); - arr.Add(wxT("wxART_REPORT_VIEW")); - arr.Add(wxT("wxART_LIST_VIEW")); - arr.Add(wxT("wxART_NEW_DIR")); - arr.Add(wxT("wxART_FOLDER")); - arr.Add(wxT("wxART_FOLDER_OPEN")); - arr.Add(wxT("wxART_GO_DIR_UP")); - arr.Add(wxT("wxART_EXECUTABLE_FILE")); - arr.Add(wxT("wxART_NORMAL_FILE")); - arr.Add(wxT("wxART_TICK_MARK")); - arr.Add(wxT("wxART_CROSS_MARK")); - arr.Add(wxT("wxART_MISSING_IMAGE")); - arr.Add(wxT("wxART_NEW")); - arr.Add(wxT("wxART_FILE_OPEN")); - arr.Add(wxT("wxART_FILE_SAVE")); - arr.Add(wxT("wxART_FILE_SAVE_AS")); - arr.Add(wxT("wxART_DELETE")); - arr.Add(wxT("wxART_COPY")); - arr.Add(wxT("wxART_CUT")); - arr.Add(wxT("wxART_PASTE")); - arr.Add(wxT("wxART_UNDO")); - arr.Add(wxT("wxART_REDO")); - arr.Add(wxT("wxART_PLUS")); - arr.Add(wxT("wxART_MINUS")); - arr.Add(wxT("wxART_CLOSE")); - arr.Add(wxT("wxART_QUIT")); - arr.Add(wxT("wxART_FIND")); - arr.Add(wxT("wxART_FIND_AND_REPLACE")); - arr.Add(wxT("wxART_HARDDISK")); - arr.Add(wxT("wxART_FLOPPY")); - arr.Add(wxT("wxART_CDROM")); - arr.Add(wxT("wxART_REMOVABLE")); + if (arr.IsEmpty()) { + arr = StdToWX::ToArrayString({ wxT("wxART_ERROR"), + wxT("wxART_QUESTION"), + wxT("wxART_WARNING"), + wxT("wxART_INFORMATION"), + wxT("wxART_ADD_BOOKMARK"), + wxT("wxART_DEL_BOOKMARK"), + wxT("wxART_HELP_SIDE_PANEL"), + wxT("wxART_HELP_SETTINGS"), + wxT("wxART_HELP_BOOK"), + wxT("wxART_HELP_FOLDER"), + wxT("wxART_HELP_PAGE"), + wxT("wxART_GO_BACK"), + wxT("wxART_GO_FORWARD"), + wxT("wxART_GO_UP"), + wxT("wxART_GO_DOWN"), + wxT("wxART_GO_TO_PARENT"), + wxT("wxART_GO_HOME"), + wxT("wxART_GOTO_FIRST"), + wxT("wxART_GOTO_LAST"), + wxT("wxART_PRINT"), + wxT("wxART_HELP"), + wxT("wxART_TIP"), + wxT("wxART_REPORT_VIEW"), + wxT("wxART_LIST_VIEW"), + wxT("wxART_NEW_DIR"), + wxT("wxART_FOLDER"), + wxT("wxART_FOLDER_OPEN"), + wxT("wxART_GO_DIR_UP"), + wxT("wxART_EXECUTABLE_FILE"), + wxT("wxART_NORMAL_FILE"), + wxT("wxART_TICK_MARK"), + wxT("wxART_CROSS_MARK"), + wxT("wxART_MISSING_IMAGE"), + wxT("wxART_NEW"), + wxT("wxART_FILE_OPEN"), + wxT("wxART_FILE_SAVE"), + wxT("wxART_FILE_SAVE_AS"), + wxT("wxART_DELETE"), + wxT("wxART_COPY"), + wxT("wxART_CUT"), + wxT("wxART_PASTE"), + wxT("wxART_UNDO"), + wxT("wxART_REDO"), + wxT("wxART_PLUS"), + wxT("wxART_MINUS"), + wxT("wxART_CLOSE"), + wxT("wxART_QUIT"), + wxT("wxART_FIND"), + wxT("wxART_FIND_AND_REPLACE"), + wxT("wxART_HARDDISK"), + wxT("wxART_FLOPPY"), + wxT("wxART_CDROM"), + wxT("wxART_REMOVABLE") }); arr.Sort(); } diff --git a/wxcrafter/top_level_windows/frame_wrapper.cpp b/wxcrafter/top_level_windows/frame_wrapper.cpp index 5b730c6590..872c6cfed4 100644 --- a/wxcrafter/top_level_windows/frame_wrapper.cpp +++ b/wxcrafter/top_level_windows/frame_wrapper.cpp @@ -1,4 +1,6 @@ #include "frame_wrapper.h" + +#include "StdToWX.h" #include "allocator_mgr.h" #include "choice_property.h" #include "file_ficker_property.h" @@ -9,6 +11,7 @@ #include "wxc_widget.h" #include "wxgui_helpers.h" #include "xmlutils.h" + #include #include #include @@ -34,13 +37,8 @@ FrameWrapper::FrameWrapper() RegisterEvent(wxT("wxEVT_ACTIVATE_APP"), wxT("wxActivateEvent"), _("Process a wxEVT_ACTIVATE_APP event")); AddCategory(_("Frame Type")); - wxArrayString frameTypes; - frameTypes.Add("wxFrame"); - frameTypes.Add("wxDocMDIParentFrame"); - frameTypes.Add("wxDocMDIChildFrame"); - frameTypes.Add("wxDocParentFrame"); - frameTypes.Add("wxDocChildFrame"); - frameTypes.Add("wxMiniFrame"); + const wxArrayString frameTypes = StdToWX::ToArrayString({ "wxFrame", "wxDocMDIParentFrame", "wxDocMDIChildFrame", + "wxDocParentFrame", "wxDocChildFrame", "wxMiniFrame" }); AddProperty(new ChoiceProperty(PROP_FRAME_TYPE, frameTypes, 0, _("Select the wxFrame type you want"))); AddCategory(_("Frame Icons"));