Обсуждение: 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;

Hi Andreas,

I already tried this fix - it makes no difference :-(

Afaict, the issue is in GuessSelection, where wxComboBox::GetValue()
doesn't work exactly as per the docs:

"Process a wxEVT_COMMAND_COMBOBOX_SELECTED event, when an item on the
list is selected. Note that calling GetValue returns the new value of
selection."

It only seems to return the /new/ value when there is no existing value.

However, I've been unable to reproduce this in the wx controls sample,
so we must be doing something else that's clobbering it. Just not sure
what...

Regards, Dave.


> -----Original Message-----
> From: pgadmin-hackers-owner@postgresql.org
> [mailto:pgadmin-hackers-owner@postgresql.org] On Behalf Of
> svn@pgadmin.org
> Sent: 01 December 2005 13:08
> To: pgadmin-hackers@postgresql.org
> Subject: [pgadmin-hackers] 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;
>
>
> ---------------------------(end of
> broadcast)---------------------------
> TIP 4: Have you searched our list archives?
>
>                http://archives.postgresql.org
>

Dave Page wrote:
> Hi Andreas,
>
> I already tried this fix - it makes no difference :-(

I just crosschecked, it _does_ work for me.

Regards,
Andreas

> > Hi Andreas,
> >
> > I already tried this fix - it makes no difference :-(
>
> I just crosschecked, it _does_ work for me.

If you can whip up a binary for me, I can test it on one of my customers
who keeps nagging on me about it (hey, he only noticed it a couple of
days ago, but you know how it can be...) I don't have a build env for
pgAdmin...

//Magnus

> -----Original Message-----
> From: Andreas Pflug [mailto:pgadmin@pse-consulting.de]
> Sent: 02 December 2005 07:07
> To: Dave Page
> Cc: pgadmin-hackers@postgresql.org
> Subject: Re: [pgadmin-hackers] SVN Commit by andreas: r4773 -
> branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl
>
> Dave Page wrote:
> > Hi Andreas,
> >
> > I already tried this fix - it makes no difference :-(
>
> I just crosschecked, it _does_ work for me.

OK, that's odd - it works on the grant wizard and security panel (annd
everywhere else I've checked), but *not* on the data type list on the
add column dlg.

Investigating - but feel free to ping me if you know (or can hint on)
what it is!!

/D