X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f618020a15f1647a83aaeab1fe315f90497a9876..26531700c7ec84872c60899ce6219954499086da:/include/wx/os2/toplevel.h

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 4224ed63b7..4e056f9da4 100644
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -16,7 +16,7 @@
     #pragma interface "toplevel.h"
 #endif
 
-enum ETemplateID { kResizeableDialog = 127
+enum ETemplateID { kResizeableDialog = 130
                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };
@@ -67,7 +67,7 @@ public:
            virtual void Restore(void);
            virtual void SendSizeEvent(void);
            virtual void SetIcon(const wxIcon& rIcon);
-    inline virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
+           virtual void SetIcons(const wxIconBundle& rIcons);
 
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow
@@ -86,6 +86,11 @@ public:
     // --------------------------
     //
            PSWP         GetSwpClient(void) { return &m_vSwpClient; }
+
+           void         OnActivate(wxActivateEvent& rEvent);
+
+           void         SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; }
+           wxWindow*    GetLastFocus(void) const { return m_pWinLastFocused; }
 protected:
     //
     // Common part of all ctors
@@ -126,11 +131,17 @@ protected:
                                 ) const;
 
     //
-    // Translate wxWindows flags into OS flags
+    // Translate wxWidgets flags into OS flags
     //
     virtual WXDWORD OS2GetStyle( long     lFlag
                                 ,WXDWORD* pdwExstyle
                                ) const;
+
+    //
+    // Choose the right parent to use with CreateWindow()
+    //
+    virtual WXHWND  OS2GetParent(void) const;
+
     //
     // Is the frame currently iconized?
     //
@@ -151,16 +162,16 @@ protected:
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
 
+    wxWindow*                       m_pWinLastFocused;
+
     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
     static bool                     m_sbInitialized;
-}; // end of CLASS wxTopLevelWindowOS2
+    static wxWindow*                m_spHiddenParent;
 
-//
-// List of all frames and modeless dialogs
-//
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+    DECLARE_EVENT_TABLE()
+}; // end of CLASS wxTopLevelWindowOS2
 
 #endif // _WX_MSW_TOPLEVEL_H_