wxMDIChildFrame::Maximize() should have default value for its argument just as wxFram...

[wxWidgets.git] / include / wx / os2 / toplevel.h

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index d0e1a3e469062106085f11bbcde7e55b3df14e9f..4e056f9da413744df2fdc6585e9a55ee70df256b 100644 (file)
--- a/include/wx/os2/toplevel.h
+++ b/include/wx/os2/toplevel.h
@@ -16,7 +16,7 @@
     #pragma interface "toplevel.h"
 #endif
 
     #pragma interface "toplevel.h"
 #endif
 

-enum ETemplateID { kResizeableDialog = 127
+enum ETemplateID { kResizeableDialog = 130

                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };
                   ,kCaptionDialog
                   ,kNoCaptionDialog
                  };


@@ -86,6 +86,11 @@ public:
     // --------------------------
     //
            PSWP         GetSwpClient(void) { return &m_vSwpClient; }
     // --------------------------
     //
            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
 protected:
     //
     // Common part of all ctors


@@ -126,7 +131,7 @@ protected:
                                 ) const;
 
     //
                                 ) const;
 
     //

-    // Translate wxWindows flags into OS flags
+    // Translate wxWidgets flags into OS flags

     //
     virtual WXDWORD OS2GetStyle( long     lFlag
                                 ,WXDWORD* pdwExstyle
     //
     virtual WXDWORD OS2GetStyle( long     lFlag
                                 ,WXDWORD* pdwExstyle


@@ -157,17 +162,16 @@ protected:
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
 
     bool                            m_bFsIsMaximized;
     bool                            m_bFsIsShowing;
 

+    wxWindow*                       m_pWinLastFocused;
+

     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
     static bool                     m_sbInitialized;
     static wxWindow*                m_spHiddenParent;
     WXHWND                          m_hFrame;
     SWP                             m_vSwp;
     SWP                             m_vSwpClient;
     static bool                     m_sbInitialized;
     static wxWindow*                m_spHiddenParent;

-}; // end of CLASS wxTopLevelWindowOS2

 
 

-//
-// List of all frames and modeless dialogs
-//
-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+    DECLARE_EVENT_TABLE()
+}; // end of CLASS wxTopLevelWindowOS2

 
 #endif // _WX_MSW_TOPLEVEL_H_
 
 
 #endif // _WX_MSW_TOPLEVEL_H_