From 05c989e58aeffcfb59cebaca6797cb69dd25cb1e Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 14:33:30 +0000 Subject: another portion of "#ifdef Unicode" removal git-svn-id: http://svn.miranda-ng.org/main/trunk@446 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'plugins/UserInfoEx/ex_import') diff --git a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp index ae11ed0a5f..6e1bb7ad54 100644 --- a/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/ex_import/dlg_ExImOpenSaveFile.cpp @@ -30,14 +30,14 @@ Last change by : $Author: ing.u.horn $ #include "commonheaders.h" -#ifdef _UNICODE + #include -#endif + #include "m_db3xSA.h" #include "dlg_ExImOpenSaveFile.h" -#ifdef _UNICODE + #define HKEY_MIRANDA_PLACESBAR _T("Software\\Miranda IM\\PlacesBar") #define HKEY_WINPOL_PLACESBAR _T("Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\ComDlg32\\PlacesBar") @@ -227,7 +227,7 @@ static UINT_PTR CALLBACK OpenSaveFileDialogHook(HWND hDlg, UINT uMsg, WPARAM wPa return FALSE; } -#endif + /** * name: GetInitialDir @@ -305,7 +305,7 @@ static VOID InitOpenFileNameStruct(OPENFILENAMEA *pofn, HWND hWndParent, LPCSTR GetInitialDir(pszInitialDir); pofn->lpstrInitialDir = pszInitialDir; -#ifdef _UNICODE + if (IsWinVer2000Plus()) { pofn->lStructSize = sizeof (OPENFILENAME); pofn->Flags |= OFN_ENABLEHOOK|OFN_EXPLORER; @@ -314,9 +314,7 @@ static VOID InitOpenFileNameStruct(OPENFILENAMEA *pofn, HWND hWndParent, LPCSTR else { pofn->lStructSize = OPENFILENAME_SIZE_VERSION_400; } -#else - pofn->lStructSize = sizeof (OPENFILENAME); -#endif + } -- cgit v1.2.3