[UPDATE] Refactor Notepad_plus.cpp (in progress).

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@606 f5eea248-9336-0410-98b8-ebc06183d4e3

PowerEditor/src/MISC/Common/Common.h

@@ -18,6 +18,9 @@
 #ifndef M30_IDE_COMMUN_H
 #define M30_IDE_COMMUN_H
 
+const bool dirUp = true;
+const bool dirDown = false;
+
 #define NPP_CP_WIN_1252           1252
 #define NPP_CP_DOS_437            437
 #define NPP_CP_BIG5               950

PowerEditor/src/Notepad_plus.h

@@ -135,8 +135,8 @@ enum Views {
 };
 */
 
+
 struct TaskListInfo;
-static TiXmlNodeA * searchDlgNode(TiXmlNodeA *node, const char *dlgTagName);
 
 struct iconLocator {
 	int listIndex;
@@ -201,9 +201,18 @@ public:
 	void doClose(BufferID, int whichOne);
 	//bool doDelete(const TCHAR *fileName) const {return ::DeleteFile(fileName) != 0;};
 
-	inline void fileNew();
 	void fileOpen();
-	inline bool fileReload();
+	void fileNew() {
+	    BufferID newBufID = MainFileManager->newEmptyDocument();
+	    loadBufferIntoView(newBufID, currentView(), true);	//true, because we want multiple new files if possible
+	    activateBuffer(newBufID, currentView());
+    };
+
+    bool fileReload() {
+	    BufferID buf = _pEditView->getCurrentBufferID();
+	    return doReload(buf, buf->isDirty());
+    };
+
 	bool fileClose(BufferID id = BUFFER_INVALID, int curView = -1);	//use curView to override view to close from
 	bool fileCloseAll();
 	bool fileCloseAllButCurrent();
@@ -235,6 +244,7 @@ public:
 	const TCHAR * fileSaveSession(size_t nbFile, TCHAR ** fileNames, const TCHAR *sessionFile2save);
 	const TCHAR * fileSaveSession(size_t nbFile = 0, TCHAR ** fileNames = NULL);
 
+    TiXmlNodeA * searchDlgNode(TiXmlNodeA *node, const char *dlgTagName);
 	bool changeDlgLang(HWND hDlg, const char *dlgTagName, char *title = NULL);
 	void changeFindReplaceDlgLang();
 	void changeConfigLang();
@@ -251,7 +261,7 @@ public:
 
 	bool doBlockComment(comment_mode currCommentMode);
 	bool doStreamComment();
-	inline void doTrimTrailing();
+	void doTrimTrailing();
 
 	inline HACCEL getAccTable() const{
 		return _accelerator.getAccTable();

PowerEditor/src/WinControls/TaskList/TaskListDlg.h

@@ -34,9 +34,6 @@
 #include "Notepad_plus_msgs.h"
 #endif //NOTEPAD_PLUS_MSGS_H
 
-const bool dirUp = true;
-const bool dirDown = false;
-
 #define	TASKLIST_USER    (WM_USER + 8000)
 	#define WM_GETTASKLISTINFO (TASKLIST_USER + 01)
 

PowerEditor/visual.net/notepadPlus.vcproj

@@ -498,6 +498,10 @@
 				RelativePath="..\src\Notepad_plus.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\NppCommands.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\Parameters.cpp"
 				>