From: dpage Date: Thu, 11 Jun 2009 13:31:15 +0000 (+0000) Subject: Fixup line endings. X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=2be8b0f2632cd6c9676463e3f681e38cdd338bc6;p=users%2Fquan74%2Fpgadmin-import.git Fixup line endings. git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7919 a7884b65-44f6-0310-8a51-81a127f17b15 --- diff --git a/pgadmin/frm/frmBackupGlobals.cpp b/pgadmin/frm/frmBackupGlobals.cpp index d7ca28712..abc3a5eb0 100644 --- a/pgadmin/frm/frmBackupGlobals.cpp +++ b/pgadmin/frm/frmBackupGlobals.cpp @@ -197,9 +197,9 @@ void frmBackupGlobals::OnOK(wxCommandEvent &ev) } else if (wxFile::Exists(txtFilename->GetValue())) { - wxString msg; - msg.Printf(_("The file: \n\n%s\n\nalready exists. Do you want to overwrite it?"), txtFilename->GetValue().c_str()); - if (wxMessageBox(msg, _("Overwrite file?"), wxICON_WARNING | wxYES_NO) == wxNO) + wxString msg; + msg.Printf(_("The file: \n\n%s\n\nalready exists. Do you want to overwrite it?"), txtFilename->GetValue().c_str()); + if (wxMessageBox(msg, _("Overwrite file?"), wxICON_WARNING | wxYES_NO) == wxNO) return; } @@ -240,3 +240,4 @@ bool backupGlobalsFactory::CheckEnable(pgObject *obj) else return obj->CanBackupGlobals() && !pgBackupExecutable.IsEmpty() && pgAppMinimumVersion(pgBackupExecutable, 8, 3); } + diff --git a/pgadmin/frm/frmBackupServer.cpp b/pgadmin/frm/frmBackupServer.cpp index 72899e142..d018fc2b1 100644 --- a/pgadmin/frm/frmBackupServer.cpp +++ b/pgadmin/frm/frmBackupServer.cpp @@ -180,9 +180,9 @@ void frmBackupServer::OnOK(wxCommandEvent &ev) } else if (wxFile::Exists(txtFilename->GetValue())) { - wxString msg; - msg.Printf(_("The file: \n\n%s\n\nalready exists. Do you want to overwrite it?"), txtFilename->GetValue().c_str()); - if (wxMessageBox(msg, _("Overwrite file?"), wxICON_WARNING | wxYES_NO) == wxNO) + wxString msg; + msg.Printf(_("The file: \n\n%s\n\nalready exists. Do you want to overwrite it?"), txtFilename->GetValue().c_str()); + if (wxMessageBox(msg, _("Overwrite file?"), wxICON_WARNING | wxYES_NO) == wxNO) return; } @@ -222,3 +222,4 @@ bool backupServerFactory::CheckEnable(pgObject *obj) else return !pgBackupExecutable.IsEmpty() && pgAppMinimumVersion(pgBackupExecutable, 8, 3); } +