fixed huge memory leak in wxFileDialog (closes patch 544060)

[wxWidgets.git] / src / os2 / frame.cpp

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 9de5fdf513519bb39e8e8f4b031323c32ce19065..bca65d8c35883106f91329073c6f1010c5b2fb47 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -13,6 +13,15 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/defs.h"
+    #include "wx/object.h"
+    #include "wx/dynarray.h"
+    #include "wx/list.h"
+    #include "wx/hash.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/event.h"

     #include "wx/setup.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/setup.h"
     #include "wx/frame.h"
     #include "wx/menu.h"


@@ -21,6 +30,7 @@
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"
     #include "wx/dialog.h"
     #include "wx/settings.h"
     #include "wx/dcclient.h"

+    #include "wx/mdi.h"

 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"
 #endif // WX_PRECOMP
 
 #include "wx/os2/private.h"


@@ -43,8 +53,14 @@
 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;
 
 extern wxWindowList wxModelessWindows;
 extern wxList WXDLLEXPORT wxPendingDelete;

-extern wxChar wxFrameClassName[];
+
+#if wxUSE_MENUS_NATIVE

 extern wxMenu *wxCurrentPopupMenu;
 extern wxMenu *wxCurrentPopupMenu;

+#endif
+
+extern void  wxAssociateWinWithHandle( HWND         hWnd
+                                      ,wxWindowOS2* pWin
+                                     );

 
 // ----------------------------------------------------------------------------
 // event tables
 
 // ----------------------------------------------------------------------------
 // event tables


@@ -64,6 +80,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 // ----------------------------------------------------------------------------
 // static class members
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static class members
 // ----------------------------------------------------------------------------

+#if wxUSE_STATUSBAR

 
 #if wxUSE_NATIVE_STATUSBAR
     bool wxFrame::m_bUseNativeStatusBar = TRUE;
 
 #if wxUSE_NATIVE_STATUSBAR
     bool wxFrame::m_bUseNativeStatusBar = TRUE;


@@ -71,39 +88,41 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
     bool wxFrame::m_bUseNativeStatusBar = FALSE;
 #endif
 
     bool wxFrame::m_bUseNativeStatusBar = FALSE;
 #endif
 

+#endif //wxUSE_STATUSBAR
+

 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 void wxFrame::Init()
 {
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 void wxFrame::Init()
 {

-    m_bIconized = FALSE;
-
-#if wxUSE_TOOLTIPS
-    m_hWndToolTip = 0;
-#endif
-    // Data to save/restore when calling ShowFullScreen
-    m_lFsStyle           = 0L;
-    m_lFsOldWindowStyle  = 0L;

     m_nFsStatusBarFields = 0;
     m_nFsStatusBarHeight = 0;
     m_nFsToolBarHeight   = 0;
     m_nFsStatusBarFields = 0;
     m_nFsStatusBarHeight = 0;
     m_nFsToolBarHeight   = 0;

-    m_bFsIsMaximized     = FALSE;
-    m_bFsIsShowing       = FALSE;
-    m_bIsShown           = FALSE;
-    m_pWinLastFocused    = (wxWindow *)NULL;
+    m_hWndToolTip        = 0L;
+    m_bWasMinimized      = FALSE;
+    m_pWinLastFocused    = NULL;
+
+
+    m_frameMenuBar   = NULL;
+    m_frameToolBar   = NULL;
+    m_frameStatusBar = NULL;
+
+    m_hTitleBar = NULLHANDLE;
+    m_hHScroll  = NULLHANDLE;
+    m_hVScroll  = NULLHANDLE;

 
     //
     // Initialize SWP's
     //
 
     //
     // Initialize SWP's
     //

-    memset(&m_vSwp, 0, sizeof(SWP));
-    memset(&m_vSwpClient, 0, sizeof(SWP));

     memset(&m_vSwpTitleBar, 0, sizeof(SWP));
     memset(&m_vSwpMenuBar, 0, sizeof(SWP));
     memset(&m_vSwpHScroll, 0, sizeof(SWP));
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));
     memset(&m_vSwpTitleBar, 0, sizeof(SWP));
     memset(&m_vSwpMenuBar, 0, sizeof(SWP));
     memset(&m_vSwpHScroll, 0, sizeof(SWP));
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));

+    m_bIconized = FALSE;
+

 } // end of wxFrame::Init
 
 bool wxFrame::Create(
 } // end of wxFrame::Init
 
 bool wxFrame::Create(


@@ -112,51 +131,19 @@ bool wxFrame::Create(
 , const wxString&                   rsTitle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , const wxString&                   rsTitle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize

-, long                              lulStyle
+, long                              lStyle

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {

-    int                             nX      = rPos.x;
-    int                             nY      = rPos.y;
-    int                             nWidth  = rSize.x;
-    int                             nHeight = rSize.y;
-
-    SetName(rsName);
-    m_windowStyle    = lulStyle;
-    m_frameMenuBar   = NULL;
-    m_frameToolBar   = NULL;
-    m_frameStatusBar = NULL;
-
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
-    if (vId > -1 )
-        m_windowId = vId;
-    else
-        m_windowId = (int)NewControlId();
-
-    if (pParent)
-        pParent->AddChild(this);
-
-    m_bIconized = FALSE;
-
-    if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
-        pParent = NULL;
-
-    if (!pParent)
-        wxTopLevelWindows.Append(this);
-
-    OS2Create( m_windowId
-              ,pParent
-              ,wxFrameClassName
-              ,this
-              ,rsTitle
-              ,nX
-              ,nY
-              ,nWidth
-              ,nHeight
-              ,lulStyle
-             );
-
+    if (!wxTopLevelWindow::Create( pParent
+                                  ,vId
+                                  ,rsTitle
+                                  ,rPos
+                                  ,rSize
+                                  ,lStyle
+                                  ,rsName
+                                 ))
+        return FALSE;

     wxModelessWindows.Append(this);
     return TRUE;
 } // end of wxFrame::Create
     wxModelessWindows.Append(this);
     return TRUE;
 } // end of wxFrame::Create


@@ -164,45 +151,7 @@ bool wxFrame::Create(
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

-
-    wxTopLevelWindows.DeleteObject(this);
-

     DeleteAllBars();
     DeleteAllBars();

-
-    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-    {
-        wxTheApp->SetTopWindow(NULL);
-
-        if (wxTheApp->GetExitOnFrameDelete())
-        {
-            ::WinPostMsg(NULL, WM_QUIT, 0, 0);
-        }
-    }
-
-    wxModelessWindows.DeleteObject(this);
-
-    //
-    // For some reason, wxWindows can activate another task altogether
-    // when a frame is destroyed after a modal dialog has been invoked.
-    // Try to bring the parent to the top.
-    //
-    // MT:Only do this if this frame is currently the active window, else weird
-    // things start to happen.
-    //
-    if (wxGetActiveWindow() == this)
-    {
-        if (GetParent() && GetParent()->GetHWND())
-        {
-            ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
-                              ,HWND_TOP
-                              ,0
-                              ,0
-                              ,0
-                              ,0
-                              ,SWP_ZORDER
-                             );
-        }
-    }

 } // end of wxFrame::~wxFrame
 
 //
 } // end of wxFrame::~wxFrame
 
 //


@@ -213,40 +162,15 @@ void wxFrame::DoGetClientSize(
 , int*                              pY
 ) const
 {
 , int*                              pY
 ) const
 {

+    wxTopLevelWindow::DoGetClientSize( pX
+                                      ,pY
+                                     );

     //
     //

-    // OS/2 PM's coordinates go from bottom-left not
-    // top-left thus the += instead of the -=
-    //
-    RECTL                           vRect;
-
-    //
-    // PM has no GetClientRect that inherantly knows about the client window
-    // We have to explicitly go fetch it!
+    // No need to use statusbar code as in WIN32 as the FORMATFRAME
+    // window procedure ensures PM knows about the new frame client
+    // size internally.  A ::WinQueryWindowRect (that is called in
+    // wxWindow's GetClient size from above) is all that is needed!

     //
     //

-    ::WinQueryWindowRect(GetHwnd(), &vRect);
-
-#if wxUSE_STATUSBAR
-    if ( GetStatusBar() )
-    {
-        int                         nStatusX;
-        int                         nStatusY;
-
-        GetStatusBar()->GetClientSize( &nStatusX
-                                      ,&nStatusY
-                                     );
-        vRect.yBottom += nStatusY;
-    }
-#endif // wxUSE_STATUSBAR
-
-    wxPoint                         vPoint(GetClientAreaOrigin());
-
-    vRect.yBottom += vPoint.y;
-    vRect.xRight -= vPoint.x;
-
-    if (pX)
-        *pX = vRect.xRight;
-    if (pY)
-        *pY = vRect.yBottom;

 } // end of wxFrame::DoGetClientSize
 
 //
 } // end of wxFrame::DoGetClientSize
 
 //


@@ -258,212 +182,33 @@ void wxFrame::DoSetClientSize(
 , int                               nHeight
 )
 {
 , int                               nHeight
 )
 {

-    HWND                            hWnd = GetHwnd();
-    RECTL                           vRect;
-    RECTL                           vRect2;
-
-    ::WinQueryWindowRect(GetHwnd(), &vRect);
-
-    ::WinQueryWindowRect(GetHWND(), &vRect2);
+    wxStatusBar*                    pStatusBar = GetStatusBar();

 
     //
 
     //

-    // Find the difference between the entire window (title bar and all)
-    // and the client area; add this to the new client size to move the
-    // window.  Remember OS/2's backwards y coord system!
+    // Statusbars are not part of the OS/2 Client but parent frame
+    // so no statusbar consideration

     //
     //

-    int                             nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth;
-    int                             nActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight;
-
-#if wxUSE_STATUSBAR
-    if ( GetStatusBar() )
-    {
-        int                         nStatusX;
-        int                         nStatusY;
-
-        GetStatusBar()->GetClientSize( &nStatusX
-                                      ,&nStatusY
+    wxTopLevelWindow::DoSetClientSize( nWidth
+                                      ,nHeight

                                      );
                                      );

-        nActualHeight += nStatusY;
-    }
-#endif // wxUSE_STATUSBAR
-
-    wxPoint                         vPoint(GetClientAreaOrigin());
-    nActualWidth  += vPoint.y;
-    nActualHeight += vPoint.x;
-
-    POINTL                          vPointl;
-
-    vPointl.x = vRect2.xLeft;
-    vPointl.y  = vRect2.yTop;
-
-    ::WinSetWindowPos( hWnd
-                      ,HWND_TOP
-                      ,vPointl.x
-                      ,vPointl.y
-                      ,nActualWidth
-                      ,nActualHeight
-                      ,SWP_MOVE | SWP_SIZE | SWP_SHOW
-                     );
-
-    wxSizeEvent                     vEvent( wxSize( nWidth
-                                                   ,nHeight
-                                                  )
-                                           ,m_windowId
-                                          );
-    vEvent.SetEventObject(this);
-    GetEventHandler()->ProcessEvent(vEvent);

 } // end of wxFrame::DoSetClientSize
 
 } // end of wxFrame::DoSetClientSize
 

-void wxFrame::DoGetSize(
-  int*                              pWidth
-, int*                              pHeight
-) const
-{
-    RECTL                           vRect;
-
-    ::WinQueryWindowRect(GetHWND(), &vRect);
-    *pWidth = vRect.xRight - vRect.xLeft;
-    *pHeight = vRect.yTop - vRect.yBottom;
-} // end of wxFrame::DoGetSize
-
-void wxFrame::DoGetPosition(
-  int*                              pX
-, int*                              pY
-) const
-{
-    RECTL                           vRect;
-    POINTL                          vPoint;
-
-    ::WinQueryWindowRect(GetHWND(), &vRect);
-    vPoint.x = vRect.xLeft;
-
-    //
-    // OS/2 is backwards [WIN32 it is vRect.yTop]
-    //
-    vPoint.y = vRect.yBottom;
-
-    *pX = vPoint.x;
-    *pY = vPoint.y;
-} // end of wxFrame::DoGetPosition
-

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// variations around ::ShowWindow()
+// wxFrame: various geometry-related functions

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxFrame::DoShowWindow(
-  int                               bShowCmd
-)
-{
-    ::WinShowWindow(GetHWND(), (BOOL)bShowCmd);
-    m_bIconized = bShowCmd == SWP_MINIMIZE;
-} // end of wxFrame::DoShowWindow
-
-bool wxFrame::Show(
-  bool                              bShow
-)
-{
-    SWP                             vSwp;
-
-    DoShowWindow((int)bShow);
-
-    if (bShow)
-    {
-        wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
-
-        ::WinQueryWindowPos(GetHWND(), &vSwp);
-        m_bIconized = vSwp.fl & SWP_MINIMIZE;
-        ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
-        ::WinEnableWindow(GetHWND(), TRUE);
-        vEvent.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(vEvent);
-    }
-    else
-    {
-        //
-        // Try to highlight the correct window (the parent)
-        //
-        if (GetParent())
-        {
-            HWND                    hWndParent = GetHwndOf(GetParent());
-
-            ::WinQueryWindowPos(hWndParent, &vSwp);
-            m_bIconized = vSwp.fl & SWP_MINIMIZE;
-            if (hWndParent)
-                ::WinSetWindowPos( hWndParent
-                                  ,HWND_TOP
-                                  ,vSwp.x
-                                  ,vSwp.y
-                                  ,vSwp.cx
-                                  ,vSwp.cy
-                                  ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE
-                                 );
-            ::WinEnableWindow(hWndParent, TRUE);
-        }
-    }
-    return TRUE;
-} // end of wxFrame::Show
-
-void wxFrame::Iconize(
-  bool                              bIconize
-)
-{
-    DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
-} // end of wxFrame::Iconize
-
-void wxFrame::Maximize(
-  bool                              bMaximize)
+void wxFrame::Raise()

 {
 {

-    DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
-} // end of wxFrame::Maximize
-
-void wxFrame::Restore()
-{
-    DoShowWindow(SWP_RESTORE);
-} // end of wxFrame::Restore
-
-bool wxFrame::IsIconized() const
-{
-    SWP                             vSwp;
-
-    ::WinQueryWindowPos(GetHwnd(), &vSwp);
-
-    if (vSwp.fl & SWP_MINIMIZE)
-        ((wxFrame*)this)->m_bIconized = TRUE;
-    else
-        ((wxFrame*)this)->m_bIconized = FALSE;
-    return m_bIconized;
-} // end of wxFrame::IsIconized
-
-// Is it maximized?
-bool wxFrame::IsMaximized() const
-{
-    SWP                             vSwp;
-    bool                            bIconic;
-
-    ::WinQueryWindowPos(GetHWND(), &vSwp);
-    return (vSwp.fl & SWP_MAXIMIZE);
-} // end of wxFrame::IsMaximized
-
-void wxFrame::SetIcon(
-  const wxIcon&                     rIcon
-)
-{
-    wxFrameBase::SetIcon(rIcon);
-
-    if ((m_icon.GetHICON()) != NULLHANDLE)
-    {
-        ::WinSendMsg( GetHWND()
-                     ,WM_SETICON
-                     ,(MPARAM)((HPOINTER)m_icon.GetHICON())
-                     ,NULL
-                    );
-        ::WinSendMsg( GetHWND()
-                     ,WM_UPDATEFRAME
-                     ,(MPARAM)FCF_ICON
-                     ,(MPARAM)0
-                    );
-    }
-} // end of wxFrame::SetIcon
+    wxFrameBase::Raise();
+    ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                      ,HWND_TOP
+                      ,0
+                      ,0
+                      ,0
+                      ,0
+                      ,SWP_ZORDER
+                     );
+}

 
 #if wxUSE_STATUSBAR
 wxStatusBar* wxFrame::OnCreateStatusBar(
 
 #if wxUSE_STATUSBAR
 wxStatusBar* wxFrame::OnCreateStatusBar(


@@ -487,12 +232,39 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
     if( !pStatusBar )
         return NULL;
 
     if( !pStatusBar )
         return NULL;
 

-    // 
+    wxClientDC                      vDC(pStatusBar);
+    int                             nY;
+
+    //
+    // Set the height according to the font and the border size
+    //
+    vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason
+    vDC.GetTextExtent( "X"
+                      ,NULL
+                      ,&nY
+                     );
+
+    int                             nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY());
+
+    pStatusBar->SetSize( -1
+                        ,-1
+                        ,-1
+                        ,nHeight
+                       );
+
+    ::WinSetParent( pStatusBar->GetHWND()
+                   ,m_hFrame
+                   ,FALSE
+                  );
+    ::WinSetOwner( pStatusBar->GetHWND()
+                  ,m_hFrame
+                 );
+    //

     // to show statusbar
     //
     // to show statusbar
     //

-    if( ::WinIsWindowShowing(GetHWND()) )
-        ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
-    
+    if(::WinIsWindowShowing(m_hFrame))
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+

     return pStatusBar;
 } // end of wxFrame::OnCreateStatusBar
 
     return pStatusBar;
 } // end of wxFrame::OnCreateStatusBar
 


@@ -508,26 +280,32 @@ void wxFrame::PositionStatusBar()
     if (m_frameStatusBar)
     {
         int                         nWidth;
     if (m_frameStatusBar)
     {
         int                         nWidth;

-        int                         nHeight;
+        int                         nY;

         int                         nStatbarWidth;
         int                         nStatbarHeight;
         HWND                        hWndClient;
         RECTL                       vRect;
         int                         nStatbarWidth;
         int                         nStatbarHeight;
         HWND                        hWndClient;
         RECTL                       vRect;

+        RECTL                       vFRect;

 
 

-        ::WinQueryWindowRect(GetHwnd(), &vRect);
+        ::WinQueryWindowRect(m_hFrame, &vRect);
+        nY = vRect.yTop;
+        ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+        vFRect = vRect;
+        ::WinCalcFrameRect(m_hFrame, &vRect, TRUE);

         nWidth = vRect.xRight - vRect.xLeft;
         nWidth = vRect.xRight - vRect.xLeft;

-        nHeight = vRect.yTop - vRect.yBottom;
+        nY = nY - (vRect.yBottom - vFRect.yBottom);

 
         m_frameStatusBar->GetSize( &nStatbarWidth
                                   ,&nStatbarHeight
                                  );
 
 
         m_frameStatusBar->GetSize( &nStatbarWidth
                                   ,&nStatbarHeight
                                  );
 

+        nY= nY - nStatbarHeight;

         //
         // Since we wish the status bar to be directly under the client area,
         // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
         //
         //
         // Since we wish the status bar to be directly under the client area,
         // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
         //

-        m_frameStatusBar->SetSize( 0
-                                  ,nHeight
+        m_frameStatusBar->SetSize( vRect.xLeft - vFRect.xLeft
+                                  ,nY

                                   ,nWidth
                                   ,nStatbarHeight
                                  );
                                   ,nWidth
                                   ,nStatbarHeight
                                  );


@@ -535,27 +313,14 @@ void wxFrame::PositionStatusBar()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

-            wxLogError("Error setting parent for submenu. Error: %s\n", sError);
-            return;
-        }
-        if (!::WinSetWindowPos( m_frameStatusBar->GetHWND()
-                               ,HWND_TOP
-                               ,vSwp.x
-                               ,vSwp.y
-                               ,nStatbarWidth
-                               ,nStatbarHeight
-                               ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER
-                              ))
-        {
-            vError = ::WinGetLastError(vHabmain);
-            sError = wxPMErrorToStr(vError);
-            wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+            wxLogError("Error setting parent for StautsBar. Error: %s\n", sError);

             return;
         }
     }
 } // end of wxFrame::PositionStatusBar
 #endif // wxUSE_STATUSBAR
 
             return;
         }
     }
 } // end of wxFrame::PositionStatusBar
 #endif // wxUSE_STATUSBAR
 

+#if wxUSE_MENUS_NATIVE

 void wxFrame::DetachMenuBar()
 {
     if (m_frameMenuBar)
 void wxFrame::DetachMenuBar()
 {
     if (m_frameMenuBar)


@@ -571,8 +336,6 @@ void wxFrame::SetMenuBar(
 {
     ERRORID                         vError;
     wxString                        sError;
 {
     ERRORID                         vError;
     wxString                        sError;

-    HWND                            hClient = NULLHANDLE;
-    HWND                            hFrame = NULLHANDLE;

     HWND                            hTitlebar = NULLHANDLE;
     HWND                            hHScroll = NULLHANDLE;
     HWND                            hVScroll = NULLHANDLE;
     HWND                            hTitlebar = NULLHANDLE;
     HWND                            hHScroll = NULLHANDLE;
     HWND                            hVScroll = NULLHANDLE;


@@ -616,31 +379,49 @@ void wxFrame::SetMenuBar(
         }
         InternalSetMenuBar();
         m_frameMenuBar = pMenuBar;
         }
         InternalSetMenuBar();
         m_frameMenuBar = pMenuBar;

-        pMenuBar->Attach(this);
+        pMenuBar->Attach((wxFrame*)this);

     }
     }

-
-    //
-    // Now resize the client to fit the new frame
-    //
-    WinQueryWindowPos(GetHWND(), &vSwp);
-    hTitlebar = WinWindowFromID(GetHWND(), FID_TITLEBAR);
-    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
-    hHScroll = WinWindowFromID(GetHWND(), FID_HORZSCROLL);
-    WinQueryWindowPos(hHScroll, &vSwpHScroll);
-    hVScroll = WinWindowFromID(GetHWND(), FID_VERTSCROLL);
-    WinQueryWindowPos(hVScroll, &vSwpVScroll);
-    hMenuBar = WinWindowFromID(GetHWND(), FID_MENU);
-    WinQueryWindowPos(hMenuBar, &vSwpMenu);
-    WinSetWindowPos( GetHwnd()
-                    ,HWND_TOP
-                    ,SV_CXSIZEBORDER/2
-                    ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2
-                    ,vSwp.cx - ((SV_CXSIZEBORDER + 1) + vSwpVScroll.cx)
-                    ,vSwp.cy - ((SV_CYSIZEBORDER + 1) + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy/2)
-                    ,SWP_SIZE | SWP_MOVE
-                   );

 } // end of wxFrame::SetMenuBar
 
 } // end of wxFrame::SetMenuBar
 

+void wxFrame::AttachMenuBar(
+  wxMenuBar*                        pMenubar
+)
+{
+    wxFrameBase::AttachMenuBar(pMenubar);
+
+    m_frameMenuBar = pMenubar;
+
+    if (!pMenubar)
+    {
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();
+    }
+    else // Set new non NULL menu bar
+    {
+        //
+        // Can set a menubar several times.
+        //
+        if (pMenubar->GetHMenu())
+        {
+            m_hMenu = pMenubar->GetHMenu();
+        }
+        else
+        {
+            if (pMenubar->IsAttached())
+                pMenubar->Detach();
+
+            m_hMenu = pMenubar->Create();
+
+            if (!m_hMenu)
+                return;
+        }
+        InternalSetMenuBar();
+    }
+} // end of wxFrame::AttachMenuBar
+

 void wxFrame::InternalSetMenuBar()
 {
     ERRORID                         vError;
 void wxFrame::InternalSetMenuBar()
 {
     ERRORID                         vError;


@@ -648,21 +429,22 @@ void wxFrame::InternalSetMenuBar()
     //
     // Set the parent and owner of the menubar to be the frame
     //
     //
     // Set the parent and owner of the menubar to be the frame
     //

-    if (!::WinSetParent(m_hMenu, GetHWND(), FALSE))
+    if (!::WinSetParent(m_hMenu, m_hFrame, FALSE))

     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }
 
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }
 

-    if (!::WinSetOwner(m_hMenu, GetHWND()))
+    if (!::WinSetOwner(m_hMenu, m_hFrame))

     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }

-    WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+    ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

 } // end of wxFrame::InternalSetMenuBar
 } // end of wxFrame::InternalSetMenuBar

+#endif // wxUSE_MENUS_NATIVE

 
 //
 // Responds to colour changes, and passes event on to children
 
 //
 // Responds to colour changes, and passes event on to children


@@ -671,9 +453,10 @@ void wxFrame::OnSysColourChanged(
   wxSysColourChangedEvent&          rEvent
 )
 {
   wxSysColourChangedEvent&          rEvent
 )
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     Refresh();
 
     Refresh();
 

+#if wxUSE_STATUSBAR

     if (m_frameStatusBar)
     {
         wxSysColourChangedEvent     vEvent2;
     if (m_frameStatusBar)
     {
         wxSysColourChangedEvent     vEvent2;


@@ -681,6 +464,7 @@ void wxFrame::OnSysColourChanged(
         vEvent2.SetEventObject(m_frameStatusBar);
         m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
     }
         vEvent2.SetEventObject(m_frameStatusBar);
         m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
     }

+#endif //wxUSE_STATUSBAR

 
     //
     // Propagate the event to the non-top-level children
 
     //
     // Propagate the event to the non-top-level children


@@ -702,16 +486,27 @@ bool wxFrame::ShowFullScreen(
         m_bFsIsShowing = TRUE;
         m_lFsStyle = lStyle;
 
         m_bFsIsShowing = TRUE;
         m_lFsStyle = lStyle;
 

-           wxToolBar*                  pTheToolBar = GetToolBar();
-           wxStatusBar*                pTheStatusBar = GetStatusBar();
+#if wxUSE_TOOLBAR
+        wxToolBar*                  pTheToolBar = GetToolBar();
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+        wxStatusBar*                pTheStatusBar = GetStatusBar();
+#endif //wxUSE_STATUSBAR

 
         int                         nDummyWidth;
 
 
         int                         nDummyWidth;
 

+#if wxUSE_TOOLBAR

         if (pTheToolBar)
             pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
         if (pTheToolBar)
             pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);

+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR

         if (pTheStatusBar)
             pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
         if (pTheStatusBar)
             pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);

+#endif //wxUSE_STATUSBAR

 
 

+#if wxUSE_TOOLBAR

         //
         // Zap the toolbar, menubar, and statusbar
         //
         //
         // Zap the toolbar, menubar, and statusbar
         //


@@ -720,14 +515,16 @@ bool wxFrame::ShowFullScreen(
             pTheToolBar->SetSize(-1,0);
             pTheToolBar->Show(FALSE);
         }
             pTheToolBar->SetSize(-1,0);
             pTheToolBar->Show(FALSE);
         }

+#endif //wxUSE_TOOLBAR

 
         if (lStyle & wxFULLSCREEN_NOMENUBAR)
         {
 
         if (lStyle & wxFULLSCREEN_NOMENUBAR)
         {

-            ::WinSetParent(m_hMenu, GetHWND(), FALSE);
-            ::WinSetOwner(m_hMenu, GetHWND());
-            ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+            ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+            ::WinSetOwner(m_hMenu, m_hFrame);
+            ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

         }
 
         }
 

+#if wxUSE_STATUSBAR

         //
         // Save the number of fields in the statusbar
         //
         //
         // Save the number of fields in the statusbar
         //


@@ -739,6 +536,7 @@ bool wxFrame::ShowFullScreen(
         }
         else
             m_nFsStatusBarFields = 0;
         }
         else
             m_nFsStatusBarFields = 0;

+#endif //wxUSE_STATUSBAR

 
         //
         // Zap the frame borders
 
         //
         // Zap the frame borders


@@ -747,16 +545,16 @@ bool wxFrame::ShowFullScreen(
         //
         // Save the 'normal' window style
         //
         //
         // Save the 'normal' window style
         //

-        m_lFsOldWindowStyle = ::WinQueryWindowULong((HWND)GetHWND(), QWL_STYLE);
+        m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE);

 
         //
 
         //

-           // Save the old position, width & height, maximize state
+        // Save the old position, width & height, maximize state

         //
         m_vFsOldSize = GetRect();
         m_bFsIsMaximized = IsMaximized();
 
         //
         //
         m_vFsOldSize = GetRect();
         m_bFsIsMaximized = IsMaximized();
 
         //

-            // Decide which window style flags to turn off
+        // Decide which window style flags to turn off

         //
         LONG                        lNewStyle = m_lFsOldWindowStyle;
         LONG                        lOffFlags = 0;
         //
         LONG                        lNewStyle = m_lFsOldWindowStyle;
         LONG                        lOffFlags = 0;


@@ -771,7 +569,7 @@ bool wxFrame::ShowFullScreen(
         //
         // Change our window style to be compatible with full-screen mode
         //
         //
         // Change our window style to be compatible with full-screen mode
         //

-        ::WinSetWindowULong((HWND)GetHWND(), QWL_STYLE, (ULONG)lNewStyle);
+        ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle);

 
         //
         // Resize to the size of the desktop
 
         //
         // Resize to the size of the desktop


@@ -819,6 +617,7 @@ bool wxFrame::ShowFullScreen(
 
         m_bFsIsShowing = FALSE;
 
 
         m_bFsIsShowing = FALSE;
 

+#if wxUSE_TOOLBAR

         wxToolBar*                  pTheToolBar = GetToolBar();
 
         //
         wxToolBar*                  pTheToolBar = GetToolBar();
 
         //


@@ -829,22 +628,25 @@ bool wxFrame::ShowFullScreen(
             pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
             pTheToolBar->Show(TRUE);
         }
             pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
             pTheToolBar->Show(TRUE);
         }

+#endif //wxUSE_TOOLBAR

 
 

+#if wxUSE_STATUSBAR

         if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
         {
             CreateStatusBar(m_nFsStatusBarFields);
 //          PositionStatusBar();
         }
         if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
         {
             CreateStatusBar(m_nFsStatusBarFields);
 //          PositionStatusBar();
         }

+#endif //wxUSE_STATUSBAR

 
         if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
         {
 
         if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
         {

-            ::WinSetParent(m_hMenu, GetHWND(), FALSE);
-            ::WinSetOwner(m_hMenu, GetHWND());
-            ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+            ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+            ::WinSetOwner(m_hMenu, m_hFrame);
+            ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

         }
         Maximize(m_bFsIsMaximized);
 
         }
         Maximize(m_bFsIsMaximized);
 

-        ::WinSetWindowULong( (HWND)GetHWND()
+        ::WinSetWindowULong( m_hFrame

                             ,QWL_STYLE
                             ,(ULONG)m_lFsOldWindowStyle
                            );
                             ,QWL_STYLE
                             ,(ULONG)m_lFsOldWindowStyle
                            );


@@ -863,157 +665,6 @@ bool wxFrame::ShowFullScreen(
 //
 // Frame window
 //
 //
 // Frame window
 //

-bool wxFrame::OS2Create(
-  int                               nId
-, wxWindow*                         pParent
-, const wxChar*                     zWclass
-, wxWindow*                         pWxWin
-, const wxChar*                     zTitle
-, int                               nX
-, int                               nY
-, int                               nWidth
-, int                               nHeight
-, long                              ulStyle
-)
-{
-    ULONG                           ulCreateFlags = 0L;
-    ULONG                           ulStyleFlags = 0L;
-    ULONG                           ulExtraFlags = 0L;
-    FRAMECDATA                      vFrameCtlData;
-    HWND                            hParent = NULLHANDLE;
-    HWND                            hClient = NULLHANDLE;
-    HWND                            hFrame = NULLHANDLE;
-    HWND                            hTitlebar = NULLHANDLE;
-    HWND                            hHScroll = NULLHANDLE;
-    HWND                            hVScroll = NULLHANDLE;
-    SWP                             vSwp[10];
-    RECTL                           vRect[10];
-    USHORT                          uCtlCount;
-
-    m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-
-    if (pParent)
-        hParent = GetWinHwnd(pParent);
-    else
-        hParent = HWND_DESKTOP;
-
-    if (ulStyle == wxDEFAULT_FRAME_STYLE)
-        ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
-                        FCF_MINMAX | FCF_TASKLIST;
-    else
-    {
-        if ((ulStyle & wxCAPTION) == wxCAPTION)
-            ulCreateFlags = FCF_TASKLIST;
-        else
-            ulCreateFlags = FCF_NOMOVEWITHOWNER;
-
-        if ((ulStyle & wxVSCROLL) == wxVSCROLL)
-            ulCreateFlags |= FCF_VERTSCROLL;
-        if ((ulStyle & wxHSCROLL) == wxHSCROLL)
-            ulCreateFlags |= FCF_HORZSCROLL;
-        if (ulStyle & wxMINIMIZE_BOX)
-            ulCreateFlags |= FCF_MINBUTTON;
-        if (ulStyle & wxMAXIMIZE_BOX)
-            ulCreateFlags |= FCF_MAXBUTTON;
-        if (ulStyle & wxTHICK_FRAME)
-            ulCreateFlags |= FCF_DLGBORDER;
-        if (ulStyle & wxSYSTEM_MENU)
-            ulCreateFlags |= FCF_SYSMENU;
-        if (ulStyle & wxCAPTION)
-            ulCreateFlags |= FCF_TASKLIST;
-        if (ulStyle & wxCLIP_CHILDREN)
-        {
-            // Invalid for frame windows under PM
-        }
-
-        if (ulStyle & wxTINY_CAPTION_VERT)
-            ulCreateFlags |= FCF_TASKLIST;
-        if (ulStyle & wxTINY_CAPTION_HORIZ)
-            ulCreateFlags |= FCF_TASKLIST;
-
-        if ((ulStyle & wxTHICK_FRAME) == 0)
-            ulCreateFlags |= FCF_BORDER;
-        if (ulStyle & wxFRAME_TOOL_WINDOW)
-            ulExtraFlags = kFrameToolWindow;
-
-        if (ulStyle & wxSTAY_ON_TOP)
-            ulCreateFlags |= FCF_SYSMODAL;
-    }
-    if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
-        ulStyleFlags |= WS_MINIMIZED;
-    if (ulStyle & wxMAXIMIZE)
-        ulStyleFlags |= WS_MAXIMIZED;
-
-    //
-    // Clear the visible flag, we always call show
-    //
-    ulStyleFlags &= (unsigned long)~WS_VISIBLE;
-    m_bIconized = FALSE;
-
-    //
-    // Set the frame control block
-    //
-    vFrameCtlData.cb            = sizeof(vFrameCtlData);
-    vFrameCtlData.flCreateFlags = ulCreateFlags;
-    vFrameCtlData.hmodResources = 0L;
-    vFrameCtlData.idResources   = 0;
-
-    //
-    // Create the frame window
-    //
-
-    if (!wxWindow::OS2Create( hParent
-                             ,WC_FRAME
-                             ,(PSZ)zTitle
-                             ,0
-                             ,0, 0, 0, 0
-                             ,NULLHANDLE
-                             ,HWND_TOP
-                             ,(ULONG)nId
-                             ,(PVOID)&vFrameCtlData
-                             ,NULL
-                            ))
-    {
-        return FALSE;
-    }
-
-    // 
-    // Now need to subclass window.
-    //
-
-  //SubclassWin(GetHWND());
-
-//  ::WinCreateWindow(GetHWND(), WC_LISTBOX, "", WS_VISIBLE, 0, 0,
-//                    0, 0, GetHWND(), HWND_TOP, FID_CLIENT, NULL, NULL);
-    //
-    // Now size everything.  If adding a menu the client will need to be resized.
-    //
-
-    if (!::WinSetWindowPos( GetHWND()
-                           ,HWND_TOP
-                           ,nX
-                           ,nY
-                           ,nWidth
-                           ,nHeight
-                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
-                          ))
-        return FALSE;
-/*
-    uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
-    for (int i = 0; i < uCtlCount; i++)
-    {
-        if (vSwp[i].hwnd == GetHWND())
-            memcpy(&m_vSwp, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hVScroll)
-            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hHScroll)
-            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hTitleBar)
-            memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
-    }*/
-    return TRUE;
-} // end of wxFrame::OS2Create
-

 //
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 //
 // Default activation behaviour - set the focus for the first child
 // subwindow found.


@@ -1022,27 +673,51 @@ void wxFrame::OnActivate(
   wxActivateEvent&                  rEvent
 )
 {
   wxActivateEvent&                  rEvent
 )
 {

-    for (wxWindowList::Node* pNode = GetChildren().GetFirst();
-         pNode;
-         pNode = pNode->GetNext())
+    if ( rEvent.GetActive() )
+    {
+        // restore focus to the child which was last focused
+        wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
+
+        wxWindow*                           pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
+                                            : NULL;
+        if (!pParent)
+        {
+            pParent = this;
+        }
+
+        wxSetFocusToChild( pParent
+                          ,&m_pWinLastFocused
+                         );
+    }
+    else // deactivating

     {
     {

-        // FIXME all this is totally bogus - we need to do the same as wxPanel,
-        //       but how to do it without duplicating the code?
+        //
+        // Remember the last focused child if it is our child
+        //
+        m_pWinLastFocused = FindFocus();

 
 

-        // restore focus
-        wxWindow*                   pChild = pNode->GetData();
+        for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+             pNode;
+             pNode = pNode->GetNext())
+        {
+            // FIXME all this is totally bogus - we need to do the same as wxPanel,
+            //       but how to do it without duplicating the code?

 
 

-        if (!pChild->IsTopLevel()
+            // restore focus
+            wxWindow*                   pChild = pNode->GetData();
+
+            if (!pChild->IsTopLevel()

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-             && !wxDynamicCast(pChild, wxToolBar)
+                 && !wxDynamicCast(pChild, wxToolBar)

 #endif // wxUSE_TOOLBAR
 #if wxUSE_STATUSBAR
 #endif // wxUSE_TOOLBAR
 #if wxUSE_STATUSBAR

-             && !wxDynamicCast(pChild, wxStatusBar)
+                 && !wxDynamicCast(pChild, wxStatusBar)

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

-           )
-        {
-            pChild->SetFocus();
-            return;
+               )
+            {
+                pChild->SetFocus();
+                return;
+            }

         }
     }
 } // end of wxFrame::OnActivate
         }
     }
 } // end of wxFrame::OnActivate


@@ -1058,6 +733,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint                         vPoint(0, 0);
 
 {
     wxPoint                         vPoint(0, 0);
 

+#if wxUSE_TOOLBAR

     if (GetToolBar())
     {
         int                         nWidth;
     if (GetToolBar())
     {
         int                         nWidth;


@@ -1077,6 +753,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
             vPoint.y += nHeight;
         }
     }
             vPoint.y += nHeight;
         }
     }

+#endif //wxUSE_TOOLBAR

     return vPoint;
 } // end of wxFrame::GetClientAreaOrigin
 
     return vPoint;
 } // end of wxFrame::GetClientAreaOrigin
 


@@ -1123,12 +800,12 @@ void wxFrame::PositionToolBar()
     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

-    if ( GetToolBar() )
+    if ( m_frameToolBar )

     {
         int                         nToolbarWidth;
         int                         nToolbarHeight;
 
     {
         int                         nToolbarWidth;
         int                         nToolbarHeight;
 

-        GetToolBar()->GetSize( &nToolbarWidth
+        m_frameToolBar->GetSize( &nToolbarWidth

                               ,&nToolbarHeight
                              );
 
                               ,&nToolbarHeight
                              );
 


@@ -1172,14 +849,39 @@ void wxFrame::IconizeChildFrames(
          pNode = pNode->GetNext() )
     {
         wxWindow*                   pWin = pNode->GetData();
          pNode = pNode->GetNext() )
     {
         wxWindow*                   pWin = pNode->GetData();

+        wxFrame*                    pFrame = wxDynamicCast(pWin, wxFrame);

 
 

-        if (pWin->IsKindOf(CLASSINFO(wxFrame)) )
+        if ( pFrame
+#if wxUSE_MDI_ARCHITECTURE
+                && !wxDynamicCast(pFrame, wxMDIChildFrame)
+#endif // wxUSE_MDI_ARCHITECTURE
+           )

         {
         {

-            ((wxFrame *)pWin)->Iconize(bIconize);
+            //
+            // We don't want to restore the child frames which had been
+            // iconized even before we were iconized, so save the child frame
+            // status when iconizing the parent frame and check it when
+            // restoring it.
+            //
+            if (bIconize)
+            {
+                pFrame->m_bWasMinimized = pFrame->IsIconized();
+            }
+
+            //
+            // This test works for both iconizing and restoring
+            //
+            if (!pFrame->m_bWasMinimized)
+                pFrame->Iconize(bIconize);

         }
     }
 } // end of wxFrame::IconizeChildFrames
 
         }
     }
 } // end of wxFrame::IconizeChildFrames
 

+WXHICON wxFrame::GetDefaultIcon() const
+{
+    return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON
+                                      : wxDEFAULT_FRAME_ICON);
+}

 // ===========================================================================
 // message processing
 // ===========================================================================
 // ===========================================================================
 // message processing
 // ===========================================================================


@@ -1196,11 +898,15 @@ bool wxFrame::OS2TranslateMessage(
     //
     wxMenuBar*                      pMenuBar = GetMenuBar();
 
     //
     wxMenuBar*                      pMenuBar = GetMenuBar();
 

-    if (!pMenuBar )
+    if (!pMenuBar)

         return FALSE;
 
         return FALSE;
 

+#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE

     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
     return rAcceleratorTable.Translate(GetHWND(), pMsg);
     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
     return rAcceleratorTable.Translate(GetHWND(), pMsg);

+#else
+    return FALSE;
+#endif //wxUSE_ACCEL

 } // end of wxFrame::OS2TranslateMessage
 
 // ---------------------------------------------------------------------------
 } // end of wxFrame::OS2TranslateMessage
 
 // ---------------------------------------------------------------------------


@@ -1217,10 +923,11 @@ bool wxFrame::HandlePaint()
             //
             // Icons in PM are the same as "pointers"
             //
             //
             // Icons in PM are the same as "pointers"
             //

+            const wxIcon&           vIcon = GetIcon();

             HPOINTER                hIcon;
 
             HPOINTER                hIcon;
 

-            if (m_icon.Ok())
-                hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
+            if (vIcon.Ok())
+                hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);

             else
                 hIcon = (HPOINTER)m_hDefaultIcon;
 
             else
                 hIcon = (HPOINTER)m_hDefaultIcon;
 


@@ -1255,15 +962,40 @@ bool wxFrame::HandlePaint()
         }
         else
         {
         }
         else
         {

-/*          DosBeep(500,500);
-            HPS                             hPS;
-            RECTL                           vRect;
-
-            hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
-            WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
-            WinEndPaint(hPS);*/
+            if (!wxWindow::HandlePaint())
+            {
+                HPS                     hPS;
+                RECTL                   vRect;

 
 

-            return wxWindow::HandlePaint();
+                hPS = ::WinBeginPaint( GetHwnd()
+                                      ,NULLHANDLE
+                                      ,&vRect
+                                     );
+                if(hPS)
+                {
+                    ::GpiCreateLogColorTable( hPS
+                                             ,0L
+                                             ,LCOLF_CONSECRGB
+                                             ,0L
+                                             ,(LONG)wxTheColourDatabase->m_nSize
+                                             ,(PLONG)wxTheColourDatabase->m_palTable
+                                            );
+                    ::GpiCreateLogColorTable( hPS
+                                             ,0L
+                                             ,LCOLF_RGB
+                                             ,0L
+                                             ,0L
+                                             ,NULL
+                                            );
+
+                    ::WinFillRect( hPS
+                                  ,&vRect
+                                  ,GetBackgroundColour().GetPixel()
+                                 );
+                   ::WinEndPaint(hPS);
+                }
+            }
+            return TRUE;

         }
     }
     else
         }
     }
     else


@@ -1296,6 +1028,7 @@ bool wxFrame::HandleSize(
             // restore all child frames too
             //
             IconizeChildFrames(FALSE);
             // restore all child frames too
             //
             IconizeChildFrames(FALSE);

+            (void)SendIconizeEvent(FALSE);

 
             //
             // fall through
 
             //
             // fall through


@@ -1310,6 +1043,7 @@ bool wxFrame::HandleSize(
             // Iconize all child frames too
             //
             IconizeChildFrames(TRUE);
             // Iconize all child frames too
             //
             IconizeChildFrames(TRUE);

+            (void)SendIconizeEvent();

             m_bIconized = TRUE;
             break;
     }
             m_bIconized = TRUE;
             break;
     }


@@ -1333,16 +1067,15 @@ bool wxFrame::HandleSize(
         }
 #endif // wxUSE_NATIVE_STATUSBAR
 
         }
 #endif // wxUSE_NATIVE_STATUSBAR
 

-//      PositionStatusBar();
+        PositionStatusBar();
+#if  wxUSE_TOOLBAR

         PositionToolBar();
         PositionToolBar();

-        wxSizeEvent                 vEvent( wxSize( nX
-                                                   ,nY
-                                                  )
-                                           ,m_windowId
-                                          );
+#endif // wxUSE_TOOLBAR

 
 

-        vEvent.SetEventObject(this);
-        bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+        bProcessed = wxWindow::HandleSize( nX
+                                          ,nY
+                                          ,nId
+                                         );

     }
     return bProcessed;
 } // end of wxFrame::HandleSize
     }
     return bProcessed;
 } // end of wxFrame::HandleSize


@@ -1371,6 +1104,7 @@ bool wxFrame::HandleCommand(
     //
     if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
     {
     //
     if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
     {

+#if wxUSE_MENUS_NATIVE

         if (wxCurrentPopupMenu)
         {
             wxMenu*                 pPopupMenu = wxCurrentPopupMenu;
         if (wxCurrentPopupMenu)
         {
             wxMenu*                 pPopupMenu = wxCurrentPopupMenu;


@@ -1380,7 +1114,9 @@ bool wxFrame::HandleCommand(
             return pPopupMenu->OS2Command( nCmd
                                           ,nId
                                          );
             return pPopupMenu->OS2Command( nCmd
                                           ,nId
                                          );

+            return TRUE;

         }
         }

+#endif

 
         if (ProcessCommand(nId))
         {
 
         if (ProcessCommand(nId))
         {


@@ -1396,36 +1132,12 @@ bool wxFrame::HandleMenuSelect(
 , WXHMENU                           hMenu
 )
 {
 , WXHMENU                           hMenu
 )
 {

-//    int                             nMenuItem;
-
-/*  This is wrong section according to IBM's documentation
-    if (nFlags == 0xFFFF && hMenu == 0)
-    {
-        //
-        // Menu was removed from screen
-        //
-        nMenuItem = -1;
-    }
-    else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR))
-    {
-        nMenuItem = nItem;
-    }
-    else
-    {
-        //
-        // Don't give hints for separators (doesn't make sense) nor for the
-        // items opening popup menus (they don't have them anyhow)
-        //
-        return FALSE;
-    }
-*/
-

     if( !nFlags )
     {
         MENUITEM mItem;
         MRESULT  rc;
 
     if( !nFlags )
     {
         MENUITEM mItem;
         MRESULT  rc;
 

-        rc = WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);
+        rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);

 
         if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR)))
         {
 
         if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR)))
         {


@@ -1439,8 +1151,138 @@ bool wxFrame::HandleMenuSelect(
 } // end of wxFrame::HandleMenuSelect
 
 // ---------------------------------------------------------------------------
 } // end of wxFrame::HandleMenuSelect
 
 // ---------------------------------------------------------------------------

-// the window proc for wxFrame
+// Main Frame window proc

 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------

+MRESULT EXPENTRY wxFrameMainWndProc(
+  HWND                              hWnd
+, ULONG                             ulMsg
+, MPARAM                            wParam
+, MPARAM                            lParam
+)
+{
+    MRESULT                         rc = (MRESULT)0;
+    bool                            bProcessed = FALSE;
+    wxFrame*                        pWnd  = NULL;
+
+    pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+    switch (ulMsg)
+    {
+        case WM_QUERYFRAMECTLCOUNT:
+            if(pWnd && pWnd->m_fnOldWndProc)
+            {
+                USHORT              uItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
+
+                rc = MRFROMSHORT(uItemCount);
+            }
+            break;
+
+        case WM_FORMATFRAME:
+/////////////////////////////////////////////////////////////////////////////////
+// Applications that subclass frame controls may find that the frame is already
+// subclassed the number of frame controls is variable.
+// The WM_FORMATFRAME and WM_QUERYFRAMECTLCOUNT messages must always be
+// subclassed by calling the previous window procedure and modifying its result.
+////////////////////////////////////////////////////////////////////////////////
+            {
+                int                 nItemCount;
+                int                 i;
+                PSWP                pSWP = NULL;
+                SWP                 vSwpStb;
+                RECTL               vRectl;
+                RECTL               vRstb;
+                int                 nHeight=0;
+
+                pSWP = (PSWP)PVOIDFROMMP(wParam);
+                nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
+                if(pWnd->m_frameStatusBar)
+                {
+                    ::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb);
+                    pWnd->m_frameStatusBar->GetSize(NULL, &nHeight);
+                    ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
+                    ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
+                    vRstb = vRectl;
+                    ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE);
+
+                    vSwpStb.x                = vRectl.xLeft - vRstb.xLeft;
+                    vSwpStb.y                = vRectl.yBottom - vRstb.yBottom;
+                    vSwpStb.cx               = vRectl.xRight - vRectl.xLeft - 1; //?? -1 ??
+                    vSwpStb.cy               = nHeight;
+                    vSwpStb.fl               = SWP_SIZE |SWP_MOVE | SWP_SHOW;
+                    vSwpStb.hwnd             = pWnd->m_frameStatusBar->GetHWND();
+                    vSwpStb.hwndInsertBehind = HWND_TOP;
+                }
+                ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
+                ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
+                ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE);
+                ::WinMapWindowPoints(HWND_DESKTOP, pWnd->m_hFrame, (PPOINTL)&vRectl, 2);
+                for(i = 0; i < nItemCount; i++)
+                {
+                    if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
+                    {
+                        pSWP[i].x    = vRectl.xLeft;
+                        pSWP[i].y    = vRectl.yBottom + nHeight;
+                        pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
+                        pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - nHeight;
+                        pSWP[i].fl   = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+                        pSWP[i].hwndInsertBehind = HWND_TOP;
+                    }
+                }
+                bProcessed = TRUE;
+                rc = MRFROMSHORT(nItemCount);
+            }
+            break;
+
+       default:
+            if(pWnd && pWnd->m_fnOldWndProc)
+                rc = pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam);
+            else
+                rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
+    }
+    return rc;
+} // end of wxFrameMainWndProc
+
+MRESULT EXPENTRY wxFrameWndProc(
+  HWND                              hWnd
+, ULONG                             ulMsg
+, MPARAM                            wParam
+, MPARAM                            lParam
+)
+{
+    //
+    // Trace all ulMsgs - useful for the debugging
+    //
+    HWND                            parentHwnd;
+    wxFrame*                        pWnd  = NULL;
+
+    parentHwnd  = WinQueryWindow(hWnd,QW_PARENT);
+    pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+
+    //
+    // When we get the first message for the HWND we just created, we associate
+    // it with wxWindow stored in wxWndHook
+    //
+
+    MRESULT                         rc = (MRESULT)0;
+    bool                            bProcessed = FALSE;
+
+    //
+    // Stop right here if we don't have a valid handle in our wxWindow object.
+    //
+    if (pWnd && !pWnd->GetHWND())
+    {
+        pWnd->SetHWND((WXHWND) hWnd);
+        rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam );
+        pWnd->SetHWND(0);
+    }
+    else
+    {
+        if (pWnd)
+            rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+        else
+            rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
+    }
+    return rc;
+} // end of wxFrameWndProc

 
 MRESULT wxFrame::OS2WindowProc(
   WXUINT                            uMessage
 
 MRESULT wxFrame::OS2WindowProc(
   WXUINT                            uMessage


@@ -1461,18 +1303,34 @@ MRESULT wxFrame::OS2WindowProc(
             bProcessed = !Close();
             break;
 
             bProcessed = !Close();
             break;
 

-        case WM_COMMAND:
+        case WM_PAINT:
+            bProcessed = HandlePaint();
+            mRc = (MRESULT)FALSE;
+            break;
+
+         case WM_ERASEBACKGROUND:
+            //
+            // Returning TRUE to requests PM to paint the window background
+            // in SYSCLR_WINDOW. We capture this here because the PS returned
+            // in Frames is the PS for the whole frame, which we can't really
+            // use at all. If you want to paint a different background, do it
+            // in an OnPaint using a wxPaintDC.
+            //
+            mRc = (MRESULT)(TRUE);
+            break;
+
+      case WM_COMMAND:

             {
                 WORD                wId;
                 WORD                wCmd;
                 WXHWND              hWnd;
 
                 UnpackCommand( (WXWPARAM)wParam
             {
                 WORD                wId;
                 WORD                wCmd;
                 WXHWND              hWnd;
 
                 UnpackCommand( (WXWPARAM)wParam

-                            ,(WXLPARAM)lParam
-                            ,&wId
-                            ,&hWnd
-                            ,&wCmd
-                           );
+                              ,(WXLPARAM)lParam
+                              ,&wId
+                              ,&hWnd
+                              ,&wCmd
+                             );

 
                 bProcessed = HandleCommand( wId
                                            ,wCmd
 
                 bProcessed = HandleCommand( wId
                                            ,wCmd


@@ -1501,24 +1359,27 @@ MRESULT wxFrame::OS2WindowProc(
             }
             break;
 
             }
             break;
 

-        case WM_PAINT:
-            bProcessed = HandlePaint();
-            break;
+        case WM_SIZE:
+            {
+                SHORT               nScxold = SHORT1FROMMP(wParam); // Old horizontal size.
+                SHORT               nScyold = SHORT2FROMMP(wParam); // Old vertical size.
+                SHORT               nScxnew = SHORT1FROMMP(lParam); // New horizontal size.
+                SHORT               nScynew = SHORT2FROMMP(lParam); // New vertical size.

 
 

-        case WM_ERASEBACKGROUND:
-            //
-            // Return TRUE to request PM to paint the window background
-            // in SYSCLR_WINDOW.
-            //
-            bProcessed = TRUE;
-            mRc = (MRESULT)(TRUE);
+                lParam = MRFROM2SHORT( nScxnew - 20
+                                      ,nScynew - 30
+                                     );
+            }
+            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
+            mRc = (MRESULT)FALSE;

             break;
 
         case CM_QUERYDRAGIMAGE:
             {
             break;
 
         case CM_QUERYDRAGIMAGE:
             {

+                const wxIcon&           vIcon = GetIcon();

                 HPOINTER                hIcon;
 
                 HPOINTER                hIcon;
 

-                if (m_icon.Ok())
+                if (vIcon.Ok())

                     hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;
                     hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;


@@ -1526,85 +1387,6 @@ MRESULT wxFrame::OS2WindowProc(
                 bProcessed = mRc != 0;
             }
             break;
                 bProcessed = mRc != 0;
             }
             break;

-
-        case WM_SIZE:
-            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
-            break;
-
-        case WM_QUERYFRAMECTLCOUNT:
-            {
-                USHORT itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam));
-                if(m_frameStatusBar)
-                   ++itemCount;
-                bProcessed = TRUE;
-                mRc = MRFROMSHORT( itemCount );
-            }
-            break;
-
-        case WM_FORMATFRAME:
-            {
-                PSWP   pSWP     = 0;
-                USHORT usClient = 0;
-                SWP    swp;
-                USHORT itemCount;
-                char   s[128];
-
-                itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam));
-                pSWP = (PSWP)PVOIDFROMMP( wParam );
-
-                while(pSWP[usClient].hwnd != WinWindowFromID(GetHWND(), FID_CLIENT)
-                     && usClient < itemCount)
-                    usClient++;
-
-                if(m_frameStatusBar)
-                {
-                   int height;
-
-                   m_frameStatusBar->GetSize(NULL, &height);
- 
-                   if(usClient == itemCount)
-                   {
-                      // frame has no client window
-                      // using another method of calculation
-                      RECTL wRectl;
-
-                      ::WinQueryWindowRect(GetHWND(), &wRectl);
-                      ::WinMapWindowPoints(GetHWND(), HWND_DESKTOP, (PPOINTL)&wRectl, 2);
-                      ::WinCalcFrameRect(GetHWND(), &wRectl, TRUE);
-                      ::WinMapWindowPoints(HWND_DESKTOP, GetHWND(), (PPOINTL)&wRectl, 2);
-
-                      pSWP[itemCount].x    = wRectl.xLeft;
-                      pSWP[itemCount].y    = wRectl.yBottom;
-                      pSWP[itemCount].cx   = wRectl.xRight - wRectl.xLeft - 1;
-                      pSWP[itemCount].cy   = height;
-                      pSWP[itemCount].fl   = SWP_SIZE |
-                                             SWP_MOVE |
-                                             SWP_SHOW;
-                      pSWP[itemCount].hwnd = m_frameStatusBar->GetHWND();
-                      pSWP[itemCount].hwndInsertBehind = HWND_TOP;
-                      ++itemCount;
-                   }
-                   else
-                   {
-                       pSWP[itemCount].x    = pSWP[usClient].x;
-                       pSWP[itemCount].y    = pSWP[usClient].y;
-                       pSWP[itemCount].cx   = pSWP[usClient].cx;
-                       pSWP[itemCount].cy   = height;
-                       pSWP[itemCount].fl   = SWP_SIZE |
-                                              SWP_MOVE |
-                                              SWP_SHOW;
-                       pSWP[itemCount].hwnd = m_frameStatusBar->GetHWND();
-                       pSWP[itemCount].hwndInsertBehind = HWND_TOP;
-                       pSWP[usClient].cy -= height;
-                       pSWP[usClient].y  += height;
-
-                       ++itemCount;
-                   }
-                }
-                bProcessed = TRUE;
-                mRc = MRFROMSHORT(itemCount);
-            }
-            break;

     }
 
     if (!bProcessed )
     }
 
     if (!bProcessed )


@@ -1615,63 +1397,62 @@ MRESULT wxFrame::OS2WindowProc(
     return (MRESULT)mRc;
 } // wxFrame::OS2WindowProc
 
     return (MRESULT)mRc;
 } // wxFrame::OS2WindowProc
 

-

 void wxFrame::SetClient(WXHWND c_Hwnd)
 {
 void wxFrame::SetClient(WXHWND c_Hwnd)
 {

-   // Are we really need to implement it?
+   // Duh...nothing to do under OS/2

 }
 
 }
 

-void wxFrame::SetClient(wxWindow* c_Window)
+void wxFrame::SetClient(
+  wxWindow*                         pWindow
+)

 {
 {

-     wxWindow *oldClient      = this->GetClient();
-     bool      clientHasFocus = oldClient && (oldClient == wxWindow::FindFocus());
+    wxWindow*                       pOldClient      = this->GetClient();
+    bool                            bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());

 
 

-     if(oldClient == c_Window)  // nothing to do
+    if(pOldClient == pWindow)  // nothing to do

         return;
         return;

+    if(pWindow == NULL) // just need to remove old client
+    {
+        if(pOldClient == NULL) // nothing to do
+            return;

 
 

-     if(c_Window == NULL) // just need to remove old client
-     {
-        if(oldClient == NULL) // nothing to do
-           return;
-
-        if( clientHasFocus )
+        if(bClientHasFocus )

             this->SetFocus();
 
             this->SetFocus();
 

-        oldClient->Enable( FALSE );
-        oldClient->Show( FALSE );
-        ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId());
+        pOldClient->Enable( FALSE );
+        pOldClient->Show( FALSE );
+        ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());

         // to avoid OS/2 bug need to update frame
         // to avoid OS/2 bug need to update frame

-        ::WinSendMsg((HWND)this->GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+        ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);

         return;
         return;

-     }
+    }

 
 

-     // else need to change client
-     if( clientHasFocus )
+    //
+    // Else need to change client
+    //
+    if(bClientHasFocus)

          this->SetFocus();
 
          this->SetFocus();
 

-     ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
-     if( oldClient )
-     {
-         oldClient->Enable( FALSE );
-         oldClient->Show( FALSE );
-         ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId());
-     }
-
-     c_Window->Reparent( this );
-     ::WinSetWindowUShort(c_Window->GetHWND(), QWS_ID, FID_CLIENT);
-
-     ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE);
-     c_Window->Enable();
-     c_Window->Show();   // ensure client is showing
-
-     if( this->IsShown() )
-     {
-         this->Show();
-         ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
-     }
+    ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE);
+    if(pOldClient)
+    {
+        pOldClient->Enable(FALSE);
+        pOldClient->Show(FALSE);
+        ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
+    }
+    pWindow->Reparent(this);
+    ::WinSetWindowUShort(pWindow->GetHWND(), QWS_ID, FID_CLIENT);
+    ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE);
+    pWindow->Enable();
+    pWindow->Show();   // ensure client is showing
+    if( this->IsShown() )
+    {
+        this->Show();
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+    }

 }
 
 }
 

-wxWindow *wxFrame::GetClient()
+wxWindow* wxFrame::GetClient()

 {
 {

-   return wxFindWinFromHandle((WXHWND)::WinWindowFromID(GetHWND(), FID_CLIENT));
+    return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));

 }
 }