User forums > Help

Code::Blocks svn-trunk(9232) build error with wxWidgets-2.9.5 in toolsmanager.h

<< < (2/3) > >>

oBFusCATed:
stahta01: Why don't you change the code to use wxArrayString in all versions of wx?

stahta01:

--- Quote from: oBFusCATed on July 30, 2013, 09:19:07 am ---stahta01: Why don't you change the code to use wxArrayString in all versions of wx?

--- End quote ---

Do you mean in the abbreviations plug-in patch?

If you think that is better, I will change it.

FYI: I am suffering from insomnia right now; so, I might make mistakes on doing the change likely wait a day or two.
Compiling the Contrib Plug-ins right now.

Tim S.

oBFusCATed:

--- Quote from: stahta01 on July 30, 2013, 10:05:04 am ---Do you mean in the abbreviations plug-in patch?

--- End quote ---
Yes, there is no point in maintaining two versions, when one is sufficient.

stahta01:
Edit: Patch compiles; but, I have not done much testing because I have never used this plugin.


--- Code: ---Index: src/plugins/abbreviations/abbreviationsconfigpanel.cpp
===================================================================
--- src/plugins/abbreviations/abbreviationsconfigpanel.cpp (revision 9239)
+++ src/plugins/abbreviations/abbreviationsconfigpanel.cpp (working copy)
@@ -208,12 +208,14 @@
 {
     m_LanguageCmb->Clear();
 
-    wxSortedArrayString langs;
+    wxArrayString langs;
     AutoCompLanguageMap::iterator it;
     for (it = m_Plugin->m_AutoCompLanguageMap.begin(); it != m_Plugin->m_AutoCompLanguageMap.end(); ++it)
     {
         langs.Add(it->first);
     }
+    langs.Sort();
+
     m_LanguageCmb->Append(langs);
 }
 
@@ -265,7 +267,7 @@
     else
         colSet = new EditorColourSet();
 
-    wxSortedArrayString newLangs;
+    wxArrayString newLangs;
     wxArrayString langs = colSet->GetAllHighlightLanguages();
     for (unsigned int i = 0; i < langs.GetCount(); ++i)
     {
@@ -273,6 +275,7 @@
             !langs[i].IsSameAs(_T("Fortran77")))
             newLangs.Add(langs[i]);
     }
+    newLangs.Sort();
 
     int sel = wxGetSingleChoiceIndex(_("Select language:"), _("Languages"), newLangs, this);
     if (sel == -1)

--- End code ---

oBFusCATed:
And have you tried if the abbreviations still work with this change?

Navigation

[0] Message Index

[#] Next page

[*] Previous page