Oups...

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

diff --git a/include/wx/os2/toplevel.h b/include/wx/os2/toplevel.h
index 2557c3981fbf398665b5f526f3c70baac7a5a9f5..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
                  };


@@ -67,6 +67,8 @@ public:
            virtual void Restore(void);
            virtual void SendSizeEvent(void);
            virtual void SetIcon(const wxIcon& rIcon);
            virtual void Restore(void);
            virtual void SendSizeEvent(void);
            virtual void SetIcon(const wxIcon& rIcon);

+           virtual void SetIcons(const wxIconBundle& rIcons);
+

            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow
                                        ,long lStyle = wxFULLSCREEN_ALL
            virtual bool Show(bool bShow = TRUE);
            virtual bool ShowFullScreen( bool bShow
                                        ,long lStyle = wxFULLSCREEN_ALL


@@ -83,12 +85,12 @@ public:
     // Implementation from now on
     // --------------------------
     //
     // Implementation from now on
     // --------------------------
     //

-           virtual void AlterChildPos(void); // OS/2 child control positioning
-           virtual void UpdateInternalSize( wxWindow* pChild
-                                           ,int       nWidth
-                                           ,int       nHeight
-                                          );

            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


@@ -129,12 +131,16 @@ protected:
                                 ) const;
 
     //
                                 ) const;
 
     //

-    // Get the OS/2 window flags corresponding to wxWindows ones
+    // Translate wxWidgets flags into OS flags
+    //
+    virtual WXDWORD OS2GetStyle( long     lFlag
+                                ,WXDWORD* pdwExstyle
+                               ) const;
+

     //
     //

-    // The functions returns the flags (WS_XXX) directly and puts the ext
-    // (WS_EX_XXX) flags into the provided pointer if not NULL
+    // Choose the right parent to use with CreateWindow()

     //
     //

-    long OS2GetCreateWindowFlags(long* lExflags) const;
+    virtual WXHWND  OS2GetParent(void) const;

 
     //
     // Is the frame currently iconized?
 
     //
     // Is the frame currently iconized?


@@ -156,16 +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;
     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_
 
 
 #endif // _WX_MSW_TOPLEVEL_H_