SVN Commit by dpage: r4381 - trunk/pgadmin3/src/dlg

Author: dpage
Date: 2005-07-21 10:58:54 +0100 (Thu, 21 Jul 2005)
New Revision: 4381

Modified:
trunk/pgadmin3/src/dlg/dlgTable.cpp
Log:
Honour ConfirmDelete user option in table dialogue

Modified: trunk/pgadmin3/src/dlg/dlgTable.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgTable.cpp 2005-07-21 08:26:58 UTC (rev 4380)
+++ trunk/pgadmin3/src/dlg/dlgTable.cpp 2005-07-21 09:58:54 UTC (rev 4381)
@@ -596,8 +596,11 @@

void dlgTable::OnRemoveTable(wxCommandEvent &ev)
{
- if (wxMessageBox(_("Are you sure you wish to remove the selected table?"), _("Remove table?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
- return;
+ if (settings->GetConfirmDelete())
+ {
+ if (wxMessageBox(_("Are you sure you wish to remove the selected table?"), _("Remove table?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
+ return;
+ }

int sel=lbTables->GetSelection();
if (sel >= 0)
@@ -668,8 +671,11 @@

void dlgTable::OnRemoveCol(wxCommandEvent &ev)
{
- if (wxMessageBox(_("Are you sure you wish to remove the selected column?"), _("Remove column?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
- return;
+ if (settings->GetConfirmDelete())
+ {
+ if (wxMessageBox(_("Are you sure you wish to remove the selected column?"), _("Remove column?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
+ return;
+ }

lstColumns->DeleteCurrentItem();

@@ -748,8 +754,11 @@

void dlgTable::OnRemoveConstr(wxCommandEvent &ev)
{
- if (wxMessageBox(_("Are you sure you wish to remove the selected constraint?"), _("Remove constraint?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
- return;
+ if (settings->GetConfirmDelete())
+ {
+ if (wxMessageBox(_("Are you sure you wish to remove the selected constraint?"), _("Remove constraint?"), wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION) == wxNO)
+ return;
+ }

int pos=lstConstraints->GetSelection();
if (pos < 0)