User forums > General (but related to Code::Blocks)

rev 5084 does not build on linux

<< < (2/3) > >>

killerbot:
patches applied

Jenna:
I forgot, that if only the wxs-file is changed with a patch and not from wxSmith the appropriate cpp-file doesn't know anything about the changes, so the following patch is also needed:

--- Code: ------ codeblocks-1.0svn.orig/src/plugins/contrib/headerfixup/execution.cpp        2008-06-02 19:40:19.000000000 +0200
+++ codeblocks-1.0svn.work/src/plugins/contrib/headerfixup/execution.cpp        2008-06-02 23:43:22.000000000 +0200
@@ -67,7 +67,7 @@
        _("Scan source files in project"),
        _("Scan source files in workspace")
   };
-  m_Scope = new wxRadioBox(this, ID_RB_SCOPE, _("Scope"), wxDefaultPosition, wxSize(200,65), 2, __wxRadioBoxChoices_1, 1, 0, wxDefaultValidator, _T("ID_RB_SCOPE"));
+  m_Scope = new wxRadioBox(this, ID_RB_SCOPE, _("Scope"), wxDefaultPosition, wxSize(337,70), 2, __wxRadioBoxChoices_1, 2, 0, wxDefaultValidator, _T("ID_RB_SCOPE"));
   m_Scope->SetSelection(0);
   m_Scope->SetToolTip(_("This will setup on what files to operate: All from active project or whole workspace."));
   sizLeft->Add(m_Scope, 0, wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -76,7 +76,7 @@
        _("Use \"include.h\" (quotation marks)"),
        _("Use <include.h> (brackets)")
   };
-  m_Options = new wxRadioBox(this, ID_RB_OPTIONS, _("Options"), wxDefaultPosition, wxSize(200,65), 2, __wxRadioBoxChoices_2, 1, 0, wxDefaultValidator, _T("ID_RB_OPTIONS"));
+  m_Options = new wxRadioBox(this, ID_RB_OPTIONS, _("Options"), wxDefaultPosition, wxSize(337,70), 2, __wxRadioBoxChoices_2, 2, 0, wxDefaultValidator, _T("ID_RB_OPTIONS"));
   m_Options->SetSelection(1);
   m_Options->SetToolTip(_("This will setup the way missing header files are included: By quotation mark or brackets."));
   sizLeft->Add(m_Options, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);
@@ -99,7 +99,7 @@
        _("Process implementation files only"),
        _("Process both files (2-step-fix up)")
   };
-  m_FileType = new wxRadioBox(this, ID_RDO_FILE_TYPE, _("File types to process:"), wxDefaultPosition, wxSize(200,85), 3, __wxRadioBoxChoices_3, 1, 0, wxDefaultValidator, _T("ID_RDO_FILE_TYPE"));
+  m_FileType = new wxRadioBox(this, ID_RDO_FILE_TYPE, _("File types to process:"), wxDefaultPosition, wxSize(317,95), 3, __wxRadioBoxChoices_3, 3, 0, wxDefaultValidator, _T("ID_RDO_FILE_TYPE"));
   m_FileType->SetSelection(2);
   m_FileType->SetToolTip(_("This will setup on what file types the plugin shall operate: Header files, implementation files or both (after each other)."));
   sizAdvancedOptions->Add(m_FileType, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5);

--- End code ---

and the plugin is not yet in debian/control.

The line-numbers of the patch might be incorrect, because I use a patched control-file.


--- Code: ------ codeblocks-1.0svn.orig/debian/control    2008-06-03 07:53:35.000000000 +0200
+++ codeblocks-1.0svn.work/debian/control      2008-06-02 23:21:44.000000000 +0200
@@ -71,6 +71,7 @@
     * DragScroll (enhances mouse operations)
     * Setting of environment variables
     * Source exporter to PDF/HTML/ODT/RTF
+    * Header fixup
     * Help
     * Keyboard shortcuts configuration
     * GUI RAD builder (wxSmith)

--- End code ---

killerbot:
done

Jenna:
When applying the execution.cpp patch you forgot to change a "1" to a "2"

m_Scope = new wxRadioBox(this, ID_RB_SCOPE, _("Scope"), wxDefaultPosition, wxSize(337,70), 2, __wxRadioBoxChoices_1, 2, 0, wxDefaultValidator, _T("ID_RB_SCOPE"));

Jenna:
I push this post, because there is still a 1, where a 2 should be in line 70 of "execution.cpp".


--- Quote from: jens on June 03, 2008, 03:35:03 pm ---When applying the execution.cpp patch you forgot to change a "1" to a "2"

m_Scope = new wxRadioBox(this, ID_RB_SCOPE, _("Scope"), wxDefaultPosition, wxSize(337,70), 2, __wxRadioBoxChoices_1, 2, 0, wxDefaultValidator, _T("ID_RB_SCOPE"));


--- End quote ---

Navigation

[0] Message Index

[#] Next page

[*] Previous page