Index: CHANGELOG.txt
===================================================================
RCS file: /projects/pgadmin3/CHANGELOG.txt,v
retrieving revision 1.141
retrieving revision 1.142
diff -LCHANGELOG.txt -LCHANGELOG.txt -u -w -r1.141 -r1.142
--- CHANGELOG.txt
+++ CHANGELOG.txt
@@ -17,9 +17,10 @@
+ - 2004-10-06 AP 1.2B3 Fix cast property crash [Alexander Borkowski]
- 2004-10-05 AP 1.2B3 Use PostgreSQL's list of keywords for syntax highlighting
-
- 2004-10-05 AP 1.2B3 Fix adding columns with constraints using table properties on 7.3 and 7.4
-
- 2004-10-05 DP 1.2B3 Drop rows correctly when selected in reverse in the edit grid. Also, confirm drop first.
+
- 2004-10-05 AP 1.2B3 Fix adding columns with constraints using table properties on 7.3 and 7.4 [teknokrat, Virgil Frum]
+
- 2004-10-05 DP 1.2B3 Drop rows correctly when selected in reverse in the edit grid. Also, confirm drop first. [Virgil Frum]
- 2004-09-27 DP 1.2B3 Dynamically link libpq/OpenSSL for sensible installation with Win32 PostgreSQL
- 2004-09-18 DP 1.2B2 Prevent dropped servers reappearing after View System Objects change.
- 2004-09-17 AP 1.2B2 GRANT for functions in reengineered SQL window
Index: dlgProperty.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgProperty.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -Lsrc/ui/dlgProperty.cpp -Lsrc/ui/dlgProperty.cpp -u -w -r1.96 -r1.97
--- src/ui/dlgProperty.cpp
+++ src/ui/dlgProperty.cpp
@@ -240,7 +240,9 @@
wxString dlgProperty::GetName()
{
+ if (txtName)
return txtName->GetValue().Strip(wxString::both);
+ return wxEmptyString;
}
Index: dlgCast.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/dlgCast.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/ui/dlgCast.cpp -Lsrc/ui/dlgCast.cpp -u -w -r1.13 -r1.14
--- src/ui/dlgCast.cpp
+++ src/ui/dlgCast.cpp
@@ -26,6 +26,7 @@
// pointer to controls
+#define txtCastname CTRL_TEXT("txtCastname")
#define cbSourceType CTRL_COMBOBOX2("cbSourceType")
#define cbTargetType CTRL_COMBOBOX2("cbTargetType")
#define cbFunction CTRL_COMBOBOX("cbFunction")
@@ -46,7 +47,7 @@
SetIcon(wxIcon(cast_xpm));
cast=node;
- txtName->Disable();
+ txtCastname->Disable();
}
@@ -116,9 +117,9 @@
CheckValid(enable, cbTargetType->GetGuessedSelection() > 0, _("Please select target datatype."));
if (enable)
- txtName->SetValue(cbSourceType->GetValue() + wxT(" -> ") + cbTargetType->GetValue());
+ txtCastname->SetValue(cbSourceType->GetValue() + wxT(" -> ") + cbTargetType->GetValue());
else
- txtName->SetValue(wxEmptyString);
+ txtCastname->SetValue(wxEmptyString);
EnableOK(enable);
}
Index: dlgCast.xrc
===================================================================
RCS file: /projects/pgadmin3/src/ui/common/dlgCast.xrc,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lsrc/ui/common/dlgCast.xrc -Lsrc/ui/common/dlgCast.xrc -u -w -r1.9 -r1.10
--- src/ui/common/dlgCast.xrc
+++ src/ui/common/dlgCast.xrc
@@ -10,7 +10,7 @@
5,7d
-