Thread: SVN Commit by andreas: r4772 - in trunk/pgadmin3: . src/ctl xtra/wx-build

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

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/ctl/ctlComboBox.cpp
   trunk/pgadmin3/xtra/wx-build/readme.txt
Log:
Deal with incompatible wx2.6.2 API changes (group combobox in security panel)

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-12-01 08:48:34 UTC (rev 4771)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-12-01 13:07:51 UTC (rev 4772)
@@ -18,6 +18,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-12-01 AP  1.4.1  Deal with incompatible wx2.6.2 API changes (group combobox in security panel)
     <li>2005-11-30 AP         Graphical explain: distinct scan images
     <li>2005-11-25 DP  1.4.1  Fix the server status SQL query
     <li>2005-11-25 FGP 1.4.1  Don't include pgAgent in the Mac OSX bundle

Modified: trunk/pgadmin3/src/ctl/ctlComboBox.cpp
===================================================================
--- trunk/pgadmin3/src/ctl/ctlComboBox.cpp    2005-12-01 08:48:34 UTC (rev 4771)
+++ trunk/pgadmin3/src/ctl/ctlComboBox.cpp    2005-12-01 13:07:51 UTC (rev 4772)
@@ -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;

Modified: trunk/pgadmin3/xtra/wx-build/readme.txt
===================================================================
--- trunk/pgadmin3/xtra/wx-build/readme.txt    2005-12-01 08:48:34 UTC (rev 4771)
+++ trunk/pgadmin3/xtra/wx-build/readme.txt    2005-12-01 13:07:51 UTC (rev 4772)
@@ -1,5 +1,7 @@
 These files are used to create the wx library.

-Copy setup-msw-xxx to c:\wxWidgets-2.6.1\include\wx\setup0.h (and to wx\setup.h and wx\msw\setup.h)
+Download wxWidgets to c:\wxWidgets-2.6

-Copy wx-pgadmin.dsw to c:\wxWidgets-2.6.1\build\msw and use it for making all contained modules (using the unicode
non-dllconfiguration) 
+Copy setup-msw-xxx to c:\wxWidgets-2.6\include\wx\setup0.h (and to wx\setup.h and wx\msw\setup.h)
+
+Copy wx-pgadmin.dsw to c:\wxWidgets-2.6\build\msw and use it for making all contained modules (using the unicode
non-dllconfiguration)