Interface tweaks and fixes for Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index 71a9984d49cb483b7403e3c418e9971ce924d513..f692cc578b795ffbe69048e720026905a3a7d63d 100644 (file)
--- 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 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;
     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 202eae1923e9edd639c9f70c959a7e46cc814e17..f7e6aec56e176759f54d3ca868883ba9260d1cee 100644 (file)
--- a/interface/wx/popupwin.h
+++ b/interface/wx/popupwin.h
@@ -22,6 +22,11 @@ class wxPopupWindow: public wxNonOwnedWindow
 {
 public:
 
 {
 public:
 

+    /**
+      Default constructor
+    */
+    wxPopupWindow();
+    

     /**
       Constructor
     */
     /**
       Constructor
     */


@@ -67,6 +72,11 @@ public:
 class wxPopupTransientWindow : public wxPopupWindow
 {
 public:
 class wxPopupTransientWindow : public wxPopupWindow
 {
 public:

+    /**
+        Default constructor.
+    */
+    wxPopupTransientWindow();
+

     /**
         Constructor.
     */
     /**
         Constructor.
     */


@@ -96,4 +106,12 @@ public:
         (which consists in dismissing it if the mouse is clicked outside it).
     */
     virtual bool ProcessLeftDown(wxMouseEvent& event);
         (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 295baddec76bee4b10fa916f3d55565dbcfc00c3..2311581485fa1b440fd44dbfbd1fdbf69cb1d9e6 100644 (file)
--- a/interface/wx/versioninfo.h
+++ b/interface/wx/versioninfo.h
@@ -40,9 +40,9 @@ public:
             default.
         @param copyright Copyright string, none by default.
     */
             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());
                   int micro = 0,
                   const wxString& description = wxString(),
                   const wxString& copyright = wxString());