From ef941865d7a32f5fca66607e87b0ed55103e3757 Mon Sep 17 00:00:00 2001 From: harrybharry Date: Thu, 24 Apr 2008 22:21:49 +0000 Subject: [PATCH] Fix crash bug because of incorrect static initialisation error. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@188 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Parameters.cpp | 3 ++- PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp index 7dbe5cc10..cc56c1f74 100644 --- a/PowerEditor/src/Parameters.cpp +++ b/PowerEditor/src/Parameters.cpp @@ -16,6 +16,7 @@ //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #include "Parameters.h" +#include "FileDialog.h" #include "ScintillaEditView.h" #include @@ -402,7 +403,7 @@ winVer getWindowsVersion() } NppParameters * NppParameters::_pSelf = new NppParameters; - +int FileDialog::_dialogFileBoxId = (NppParameters::getInstance())->getWinVersion() < WV_W2K?edt1:cmb13; NppParameters::NppParameters() : _pXmlDoc(NULL),_pXmlUserDoc(NULL), _pXmlUserStylerDoc(NULL),\ _pXmlUserLangDoc(NULL), _pXmlNativeLangDoc(NULL),\ _nbLang(0), _nbFile(0), _nbMaxFile(10), _pXmlToolIconsDoc(NULL),\ diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp index 723173ff2..ba082998d 100644 --- a/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp +++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp @@ -19,7 +19,7 @@ FileDialog *FileDialog::staticThis = NULL; -int FileDialog::_dialogFileBoxId = (NppParameters::getInstance())->getWinVersion() < WV_W2K?edt1:cmb13; +//int FileDialog::_dialogFileBoxId = (NppParameters::getInstance())->getWinVersion() < WV_W2K?edt1:cmb13; FileDialog::FileDialog(HWND hwnd, HINSTANCE hInst) : _nbCharFileExt(0), _nbExt(0)