SVN Commit by andreas: r4836 - in branches/REL-1_4_0_PATCHES/pgadmin3/src: include/ctl slony slony/include

[svn(at)pgadmin(dot)org]

Author: andreas
Date: 2005-12-11 22:16:17 +0000 (Sun, 11 Dec 2005)
New Revision: 4836

Modified:
   branches/REL-1_4_0_PATCHES/pgadmin3/src/include/ctl/ctlComboBox.h
   branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/include/slSubscription.h
   branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/slSubscription.cpp
Log:
Fix: Unsubscribe set on receiver
Another wxComboBox(2.6.2) related fix

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/include/ctl/ctlComboBox.h
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/include/ctl/ctlComboBox.h	2005-12-11 22:01:08 UTC (rev 4835)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/include/ctl/ctlComboBox.h	2005-12-11 22:16:17 UTC (rev 4836)
@@ -52,11 +52,6 @@
 #ifdef __WXMSW__
     wxString GetValue() const { return wxGetWindowText(GetHwnd()); }
 #endif
-
-
-private:
-    // to prevent using it; use GetCurrentSelection() instead
-    int GetSelection() const { return -1; }
 };
 
 class ctlComboBox : public ctlComboBoxFix

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/include/slSubscription.h
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/include/slSubscription.h	2005-12-11 22:01:08 UTC (rev 4835)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/include/slSubscription.h	2005-12-11 22:16:17 UTC (rev 4836)
@@ -59,6 +59,7 @@
 
   
     bool CanCreate();
+    bool CanDrop();
 
     bool DropObject(wxFrame *frame, ctlTree *browser, bool cascaded);
     wxString GetSql(ctlTree *browser);

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/slSubscription.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/slSubscription.cpp	2005-12-11 22:01:08 UTC (rev 4835)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/slony/slSubscription.cpp	2005-12-11 22:16:17 UTC (rev 4836)
@@ -61,6 +61,12 @@
 }
 
 
+bool slSubscription::CanDrop()
+{
+    return GetReceiverId() == GetCluster()->GetLocalNodeID();
+}
+
+
 wxString slSubscription::GetSql(ctlTree *browser)
 {
     if (sql.IsNull())