Thread: SVN Commit by andreas: r4833 - in trunk/pgadmin3: . src/frm src/include/ctl src/slony src/slony/include
SVN Commit by andreas: r4833 - in trunk/pgadmin3: . src/frm src/include/ctl src/slony src/slony/include
From
svn@pgadmin.org
Date:
Author: andreas Date: 2005-12-11 21:58:25 +0000 (Sun, 11 Dec 2005) New Revision: 4833 Modified: trunk/pgadmin3/CHANGELOG.txt trunk/pgadmin3/src/frm/frmQuery.cpp trunk/pgadmin3/src/include/ctl/ctlComboBox.h trunk/pgadmin3/src/slony/include/slSubscription.h trunk/pgadmin3/src/slony/slSubscription.cpp Log: Fix: Unsubscribe set on receiver Another wxComboBox(2.6.2) related fix Modified: trunk/pgadmin3/CHANGELOG.txt =================================================================== --- trunk/pgadmin3/CHANGELOG.txt 2005-12-10 14:46:39 UTC (rev 4832) +++ trunk/pgadmin3/CHANGELOG.txt 2005-12-11 21:58:25 UTC (rev 4833) @@ -18,6 +18,8 @@ </ul> <br> <ul> + <li>2005-12-11 AP 1.4.2 Fix: Unsubscribe set on receiver + <li>2005-12-11 AP 1.4.2 Another wxComboBox(2.6.2) related fix <li>2005-12-09 DP 1.4.1 Default the encoding of new databases to the cluster encoding, per Peter Eisentraut. <li>2005-12-09 DP 1.4.1 Sort encoding names in dlgDatabase, per Peter Eisentraut. <li>2005-12-06 AP 1.4.1 store UTF8 connect info in pgpass.conf if necessary Modified: trunk/pgadmin3/src/frm/frmQuery.cpp =================================================================== --- trunk/pgadmin3/src/frm/frmQuery.cpp 2005-12-10 14:46:39 UTC (rev 4832) +++ trunk/pgadmin3/src/frm/frmQuery.cpp 2005-12-11 21:58:25 UTC (rev 4833) @@ -200,6 +200,7 @@ toolBar->AddSeparator(); cbConnection = new ctlComboBoxFix(toolBar, CTRLID_CONNECTION, wxDefaultPosition, wxSize(GetCharWidth()*30, -1), wxCB_READONLY|wxCB_DROPDOWN); +// cbConnection = (ctlComboBoxFix*)new wxComboBox(toolBar, CTRLID_CONNECTION, wxEmptyString, wxDefaultPosition, wxSize(GetCharWidth()*30,-1), 0, 0, wxCB_READONLY|wxCB_DROPDOWN); cbConnection->Append(conn->GetName(), (void*)conn); cbConnection->Append(_("<new connection>"), (void*)0); toolBar->AddControl(cbConnection); Modified: trunk/pgadmin3/src/include/ctl/ctlComboBox.h =================================================================== --- trunk/pgadmin3/src/include/ctl/ctlComboBox.h 2005-12-10 14:46:39 UTC (rev 4832) +++ trunk/pgadmin3/src/include/ctl/ctlComboBox.h 2005-12-11 21:58:25 UTC (rev 4833) @@ -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: trunk/pgadmin3/src/slony/include/slSubscription.h =================================================================== --- trunk/pgadmin3/src/slony/include/slSubscription.h 2005-12-10 14:46:39 UTC (rev 4832) +++ trunk/pgadmin3/src/slony/include/slSubscription.h 2005-12-11 21:58:25 UTC (rev 4833) @@ -59,6 +59,7 @@ bool CanCreate(); + bool CanDrop(); bool DropObject(wxFrame *frame, ctlTree *browser, bool cascaded); wxString GetSql(ctlTree *browser); Modified: trunk/pgadmin3/src/slony/slSubscription.cpp =================================================================== --- trunk/pgadmin3/src/slony/slSubscription.cpp 2005-12-10 14:46:39 UTC (rev 4832) +++ trunk/pgadmin3/src/slony/slSubscription.cpp 2005-12-11 21:58:25 UTC (rev 4833) @@ -61,6 +61,12 @@ } +bool slSubscription::CanDrop() +{ + return GetReceiverId() == GetCluster()->GetLocalNodeID(); +} + + wxString slSubscription::GetSql(ctlTree *browser) { if (sql.IsNull())