Skip site navigation (1) Skip section navigation (2)

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

From: svn(at)pgadmin(dot)org
To: pgadmin-hackers(at)postgresql(dot)org
Subject: SVN Commit by andreas: r4773 - branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl
Date: 2005-12-01 13:07:57
Message-ID: 200512011307.jB1D7v5t017003@developer.pgadmin.org (view raw or flat)
Thread:
Lists: pgadmin-hackers
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;


pgadmin-hackers by date

Next:From: Dave PageDate: 2005-12-01 13:16:56
Subject: Re: SVN Commit by andreas: r4773 - branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl
Previous:From: svnDate: 2005-12-01 13:07:52
Subject: SVN Commit by andreas: r4772 - in trunk/pgadmin3: . src/ctl xtra/wx-build

Privacy Policy | About PostgreSQL
Copyright © 1996-2014 The PostgreSQL Global Development Group