Index: src/ch/ShortcutsDlg.cpp =================================================================== diff -u -r66e9ad9a512cec46d691cb1ba012424dc7ac8897 -rd2b121c78f510b5384b8ef0ca80afbfd7f77fef7 --- src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision 66e9ad9a512cec46d691cb1ba012424dc7ac8897) +++ src/ch/ShortcutsDlg.cpp (.../ShortcutsDlg.cpp) (revision d2b121c78f510b5384b8ef0ca80afbfd7f77fef7) @@ -1,23 +1,21 @@ -/************************************************************************ - Copy Handler 1.x - program for copying data in Microsoft Windows - systems. - Copyright (C) 2001-2004 Ixen Gerthannes (copyhandler@o2.pl) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*************************************************************************/ - +/*************************************************************************** +* Copyright (C) 2001-2008 by J�zef Starosczyk * +* ixen@copyhandler.com * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU Library General Public License * +* (version 2) as published by the Free Software Foundation; * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License for more details. * +* * +* You should have received a copy of the GNU Library General Public * +* License along with this program; if not, write to the * +* Free Software Foundation, Inc., * +* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * +***************************************************************************/ #include "stdafx.h" #include "ch.h" #include "ShortcutsDlg.h" @@ -34,7 +32,7 @@ CShortcutsDlg::CShortcutsDlg(CWnd* pParent /*=NULL*/) - : CHLanguageDialog(CShortcutsDlg::IDD, pParent) + :ictranslate::CLanguageDialog(CShortcutsDlg::IDD, pParent) { //{{AFX_DATA_INIT(CShortcutsDlg) m_strName = _T(""); @@ -54,7 +52,7 @@ } -BEGIN_MESSAGE_MAP(CShortcutsDlg, CHLanguageDialog) +BEGIN_MESSAGE_MAP(CShortcutsDlg,ictranslate::CLanguageDialog) //{{AFX_MSG_MAP(CShortcutsDlg) ON_NOTIFY(LVN_ITEMCHANGED, IDC_SHORTCUT_LIST, OnItemchangedShortcutList) ON_CBN_EDITCHANGE(IDC_PATH_COMBOBOXEX, OnEditchangePathComboboxex) @@ -72,7 +70,7 @@ BOOL CShortcutsDlg::OnInitDialog() { - CHLanguageDialog::OnInitDialog(); + CLanguageDialog::OnInitDialog(); // system image list SHFILEINFO sfi; @@ -168,6 +166,7 @@ // get combo text COMBOBOXEXITEM cbi; TCHAR szPath[_MAX_PATH]; + memset(szPath, 0, _MAX_PATH); cbi.mask=CBEIF_TEXT; cbi.iItem=m_ctlPath.GetCurSel()/*-1*/; cbi.pszText=szPath;