[FIXED] Patch for what I think is an coding bug in compileroptionsdlg.cpp

[stahta01]

FYI:

While trying to patch Code::Blocks for wxWidgets 2.9x I found an place where an string is compared to an int.

Tim S

PS: I have been up for over an day; so, take that into consideration.

excerpt from compilerfactory.h

Code Select Expand


static const wxString& GetDefaultCompilerID();


excerpt from compileroptionsdlg.cpp

Code Select Expand


        int idx   = XRCCTRL(*this, "cmbCompiler", wxChoice)->GetSelection();
        int count = XRCCTRL(*this, "cmbCompiler", wxChoice)->GetCount(); // compilers count
        Compiler* compiler = CompilerFactory::GetCompiler(idx);

        XRCCTRL(*this, "btnSetDefaultCompiler", wxButton)->Enable(CompilerFactory::GetDefaultCompilerID() != idx);


Patch that I think is needed

Code Select Expand


Index: src/plugins/compilergcc/compileroptionsdlg.cpp
===================================================================
--- src/plugins/compilergcc/compileroptionsdlg.cpp (revision 5204)
+++ src/plugins/compilergcc/compileroptionsdlg.cpp (working copy)
@@ -2124,7 +2124,7 @@
         int count = XRCCTRL(*this, "cmbCompiler", wxChoice)->GetCount(); // compilers count
         Compiler* compiler = CompilerFactory::GetCompiler(idx);

-        XRCCTRL(*this, "btnSetDefaultCompiler", wxButton)->Enable(CompilerFactory::GetDefaultCompilerID() != idx);
+        XRCCTRL(*this, "btnSetDefaultCompiler", wxButton)->Enable(CompilerFactory::GetCompilerIndex(CompilerFactory::GetDefaultCompiler()) != idx);
         XRCCTRL(*this, "btnAddCompiler",        wxButton)->Enable(en);
         XRCCTRL(*this, "btnRenameCompiler",     wxButton)->Enable(en && count);
         XRCCTRL(*this, "btnDelCompiler",        wxButton)->Enable(en &&


[MortenMacFly]

Patch that I think is needed

Applied in SVN. Thanks!