SDK: Moved all codelite internal events to a new file "codelite_event…

…s.h" SDK: changed wxEVT_FILE_SAVED and other file management events to use clCommandEvent (was: wxCommandEvent) Diff Viewer: fire a "wxEVT_FILE_SAVED" when a modified file is saved
lukester1975 · Feb 26, 2014 · 569740b · 569740b
1 parent a0c691b
commit 569740b
Show file tree

Hide file tree

Showing 34 changed files with 681 additions and 661 deletions.
diff --git a/CodeLite/CodeLite.project b/CodeLite/CodeLite.project
@@ -86,6 +86,7 @@
     <File Name="wx_xml_compatibility.h"/>
     <File Name="codelite_exports.h"/>
     <File Name="cl_exception.h"/>
+    <File Name="browse_record.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="GeneratedFiles">
     <File Name="expression_result.h"/>

diff --git a/Plugin/browse_record.h → CodeLite/browse_record.h b/Plugin/browse_record.h → CodeLite/browse_record.h
@@ -25,19 +25,19 @@
 #ifndef BROWSE_HISTORY_H
 #define BROWSE_HISTORY_H
 
-#include "wx/string.h"
+#include <wx/string.h>
 
 class BrowseRecord
 {
 public:
-	wxString filename;
-	wxString project;
-	int lineno;
-	int position;
+    wxString filename;
+    wxString project;
+    int lineno;
+    int position;
 public:
-	BrowseRecord() : filename(wxEmptyString), project(wxEmptyString), lineno(wxNOT_FOUND), position(wxNOT_FOUND) {}
+    BrowseRecord() : filename(wxEmptyString), project(wxEmptyString), lineno(wxNOT_FOUND), position(wxNOT_FOUND) {}
 
-	~BrowseRecord() {}
+    ~BrowseRecord() {}
 };
 
 #endif //BROWSE_HISTORY_H
diff --git a/CodeLite/event_notifier.cpp b/CodeLite/event_notifier.cpp
@@ -1,5 +1,7 @@
 #include "event_notifier.h"
 #include <wx/app.h>
+#include "cl_command_event.h"
+#include "../Interfaces/codelite_events.h"
 
 static EventNotifier *eventNotifier = NULL;
 
@@ -61,3 +63,11 @@ wxFrame* EventNotifier::TopFrame()
 {
     return static_cast<wxFrame*>(wxTheApp->GetTopWindow());
 }
+
+void EventNotifier::PostFileSavedEvent(const wxString& filename)
+{
+    clCommandEvent event( wxEVT_FILE_SAVED );
+    event.SetString( filename );
+    event.SetFileName( filename );
+    AddPendingEvent( event );
+}
diff --git a/CodeLite/event_notifier.h b/CodeLite/event_notifier.h
@@ -29,6 +29,11 @@ class WXDLLIMPEXP_CL EventNotifier : public wxEvtHandler
     bool SendCommandEvent(int eventId, void *clientData);
     void PostCommandEvent(int eventId, void *clientData);
     bool SendCommandEvent(int eventId, void *clientData, const wxString &s);
+
+    /**
+     * @brief post a wxEVT_FILE_SAVED event
+     */
+    void PostFileSavedEvent( const wxString &filename );
 };
 
 #endif // EVENTNOTIFIER_H
diff --git a/ContinuousBuild/continuousbuild.cpp b/ContinuousBuild/continuousbuild.cpp
@@ -63,7 +63,7 @@ ContinuousBuild::ContinuousBuild(IManager *manager)
     m_mgr->GetOutputPaneNotebook()->AddPage(m_view, CONT_BUILD, false, LoadBitmapFile(wxT("compfile.png")));
 
     m_topWin = m_mgr->GetTheApp();
-    EventNotifier::Get()->Connect(wxEVT_FILE_SAVED,               wxCommandEventHandler(ContinuousBuild::OnFileSaved),           NULL, this);
+    EventNotifier::Get()->Connect(wxEVT_FILE_SAVED,               clCommandEventHandler(ContinuousBuild::OnFileSaved),           NULL, this);
     EventNotifier::Get()->Connect(wxEVT_FILE_SAVE_BY_BUILD_START, wxCommandEventHandler(ContinuousBuild::OnIgnoreFileSaved),     NULL, this);
     EventNotifier::Get()->Connect(wxEVT_FILE_SAVE_BY_BUILD_END,   wxCommandEventHandler(ContinuousBuild::OnStopIgnoreFileSaved), NULL, this);
 }
@@ -100,12 +100,12 @@ void ContinuousBuild::UnPlug()
             break;
         }
     }
-    EventNotifier::Get()->Disconnect(wxEVT_FILE_SAVED,               wxCommandEventHandler(ContinuousBuild::OnFileSaved),           NULL, this);
+    EventNotifier::Get()->Disconnect(wxEVT_FILE_SAVED,               clCommandEventHandler(ContinuousBuild::OnFileSaved),           NULL, this);
     EventNotifier::Get()->Disconnect(wxEVT_FILE_SAVE_BY_BUILD_START, wxCommandEventHandler(ContinuousBuild::OnIgnoreFileSaved),     NULL, this);
     EventNotifier::Get()->Disconnect(wxEVT_FILE_SAVE_BY_BUILD_END,   wxCommandEventHandler(ContinuousBuild::OnStopIgnoreFileSaved), NULL, this);
 }
 
-void ContinuousBuild::OnFileSaved(wxCommandEvent& e)
+void ContinuousBuild::OnFileSaved(clCommandEvent& e)
 {
     e.Skip();
     CL_DEBUG(wxT("ContinuousBuild::OnFileSaved\n"));

diff --git a/ContinuousBuild/continuousbuild.h b/ContinuousBuild/continuousbuild.h
@@ -4,44 +4,45 @@
 #include "plugin.h"
 #include "buildprocess.h"
 #include "compiler.h"
+#include "cl_command_event.h"
 
 class wxEvtHandler;
 class ContinousBuildPane;
 class ShellCommand;
 
 class ContinuousBuild : public IPlugin
 {
-	ContinousBuildPane *m_view;
-	wxEvtHandler *      m_topWin;
-	BuildProcess        m_buildProcess;
-	wxArrayString       m_files;
-	bool                m_buildInProgress;
+    ContinousBuildPane *m_view;
+    wxEvtHandler *      m_topWin;
+    BuildProcess        m_buildProcess;
+    wxArrayString       m_files;
+    bool                m_buildInProgress;
 
 public:
-	void        DoBuild(const wxString &fileName);
+    void        DoBuild(const wxString &fileName);
 
 public:
-	ContinuousBuild(IManager *manager);
-	~ContinuousBuild();
-
-	//--------------------------------------------
-	//Abstract methods
-	//--------------------------------------------
-	virtual clToolBar *CreateToolBar(wxWindow *parent);
-	virtual void CreatePluginMenu(wxMenu *pluginsMenu);
-	virtual void HookPopupMenu(wxMenu *menu, MenuType type);
-	virtual void UnPlug();
-
-	void StopAll();
-
-	// Event handlers
-	DECLARE_EVENT_TABLE()
-
-	void OnFileSaved           (wxCommandEvent &e);
-	void OnIgnoreFileSaved     (wxCommandEvent &e);
-	void OnStopIgnoreFileSaved (wxCommandEvent &e);
-	void OnBuildProcessEnded   (wxCommandEvent &e);
-	void OnBuildProcessOutput  (wxCommandEvent &e);
+    ContinuousBuild(IManager *manager);
+    ~ContinuousBuild();
+
+    //--------------------------------------------
+    //Abstract methods
+    //--------------------------------------------
+    virtual clToolBar *CreateToolBar(wxWindow *parent);
+    virtual void CreatePluginMenu(wxMenu *pluginsMenu);
+    virtual void HookPopupMenu(wxMenu *menu, MenuType type);
+    virtual void UnPlug();
+
+    void StopAll();
+
+    // Event handlers
+    DECLARE_EVENT_TABLE()
+
+    void OnFileSaved           (clCommandEvent &e);
+    void OnIgnoreFileSaved     (wxCommandEvent &e);
+    void OnStopIgnoreFileSaved (wxCommandEvent &e);
+    void OnBuildProcessEnded   (wxCommandEvent &e);
+    void OnBuildProcessOutput  (wxCommandEvent &e);
 };
 
 #endif //ContinuousBuild
diff --git a/Interfaces/Interfaces.project b/Interfaces/Interfaces.project
@@ -15,6 +15,7 @@
     <File Name="plugin_version.h"/>
     <File Name="ikeyboard.h"/>
     <File Name="cl_defs.h"/>
+    <File Name="codelite_events.h"/>
   </VirtualDirectory>
   <Dependencies/>
   <Settings Type="Static Library">