Make everything use boost::shared_ptr

bruderstein · bruderstein · commit fc778934de30 · 2014-02-28T21:23:42.000+01:00
NotepadPlusWrapper and all ScintillaWrapper are now held for python in
boost:shared_ptr&lt;&gt;.  boost::python has special handling for boost::shared_ptr
(not yet for std::shared_ptr&lt;&gt;)
diff --git a/PythonScript/src/NotepadPlusWrapper.cpp b/PythonScript/src/NotepadPlusWrapper.cpp
@@ -376,18 +376,18 @@ void NotepadPlusWrapper::saveCurrentSession(const char *filename)
 	
 }
 
-ScintillaWrapper NotepadPlusWrapper::createScintilla()
+boost::shared_ptr<ScintillaWrapper> NotepadPlusWrapper::createScintilla()
 {
 	LRESULT handle = callNotepad(NPPM_CREATESCINTILLAHANDLE, 0, NULL);
 	
 	// return copy
-	return ScintillaWrapper((HWND)handle, m_nppHandle);
+	return boost::shared_ptr<ScintillaWrapper>(new ScintillaWrapper((HWND)handle, m_nppHandle));
 }
 
-void NotepadPlusWrapper::destroyScintilla(ScintillaWrapper& buffer)
+void NotepadPlusWrapper::destroyScintilla(boost::shared_ptr<ScintillaWrapper> buffer)
 {
-	callNotepad(NPPM_DESTROYSCINTILLAHANDLE, 0, reinterpret_cast<LPARAM>(buffer.getHandle()));
-	buffer.invalidateHandle();
+	callNotepad(NPPM_DESTROYSCINTILLAHANDLE, 0, reinterpret_cast<LPARAM>(buffer->getHandle()));
+	buffer->invalidateHandle();
 }
 
 idx_t NotepadPlusWrapper::getCurrentDocIndex(int view)
diff --git a/PythonScript/src/NotepadPlusWrapper.h b/PythonScript/src/NotepadPlusWrapper.h
@@ -460,8 +460,8 @@ class NotepadPlusWrapper
 	void saveSession(const char *sessionFilename, boost::python::list files);
 	void saveCurrentSession(const char *filename);
 	
-	ScintillaWrapper createScintilla();
-	void destroyScintilla(ScintillaWrapper& buffer);
+	boost::shared_ptr<ScintillaWrapper> createScintilla();
+	void destroyScintilla(boost::shared_ptr<ScintillaWrapper> buffer);
 
 	
 	idx_t getCurrentDocIndex(int view);
diff --git a/PythonScript/src/NotepadPython.cpp b/PythonScript/src/NotepadPython.cpp
@@ -17,7 +17,7 @@ void export_notepad()
 	//lint -e1793 While calling �Symbol�: Initializing the implicit object parameter �Type� (a non-const reference) with a non-lvalue
 	// The class and enum declarations are used as designed, but they mess up Lint.
 	boost::python::register_exception_translator<process_start_exception>(&translateProcessStart);
-	boost::python::class_<NotepadPlusWrapper>("Notepad", boost::python::no_init)
+	boost::python::class_<NotepadPlusWrapper, boost::shared_ptr<NotepadPlusWrapper>, boost::noncopyable>("Notepad", boost::python::no_init)
 		.def("new", &NotepadPlusWrapper::newDocument, "Create a new document")
 		.def("new", &NotepadPlusWrapper::newDocumentWithFilename, "Create a new document with the given filename")
 		.def("save", &NotepadPlusWrapper::save, "Save the current file")
diff --git a/PythonScript/src/NotepadPython.h b/PythonScript/src/NotepadPython.h
@@ -7,7 +7,7 @@ class NotepadPlusWrapper;
 
 void export_notepad();
 
-void importNotepad(NotepadPlusWrapper* instance);
+void importNotepad(boost::shared_ptr<NotepadPlusWrapper> instance);
 
 }
 
diff --git a/PythonScript/src/PyProducerConsumer.h b/PythonScript/src/PyProducerConsumer.h
@@ -24,6 +24,9 @@ class PyProducerConsumer
 	DWORD getConsumerThreadID() { return m_dwThreadId; };
 
 private:
+    PyProducerConsumer(const PyProducerConsumer& copy);
+    PyProducerConsumer& operator = (const PyProducerConsumer& assign);
+
 	HANDLE m_queueMutex;
 	HANDLE m_dataAvailable;
 	HANDLE m_shutdown;
diff --git a/PythonScript/src/PythonConsole.cpp b/PythonScript/src/PythonConsole.cpp
@@ -27,7 +27,7 @@ PythonConsole::PythonConsole(HWND hNotepad) :
 	m_nppData(new NppData)
 {
 }
-
+    /*
 //lint -e1554  Direct pointer copy of member 'name' within copy constructor: 'PythonConsole::PythonConsole(const PythonConsole &)')
 // We indeed copy pointers, and it's okay. These are not allocated within the 
 // scope of this class but rather passed in and copied anyway.
@@ -47,14 +47,15 @@ PythonConsole::PythonConsole(const PythonConsole& other) :
 {
 }
 //lint +e1554
+*/
 
 PythonConsole::~PythonConsole()
 {
 	try
 	{
 		delete mp_consoleDlg;
 		delete m_nppData;
-		delete mp_scintillaWrapper;
+		
 	}
 	catch (...)
 	{
@@ -310,7 +311,7 @@ void export_console()
 {
 	//lint -e1793 While calling �Symbol�: Initializing the implicit object parameter �Type� (a non-const reference) with a non-lvalue
 	// The class and enum declarations are used as designed, but they mess up Lint.
-	boost::python::class_<PythonConsole>("Console", boost::python::no_init)
+	boost::python::class_<PythonConsole, boost::shared_ptr<PythonConsole>, boost::noncopyable >("Console", boost::python::no_init)
 		.def("write", &PythonConsole::writeText, "Writes text to the console.  Uses the __str__ function of the object passed.")
 		.def("clear", &PythonConsole::clear, "Clears the console window")
 		.def("writeError", &PythonConsole::writeError, "Writes text in the console in a red colour")
@@ -320,7 +321,7 @@ void export_console()
 		.def("run", &PythonConsole::runCommandNoStderr, "Runs a command on the console")
 		.def("run", &PythonConsole::runCommandNoStdout, "Runs a command on the console")
 		.add_static_property("encoding", &PythonConsole::getEncoding)
-		.add_property("editor", boost::python::make_function(&PythonConsole::getScintillaWrapper, boost::python::return_internal_reference<>()));
+		.add_property("editor", &PythonConsole::getScintillaWrapper);
 	//lint +e1793
 }
 
diff --git a/PythonScript/src/PythonConsole.h b/PythonScript/src/PythonConsole.h
@@ -23,7 +23,6 @@ class PythonConsole : public PyProducerConsumer<std::string>, public ConsoleInte
 {
 public:
 	explicit PythonConsole(HWND hNotepad);
-	PythonConsole(const PythonConsole& other);
 	~PythonConsole();
 	
 	void init(HINSTANCE hInst, NppData& nppData);
@@ -68,9 +67,9 @@ class PythonConsole : public PyProducerConsumer<std::string>, public ConsoleInte
 
 	HWND getScintillaHwnd();
 
-	ScintillaWrapper& getScintillaWrapper() { return *mp_scintillaWrapper; }
+	boost::shared_ptr<ScintillaWrapper> getScintillaWrapper() { return mp_scintillaWrapper; }
 
-	ScintillaWrapper* mp_scintillaWrapper;
+	boost::shared_ptr<ScintillaWrapper> mp_scintillaWrapper;
 
 	static boost::python::str getEncoding() { return boost::python::str("utf-8"); }
 
@@ -81,6 +80,7 @@ class PythonConsole : public PyProducerConsumer<std::string>, public ConsoleInte
 private:
 	PythonConsole(); // default constructor disabled
 	PythonConsole& operator = (const PythonConsole&); // assignment operator disabled
+	PythonConsole(const PythonConsole& other);
 
 	ConsoleDialog *mp_consoleDlg;
 	
@@ -97,7 +97,7 @@ class PythonConsole : public PyProducerConsumer<std::string>, public ConsoleInte
 
 void export_console();
 
-void importConsole(PythonConsole *console);
+void importConsole(boost::shared_ptr<PythonConsole> console);
 
 struct RunStatementArgs
 {
diff --git a/PythonScript/src/PythonHandler.cpp b/PythonScript/src/PythonHandler.cpp
@@ -32,8 +32,8 @@ PythonHandler::PythonHandler(TCHAR *pluginsDir, TCHAR *configDir, HINSTANCE hIns
 	
 	mp_notepad = createNotepadPlusWrapper();
 	mp_scintilla = createScintillaWrapper();
-	mp_scintilla1 = new ScintillaWrapper(scintilla1Handle, m_nppHandle);
-	mp_scintilla2 = new ScintillaWrapper(scintilla2Handle, m_nppHandle);
+	mp_scintilla1.reset(new ScintillaWrapper(scintilla1Handle, m_nppHandle));
+	mp_scintilla2.reset(new ScintillaWrapper(scintilla2Handle, m_nppHandle));
 }
 
 PythonHandler::~PythonHandler(void)
@@ -56,10 +56,6 @@ PythonHandler::~PythonHandler(void)
 
 		}
 
-		delete mp_scintilla2;
-		delete mp_scintilla1;
-		delete mp_scintilla;
-		delete mp_notepad;
 
 		// To please Lint, let's NULL these handles
 		m_hInst = NULL;
@@ -76,15 +72,15 @@ PythonHandler::~PythonHandler(void)
 }
 
 
-ScintillaWrapper* PythonHandler::createScintillaWrapper()
+boost::shared_ptr<ScintillaWrapper> PythonHandler::createScintillaWrapper()
 {
 	m_currentView = mp_notepad->getCurrentView();
-	return new ScintillaWrapper(m_currentView ? m_scintilla2Handle : m_scintilla1Handle, m_nppHandle);
+	return boost::shared_ptr<ScintillaWrapper>(new ScintillaWrapper(m_currentView ? m_scintilla2Handle : m_scintilla1Handle, m_nppHandle));
 }
 
-NotepadPlusWrapper* PythonHandler::createNotepadPlusWrapper()
+boost::shared_ptr<NotepadPlusWrapper> PythonHandler::createNotepadPlusWrapper()
 {
-	return new NotepadPlusWrapper(m_hInst, m_nppHandle);
+	return boost::shared_ptr<NotepadPlusWrapper>(new NotepadPlusWrapper(m_hInst, m_nppHandle));
 }
 
 void PythonHandler::initPython()
diff --git a/PythonScript/src/PythonHandler.h b/PythonScript/src/PythonHandler.h
@@ -71,8 +71,8 @@ class PythonHandler : public PyProducerConsumer<RunScriptArgs>
 protected:
 	void consume(std::shared_ptr<RunScriptArgs> args);
 
-	ScintillaWrapper* createScintillaWrapper();
-	NotepadPlusWrapper* createNotepadPlusWrapper();
+	boost::shared_ptr<ScintillaWrapper> createScintillaWrapper();
+	boost::shared_ptr<NotepadPlusWrapper> createNotepadPlusWrapper();
 	virtual void queueComplete();
 
 	// Handles
@@ -99,13 +99,13 @@ class PythonHandler : public PyProducerConsumer<RunScriptArgs>
 
 	tstring m_machineBaseDir;
 	tstring m_userBaseDir;
-	NppPythonScript::ScintillaWrapper *mp_scintilla;
-	NppPythonScript::ScintillaWrapper *mp_scintilla1;
-	NppPythonScript::ScintillaWrapper *mp_scintilla2;
+	boost::shared_ptr<ScintillaWrapper> mp_scintilla;
+	boost::shared_ptr<ScintillaWrapper> mp_scintilla1;
+	boost::shared_ptr<ScintillaWrapper> mp_scintilla2;
 
-	NotepadPlusWrapper *mp_notepad;
+	boost::shared_ptr<NotepadPlusWrapper> mp_notepad;
 
-	PythonConsole *mp_console;
+	boost::shared_ptr<PythonConsole> mp_console;
 
 	int m_currentView;
 
diff --git a/PythonScript/src/ScintillaPython.cpp b/PythonScript/src/ScintillaPython.cpp
@@ -25,7 +25,7 @@ BOOST_PYTHON_MODULE(Npp)
 	boost::python::register_exception_translator<ArgumentException>(&translateArgumentException);
 	boost::python::register_exception_translator<GroupNotFoundException>(&translateGroupNotFoundException);
 
-	boost::python::class_<ScintillaWrapper>("Editor", boost::python::no_init)
+	boost::python::class_<ScintillaWrapper, boost::shared_ptr<ScintillaWrapper>, boost::noncopyable >("Editor", boost::python::no_init)
 		.def("write", &ScintillaWrapper::AddText, "Add text to the document at current position (alias for addText).")
 		.def("callback", &ScintillaWrapper::addCallback, "Registers a callback to a Python function when a Scintilla event occurs. e.g. editor.callback(my_function, [ScintillaNotification.CHARADDED])")
 		.def("__getitem__", &ScintillaWrapper::GetLine, "Gets a line from the given (zero based) index")
@@ -780,16 +780,16 @@ void preinitScintillaModule()
 	PyImport_AppendInittab("Npp", &initNpp);
 }
 
-void importScintilla(ScintillaWrapper* editor, ScintillaWrapper* editor1, ScintillaWrapper* editor2)
+void importScintilla(boost::shared_ptr<ScintillaWrapper> editor, boost::shared_ptr<ScintillaWrapper> editor1, boost::shared_ptr<ScintillaWrapper> editor2)
 {
 	// Get the __main__ module/namespace
 	//object main_module(handle<>(borrowed(PyImport_AddModule("Npp"))));
 	boost::python::object npp_module( (boost::python::handle<>(PyImport_ImportModule("Npp"))) );
 	boost::python::object npp_namespace = npp_module.attr("__dict__");
 	// Create an instance variable buffer in __main__ that points to the ScintillaWrapper instance
-	npp_namespace["editor"] = boost::python::ptr(editor);
-	npp_namespace["editor1"] = boost::python::ptr(editor1);
-	npp_namespace["editor2"] = boost::python::ptr(editor2);
+	npp_namespace["editor"] = editor;
+	npp_namespace["editor1"] = editor1;
+	npp_namespace["editor2"] = editor2;
 
 	// Import our Scintilla object
     //	object main_module( (handle<>(PyImport_ImportModule("__main__"))) );
@@ -801,7 +801,7 @@ void importScintilla(ScintillaWrapper* editor, ScintillaWrapper* editor1, Scinti
 
 }
 
-void importNotepad(NotepadPlusWrapper* instance)
+void importNotepad(boost::shared_ptr<NotepadPlusWrapper> instance)
 {
 	// Get the __main__ module/namespace
 	//object main_module(handle<>(borrowed(PyImport_AddModule("Npp"))));
@@ -810,12 +810,12 @@ void importNotepad(NotepadPlusWrapper* instance)
 	
 
 	// Create an instance variable buffer in __main__ that points to the NotepadPlusWrapper instance
-	main_namespace["notepad"] = boost::python::ptr(instance);
+	main_namespace["notepad"] = instance;
 
 }
 
 
-void importConsole(PythonConsole* instance)
+void importConsole(boost::shared_ptr<PythonConsole> instance)
 {
 	// Get the __main__ module/namespace
 	//object main_module(handle<>(borrowed(PyImport_AddModule("Npp"))));
@@ -824,7 +824,7 @@ void importConsole(PythonConsole* instance)
 	
 
 	// Create an instance variable buffer in __main__ that points to the PythonConsole instance
-	main_namespace["console"] = boost::python::ptr(instance);
+	main_namespace["console"] = instance;
 }
 
 }
diff --git a/PythonScript/src/ScintillaPython.h b/PythonScript/src/ScintillaPython.h
@@ -7,7 +7,7 @@ class ScintillaWrapper;
 
 
 void preinitScintillaModule();
-void importScintilla(NppPythonScript::ScintillaWrapper* editor, NppPythonScript::ScintillaWrapper* editor1, NppPythonScript::ScintillaWrapper* editor2);
+void importScintilla(boost::shared_ptr<ScintillaWrapper> editor, boost::shared_ptr<ScintillaWrapper> editor1, boost::shared_ptr<ScintillaWrapper> editor2);
 
 
 }
diff --git a/PythonScript/src/ScintillaWrapper.h b/PythonScript/src/ScintillaWrapper.h
@@ -2932,14 +2932,16 @@ class ScintillaWrapper : public PyProducerConsumer<CallbackExecArgs>
 	{
 		return SendMessage(m_handle, message, wParam, lParam);
 	}
-
+    
+	
 protected:
 	void consume(std::shared_ptr<CallbackExecArgs> args);
 
 	
 private:
 	ScintillaWrapper(); // default constructor disabled
-
+    ScintillaWrapper(const ScintillaWrapper& copy);  // copy constructor disabled
+    ScintillaWrapper& operator = (const ScintillaWrapper& rhs);  // assignment operator disabled
 	// Active Scintilla handle
 	HWND m_handle;
 
diff --git a/PythonScript/src/stdafx.h b/PythonScript/src/stdafx.h
@@ -56,6 +56,7 @@
 #include <iomanip>
 
 #include <boost/regex.hpp>
+#include <boost/shared_ptr.hpp>
 
 /*   Warnings disabled because of boost::python
  *   4127: Loop/conditional expression is constant

Original file line number	Diff line number	Diff line change
`@@ -376,18 +376,18 @@ void NotepadPlusWrapper::saveCurrentSession(const char *filename)`
`376`	`376`
`377`	`377`	`}`
`378`	`378`
`379`		`-ScintillaWrapper NotepadPlusWrapper::createScintilla()`
	`379`	`+boost::shared_ptr<ScintillaWrapper> NotepadPlusWrapper::createScintilla()`
`380`	`380`	`{`
`381`	`381`	`LRESULT handle = callNotepad(NPPM_CREATESCINTILLAHANDLE, 0, NULL);`
`382`	`382`
`383`	`383`	`// return copy`
`384`		`- return ScintillaWrapper((HWND)handle, m_nppHandle);`
	`384`	`+ return boost::shared_ptr<ScintillaWrapper>(new ScintillaWrapper((HWND)handle, m_nppHandle));`
`385`	`385`	`}`
`386`	`386`
`387`		`-void NotepadPlusWrapper::destroyScintilla(ScintillaWrapper& buffer)`
	`387`	`+void NotepadPlusWrapper::destroyScintilla(boost::shared_ptr<ScintillaWrapper> buffer)`
`388`	`388`	`{`
`389`		`- callNotepad(NPPM_DESTROYSCINTILLAHANDLE, 0, reinterpret_cast<LPARAM>(buffer.getHandle()));`
`390`		`- buffer.invalidateHandle();`
	`389`	`+ callNotepad(NPPM_DESTROYSCINTILLAHANDLE, 0, reinterpret_cast<LPARAM>(buffer->getHandle()));`
	`390`	`+ buffer->invalidateHandle();`
`391`	`391`	`}`
`392`	`392`
`393`	`393`	`idx_t NotepadPlusWrapper::getCurrentDocIndex(int view)`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ class NotepadPlusWrapper;`
`7`	`7`
`8`	`8`	`void export_notepad();`
`9`	`9`
`10`		`-void importNotepad(NotepadPlusWrapper* instance);`
	`10`	`+void importNotepad(boost::shared_ptr<NotepadPlusWrapper> instance);`
`11`	`11`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ PythonConsole::PythonConsole(HWND hNotepad) :`
`27`	`27`	`m_nppData(new NppData)`
`28`	`28`	`{`
`29`	`29`	`}`
`30`		`-`
	`30`	`+ /*`
`31`	`31`	`//lint -e1554 Direct pointer copy of member 'name' within copy constructor: 'PythonConsole::PythonConsole(const PythonConsole &)')`
`32`	`32`	`// We indeed copy pointers, and it's okay. These are not allocated within the`
`33`	`33`	`// scope of this class but rather passed in and copied anyway.`
`@@ -47,14 +47,15 @@ PythonConsole::PythonConsole(const PythonConsole& other) :`
`47`	`47`	`{`
`48`	`48`	`}`
`49`	`49`	`//lint +e1554`
	`50`	`+*/`
`50`	`51`
`51`	`52`	`PythonConsole::~PythonConsole()`
`52`	`53`	`{`
`53`	`54`	`try`
`54`	`55`	`{`
`55`	`56`	`delete mp_consoleDlg;`
`56`	`57`	`delete m_nppData;`
`57`		`- delete mp_scintillaWrapper;`
	`58`	`+`
`58`	`59`	`}`
`59`	`60`	`catch (...)`
`60`	`61`	`{`
`@@ -310,7 +311,7 @@ void export_console()`
`310`	`311`	`{`
`311`	`312`	`//lint -e1793 While calling Symbol: Initializing the implicit object parameter Type (a non-const reference) with a non-lvalue`
`312`	`313`	`// The class and enum declarations are used as designed, but they mess up Lint.`
`313`		`- boost::python::class_<PythonConsole>("Console", boost::python::no_init)`
	`314`	`+ boost::python::class_<PythonConsole, boost::shared_ptr<PythonConsole>, boost::noncopyable >("Console", boost::python::no_init)`
`314`	`315`	`.def("write", &PythonConsole::writeText, "Writes text to the console. Uses the __str__ function of the object passed.")`
`315`	`316`	`.def("clear", &PythonConsole::clear, "Clears the console window")`
`316`	`317`	`.def("writeError", &PythonConsole::writeError, "Writes text in the console in a red colour")`
`@@ -320,7 +321,7 @@ void export_console()`
`320`	`321`	`.def("run", &PythonConsole::runCommandNoStderr, "Runs a command on the console")`
`321`	`322`	`.def("run", &PythonConsole::runCommandNoStdout, "Runs a command on the console")`
`322`	`323`	`.add_static_property("encoding", &PythonConsole::getEncoding)`
`323`		`- .add_property("editor", boost::python::make_function(&PythonConsole::getScintillaWrapper, boost::python::return_internal_reference<>()));`
	`324`	`+ .add_property("editor", &PythonConsole::getScintillaWrapper);`
`324`	`325`	`//lint +e1793`
`325`	`326`	`}`
`326`	`327`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ PythonHandler::PythonHandler(TCHAR pluginsDir, TCHAR configDir, HINSTANCE hIns`
`32`	`32`
`33`	`33`	`mp_notepad = createNotepadPlusWrapper();`
`34`	`34`	`mp_scintilla = createScintillaWrapper();`
`35`		`- mp_scintilla1 = new ScintillaWrapper(scintilla1Handle, m_nppHandle);`
`36`		`- mp_scintilla2 = new ScintillaWrapper(scintilla2Handle, m_nppHandle);`
	`35`	`+ mp_scintilla1.reset(new ScintillaWrapper(scintilla1Handle, m_nppHandle));`
	`36`	`+ mp_scintilla2.reset(new ScintillaWrapper(scintilla2Handle, m_nppHandle));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`PythonHandler::~PythonHandler(void)`
`@@ -56,10 +56,6 @@ PythonHandler::~PythonHandler(void)`
`56`	`56`
`57`	`57`	`}`
`58`	`58`
`59`		`- delete mp_scintilla2;`
`60`		`- delete mp_scintilla1;`
`61`		`- delete mp_scintilla;`
`62`		`- delete mp_notepad;`
`63`	`59`
`64`	`60`	`// To please Lint, let's NULL these handles`
`65`	`61`	`m_hInst = NULL;`
`@@ -76,15 +72,15 @@ PythonHandler::~PythonHandler(void)`
`76`	`72`	`}`
`77`	`73`
`78`	`74`
`79`		`-ScintillaWrapper* PythonHandler::createScintillaWrapper()`
	`75`	`+boost::shared_ptr<ScintillaWrapper> PythonHandler::createScintillaWrapper()`
`80`	`76`	`{`
`81`	`77`	`m_currentView = mp_notepad->getCurrentView();`
`82`		`- return new ScintillaWrapper(m_currentView ? m_scintilla2Handle : m_scintilla1Handle, m_nppHandle);`
	`78`	`+ return boost::shared_ptr<ScintillaWrapper>(new ScintillaWrapper(m_currentView ? m_scintilla2Handle : m_scintilla1Handle, m_nppHandle));`
`83`	`79`	`}`
`84`	`80`
`85`		`-NotepadPlusWrapper* PythonHandler::createNotepadPlusWrapper()`
	`81`	`+boost::shared_ptr<NotepadPlusWrapper> PythonHandler::createNotepadPlusWrapper()`
`86`	`82`	`{`
`87`		`- return new NotepadPlusWrapper(m_hInst, m_nppHandle);`
	`83`	`+ return boost::shared_ptr<NotepadPlusWrapper>(new NotepadPlusWrapper(m_hInst, m_nppHandle));`
`88`	`84`	`}`
`89`	`85`
`90`	`86`	`void PythonHandler::initPython()`