Browse Source

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
pull/343/head^2
harrybharry 17 years ago
parent
commit
ef941865d7
  1. 3
      PowerEditor/src/Parameters.cpp
  2. 2
      PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp

3
PowerEditor/src/Parameters.cpp

@ -16,6 +16,7 @@
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. //Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "Parameters.h" #include "Parameters.h"
#include "FileDialog.h"
#include "ScintillaEditView.h" #include "ScintillaEditView.h"
#include <shlobj.h> #include <shlobj.h>
@ -402,7 +403,7 @@ winVer getWindowsVersion()
} }
NppParameters * NppParameters::_pSelf = new NppParameters; NppParameters * NppParameters::_pSelf = new NppParameters;
int FileDialog::_dialogFileBoxId = (NppParameters::getInstance())->getWinVersion() < WV_W2K?edt1:cmb13;
NppParameters::NppParameters() : _pXmlDoc(NULL),_pXmlUserDoc(NULL), _pXmlUserStylerDoc(NULL),\ NppParameters::NppParameters() : _pXmlDoc(NULL),_pXmlUserDoc(NULL), _pXmlUserStylerDoc(NULL),\
_pXmlUserLangDoc(NULL), _pXmlNativeLangDoc(NULL),\ _pXmlUserLangDoc(NULL), _pXmlNativeLangDoc(NULL),\
_nbLang(0), _nbFile(0), _nbMaxFile(10), _pXmlToolIconsDoc(NULL),\ _nbLang(0), _nbFile(0), _nbMaxFile(10), _pXmlToolIconsDoc(NULL),\

2
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp

@ -19,7 +19,7 @@
FileDialog *FileDialog::staticThis = NULL; 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) FileDialog::FileDialog(HWND hwnd, HINSTANCE hInst)
: _nbCharFileExt(0), _nbExt(0) : _nbCharFileExt(0), _nbExt(0)

Loading…
Cancel
Save