SVN Commit by andreas: r4773 - branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl

Author: andreas
Date: 2005-12-01 13:07:56 +0000 (Thu, 01 Dec 2005)
New Revision: 4773

Modified:
branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlComboBox.cpp
Log:
Deal with incompatible wx2.6.2 API changes (group combobox in security panel)

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlComboBox.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlComboBox.cpp 2005-12-01 13:07:51 UTC (rev 4772)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlComboBox.cpp 2005-12-01 13:07:56 UTC (rev 4773)
@@ -208,7 +208,11 @@

int ctlComboBox::GetGuessedSelection() const
{
+#if wxABI_VERSION >= 20602
+ int sel=wxComboBox::GetCurrentSelection();
+#else
int sel=wxComboBox::GetSelection();
+#endif
if (sel < 0)
sel = FindString(GetValue());
return sel;
@@ -216,7 +220,11 @@

int ctlComboBox::GetSelection() const
{
+#if wxABI_VERSION >= 20602
+ int sel=wxComboBox::GetCurrentSelection();
+#else
int sel=wxComboBox::GetSelection();
+#endif
if (sel < 0)
sel = FindString(GetValue());
return sel;