Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.153
retrieving revision 1.154
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.153 -r1.154
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,6 +17,7 @@
+ - 2004-10-22 AP 1.2B4 fix Edit Tool to store data when selecting a row (r: Virgil Frum)
- 2004-10-22 AP 1.2B4 fix Query Tool which marked text as changed when scrolling (r: Gary Doades)
- 2004-10-22 AP 1.2B4 Workaround for wxMSW-2.5.3 malfunctioning combobox (r: Gary Doades)
- 2004-10-22 AP 1.2B4 fix Query Tool recent menu (r: Gary Doades)
Index: frmEditGrid.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmEditGrid.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -Lsrc/ui/frmEditGrid.cpp -Lsrc/ui/frmEditGrid.cpp -u -w -r1.60 -r1.61
--- src/ui/frmEditGrid.cpp
+++ src/ui/frmEditGrid.cpp
@@ -547,6 +547,9 @@
bool enable=rows.GetCount() > 0;
if (enable)
{
+ wxCommandEvent nullEvent;
+ OnSave(event);
+
// check if a readonly line is selected
int row, col;
size_t i;
@@ -556,8 +559,12 @@
row = rows.Item(i);
bool lineEnabled=false;
- if (row != sqlGrid->GetNumberRows()-1)
+ if (row == sqlGrid->GetNumberRows()-1)
{
+ // the (*) line may not be deleted/copied
+ enable=false;
+ break;
+ }
for (col = 0 ; col < sqlGrid->GetNumberCols() ; col++)
{
if (!sqlGrid->IsReadOnly(row, col))
@@ -566,7 +573,6 @@
break;
}
}
- }
if (!lineEnabled)
{
@@ -581,6 +587,7 @@
event.Skip();
}
+
void frmEditGrid::ShowForm(bool filter)
{
bool abort = false;