[ShareDaemon-CVS] ui-wx/src GUISettingsDlg.cpp,1.33,1.34

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11195

Modified Files:
	GUISettingsDlg.cpp 
Log Message:
Fixed a few variable redefinition warnings on MSVC6

Index: GUISettingsDlg.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/GUISettingsDlg.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- GUISettingsDlg.cpp	27 Dec 2003 12:38:55 -0000	1.33
+++ GUISettingsDlg.cpp	29 Dec 2003 08:50:50 -0000	1.34
@@ -81,7 +81,8 @@
 	int	font, iconset, tool_align, numlang, numiconsets;
 	bool	show_splash, prompt_exit, show_toolbar, show_menubar,
 		remember_last;
-	wxString tmpname, startpage;
+	wxString tmpname, startpage;
+	short i;
 
 	/* Read from config. If no value found, &<field> remains unchanged */
 	m_config->SetPath(wxT("/General"));
@@ -98,7 +99,7 @@
 	/* Load iconset data */
 	m_config->SetPath(wxT("/General/IconSets"));
 	m_config->Read(wxT("NumIconSets"), &numiconsets, 1);
-	for (int i=0; i<numiconsets; i++) {
+	for (i=0; i<numiconsets; i++) {
 		m_config->Read(
 			wxString::Format(wxT("%d"), i),
 			&tmpname,
@@ -112,7 +113,7 @@
 	/* Load language data */
 	m_config->SetPath(wxT("/General/Lang"));
 	m_config->Read(wxT("NumLang"), &numlang, 1);
-	for (int i=0; i<numlang; i++) {
+	for (i=0; i<numlang; i++) {
 		m_config->Read(
 			wxString::Format(wxT("%d"), i),
 			&tmpname,
@@ -141,7 +142,7 @@
 	 * The reason for all this mess is that we have *translated* strings
 	 * in choice control, but *un-translated* strings in config.
 	 */
-	for (short i=0;i<GetStartPage()->GetCount();i++) {
+	for (i=0;i<GetStartPage()->GetCount();i++) {
 		Page *p = (Page*)GetStartPage()->GetClientData(i);
 		wxString str = mainframe->GetPageList().Find(p)->GetKeyString();
 		if (str == startpage) {
@@ -170,7 +171,7 @@
  * Writes control values to config object.
  */
 void CGUISettingsDlg::SaveSettings() {
-	int old_tool_align, tool_align;
+	int old_tool_align, tool_align, i;
 	wxString old_icon_set, icon_set;
 	bool old_show_tool, show_tool;
 	bool old_show_menu, show_menu;
@@ -224,7 +225,7 @@
 
 	/* Iconsets data */
 	m_config->SetPath(wxT("/General/IconSets"));
-	for (int i=0; i<GetIconSet()->GetCount(); i++) {
+	for (i=0; i<GetIconSet()->GetCount(); i++) {
 		m_config->Write(
 			wxString::Format(wxT("%d"), i),
 			GetIconSet()->GetString(i)
@@ -238,7 +239,7 @@
 
 	/* Language data */
 	m_config->SetPath(wxT("/General/Lang"));
-	for (int i=0; i<GetLang()->GetCount(); i++) {
+	for (i=0; i<GetLang()->GetCount(); i++) {
 		m_config->Write(
 			wxString::Format(wxT("%d"), i),
 			GetLang()->GetString(i)