Fix various missing or broken stuff needed for Project Phoenix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-27 20:47:12 +00:00
parent e0db57da4c
commit 05b0355af8
7 changed files with 161 additions and 31 deletions
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -80,7 +80,7 @@ public:
        Constructor creating the top level window.
    */
    wxTopLevelWindow(wxWindow *parent,
-                    wxWindowID winid,
+                    wxWindowID id,
                    const wxString& title,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
@@ -288,6 +288,11 @@ public:
    */
    wxWindow* SetDefaultItem(wxWindow* win);

+    
+    wxWindow*  SetTmpDefaultItem(wxWindow * win);
+    wxWindow* GetTmpDefaultItem() const;
+
+    
    /**
        Sets the icon for this window.