From 3d2ee2fb05b02eba3fbe8e08f80aa4aeea91e824 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 19 Dec 2011 22:39:02 +0000
Subject: [PATCH] Interface tweaks and fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 interface/wx/combobox.h    |  1 -
 interface/wx/popupwin.h    | 18 ++++++++++++++++++
 interface/wx/versioninfo.h |  6 +++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index 71a9984d49..f692cc578b 100644
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -311,7 +311,6 @@ public:
     virtual int GetSelection() const;
     virtual void GetSelection(long *from, long *to) const;
     virtual void SetSelection(int n);
-    virtual void SetSelection(long from, long to);
     virtual int FindString(const wxString& s, bool bCase = false) const;
     virtual wxString GetString(unsigned int n) const;
     virtual wxString GetStringSelection() const;
diff --git a/interface/wx/popupwin.h b/interface/wx/popupwin.h
index 202eae1923..f7e6aec56e 100644
--- a/interface/wx/popupwin.h
+++ b/interface/wx/popupwin.h
@@ -22,6 +22,11 @@ class wxPopupWindow: public wxNonOwnedWindow
 {
 public:
 
+    /**
+      Default constructor
+    */
+    wxPopupWindow();
+    
     /**
       Constructor
     */
@@ -67,6 +72,11 @@ public:
 class wxPopupTransientWindow : public wxPopupWindow
 {
 public:
+    /**
+        Default constructor.
+    */
+    wxPopupTransientWindow();
+
     /**
         Constructor.
     */
@@ -96,4 +106,12 @@ public:
         (which consists in dismissing it if the mouse is clicked outside it).
     */
     virtual bool ProcessLeftDown(wxMouseEvent& event);
+
+protected:
+    /**
+       This is called when the popup is disappeared because of anything
+       else but direct call to Dismiss().
+    */
+    virtual void OnDismiss();
+    
 };
diff --git a/interface/wx/versioninfo.h b/interface/wx/versioninfo.h
index 295baddec7..2311581485 100644
--- a/interface/wx/versioninfo.h
+++ b/interface/wx/versioninfo.h
@@ -40,9 +40,9 @@ public:
             default.
         @param copyright Copyright string, none by default.
     */
-    wxVersionInfo(const wxString& name,
-                  int major,
-                  int minor,
+    wxVersionInfo(const wxString& name = wxString(),
+                  int major = 0,
+                  int minor = 0,
                   int micro = 0,
                   const wxString& description = wxString(),
                   const wxString& copyright = wxString());
-- 
2.45.2