← Back to branch summary

~ubuntu-branches/ubuntu/raring/codeblocks/raring-proposed

« back to all changes in this revision

Viewing changes to src/plugins/codecompletion/ccoptionsprjdlg.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Cosme Domínguez Díaz
  • Date: 2010-08-09 04:38:38 UTC
  • mfrom: (1.1.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20100809043838-a59ygguym4eg0jgw
Tags: 10.05-0ubuntu1
https://launchpad.net/bugs/322350
* New upstream release. Closes (LP: #322350)
 - Switch to dpkg-source 3.0 (quilt) format
 - Remove unneeded README.source
 - Add debian/get-source-orig script that removes all
   Windows prebuilt binaries
* Bump Standards-Version to 3.9.1
 - Stop shipping *.la files
* debian/control
 - Add cdbs package as Build-Depend
 - Add libbz2-dev and zlib1g-dev packages as
   Build-Depends (needed by libhelp_plugin.so)
 - Remove dpatch package of Build-Depends
 - Add codeblocks-contrib-debug package
 - Split architecture-independent files of codeblocks
   package in codeblocks-common package
* debian/rules
 - Switch to CDBS rules system
 - Add parallel build support
 - Add a call to debian/get-source-orig script
 - Use lzma compression (saves 23,5 MB of free space)
* debian/patches
 - Refresh 01_codeblocks_plugin_path
 - Add 02_no_Makefiles_in_debian_dir to remove any link
   in codeblocks build system to deleted Makefiles of debian directory
 - Drop 02_ftbfs_gcc44 and 03_ftbfs_glib221 (merged in upstream)
* debian/watch
 - Update to use the new host (berlios.de)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/codecompletion/ccoptionsprjdlg.cpp
20
20
 
21
21
BEGIN_EVENT_TABLE(CCOptionsProjectDlg, wxPanel)
22
22
    EVT_UPDATE_UI(-1, CCOptionsProjectDlg::OnUpdateUI)
23
 
        EVT_BUTTON(XRCID("btnAdd"), CCOptionsProjectDlg::OnAdd)
24
 
        EVT_BUTTON(XRCID("btnEdit"), CCOptionsProjectDlg::OnEdit)
25
 
        EVT_BUTTON(XRCID("btnDelete"), CCOptionsProjectDlg::OnDelete)
 
23
    EVT_BUTTON(XRCID("btnAdd"), CCOptionsProjectDlg::OnAdd)
 
24
    EVT_BUTTON(XRCID("btnEdit"), CCOptionsProjectDlg::OnEdit)
 
25
    EVT_BUTTON(XRCID("btnDelete"), CCOptionsProjectDlg::OnDelete)
26
26
END_EVENT_TABLE()
27
27
 
28
28
CCOptionsProjectDlg::CCOptionsProjectDlg(wxWindow* parent, cbProject* project, NativeParser* np)
29
 
        : m_pProject(project),
30
 
        m_pNativeParser(np),
31
 
        m_pParser(m_pNativeParser->FindParserFromProject(project))
 
29
    : m_pProject(project),
 
30
    m_pNativeParser(np),
 
31
    m_pParser(m_pNativeParser->GetParserPtr())
32
32
{
33
 
        wxXmlResource::Get()->LoadPanel(this, parent, _T("pnlProjectCCOptions"));
 
33
    wxXmlResource::Get()->LoadPanel(this, parent, _T("pnlProjectCCOptions"));
34
34
    m_OldPaths = m_pNativeParser->GetProjectSearchDirs(m_pProject);
35
35
 
36
36
    wxListBox* control = XRCCTRL(*this, "lstPaths", wxListBox);