SVN Commit by andreas: r4590 - in trunk/pgadmin3: . src/main

Author: andreas
Date: 2005-10-22 16:04:52 +0100 (Sat, 22 Oct 2005)
New Revision: 4590

Modified:
trunk/pgadmin3/CHANGELOG.txt
trunk/pgadmin3/src/main/events.cpp
Log:
Fix New.. context menu

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt 2005-10-22 10:15:55 UTC (rev 4589)
+++ trunk/pgadmin3/CHANGELOG.txt 2005-10-22 15:04:52 UTC (rev 4590)
@@ -17,6 +17,7 @@
</ul>
<br>
<ul>
+ <li>2005-10-22 AP 1.4B4 Fix New.. context menu
<li>2005-10-21 AP 1.4B4 Fix Create a.. toolbar button on collection (r: Li Fei)
<li>2005-10-20 AP 1.4B4 Fix Maintenance crash of disconnected DBs (r: A.J.Langereis)
<li>2005-10-20 AP 1.4B4 Fix Unicode/pgsql80win32 hint (r: Oryza Triznyak)

Modified: trunk/pgadmin3/src/main/events.cpp
===================================================================
--- trunk/pgadmin3/src/main/events.cpp 2005-10-22 10:15:55 UTC (rev 4589)
+++ trunk/pgadmin3/src/main/events.cpp 2005-10-22 15:04:52 UTC (rev 4590)
@@ -719,8 +719,9 @@

void frmMain::OnNew(wxCommandEvent &ev)
{
- int type=ev.GetId() - MNU_NEW;
- if (pgaFactory::GetFactory(type) == &serverFactory)
+ pgaFactory *factory=pgaFactory::GetFactory(ev.GetId() - MNU_NEW);
+
+ if (factory == &serverFactory)
{
if (currentObject && currentObject->IsCreatedBy(serverFactory))
{
@@ -733,7 +734,7 @@

if (currentObject)
{
- if (!dlgProperty::CreateObjectDialog(this, currentObject, 0))
+ if (!dlgProperty::CreateObjectDialog(this, currentObject, factory))
CheckAlive();
}
}