A few tweaks and cleanups

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 6041cc2b5a77b17f90af33f3eccedaf54dad709e..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,32 +80,49 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 // ----------------------------------------------------------------------------
 // static class members
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static class members
 // ----------------------------------------------------------------------------

+#if wxUSE_STATUSBAR

 
 #if wxUSE_NATIVE_STATUSBAR
 
 #if wxUSE_NATIVE_STATUSBAR

-    bool wxFrame::m_useNativeStatusBar = TRUE;
+    bool wxFrame::m_bUseNativeStatusBar = TRUE;

 #else
 #else

-    bool wxFrame::m_useNativeStatusBar = FALSE;
+    bool wxFrame::m_bUseNativeStatusBar = FALSE;

 #endif
 
 #endif
 

+#endif //wxUSE_STATUSBAR
+

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

-    m_bIconized = FALSE;
-
-#if wxUSE_TOOLTIPS
-    m_hHwndToolTip = 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_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
+    //
+    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(


@@ -102,53 +135,15 @@ bool wxFrame::Create(
 , 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    = lStyle;
-    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;
-
-    //
-    // We pass NULL as parent to MSWCreate because frames with parents behave
-    // very strangely under Win95 shell.
-    // Alteration by JACS: keep normal Windows behaviour (float on top of parent)
-    // with this style.
-    //
-    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
-              ,lStyle
-             );
-
+    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


@@ -156,43 +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(GetHwnd(), 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
 
 //


@@ -203,45 +162,18 @@ 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;
-    HWND                            hWndClient;
-
-    //
-    // 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!

     //
     //

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

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

-//    
+//

 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
 //
 // Set the client size (i.e. leave the calculation of borders etc.
 // to wxWindows)
 //


@@ -250,264 +182,145 @@ void wxFrame::DoSetClientSize(
 , int                               nHeight
 )
 {
 , int                               nHeight
 )
 {

-    HWND                            hWnd = GetHwnd();
-    HWND                            hWndClient;
-    RECTL                           vRect;
-    RECT                            vRect2;
-
-    hWndClient = ::WinWindowFromId(GetHwnd(), FID_CLIENT);
-    ::WinQueryWindowRect(hWndClient, &vRect);
-
-    ::WinQueryWindowRect(hWnd, &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;
-    vPoint.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;
-    POINT                           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                               nShowCmd
-)
-{
-    ::WinShowWindow(GetHwnd(), nShowCmd);
-    m_bIconized = nShowCmd == SWP_MINIMIZE;
-} // end of wxFrame::DoShowWindow
-
-bool wxFrame::Show(
-  bool                              bShow
-)
-{
-    DoShowWindow(show ? SWP_SHOW : SW_HIDE);
-
-    if (bShow)
-    {
-        wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
-
-        ::WinSetWindowPos( (HWND) GetHWND()
-                          ,HWND_TOP
-                          ,0
-                          ,0
-                          ,0
-                          ,0
-                          ,SWP_ZORDER
-                         );
-        vEvent.SetEventObject(this);
-        GetEventHandler()->ProcessEvent(vEvent);
-    }
-    else
-    {
-        //
-        // Try to highlight the correct window (the parent)
-        //
-        if (GetParent())
-        {
-            HWND                    hWndParent = GetHwndOf(GetParent());
-
-            if (hWndParent)
-                ::WinSetWindowPos( hWndParent
-                                  ,HWND_TOP
-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,SWP_ZORDER
-                                 );
-        }
-    }
-    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)
-{
-    DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
-} // end of wxFrame::Maximize
-
-void wxFrame::Restore()
+void wxFrame::Raise()

 {
 {

-    DoShowWindow(SWP_RESTORE);
-} // end of wxFrame::Restore
-
-bool wxFrame::IsIconized() const
-{
-    SWP                             vSwp;
-    bool                            bIconic;
-
-    ::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.Ok())
-    {
-        WinSendMessage( GetHwnd()
-                       ,WM_SETICON
-                       ,(HICON) m_icon.GetHICON()
-                       ,NULL
-                      )
-    }
-} // end of wxFrame::SetIcon
+    wxFrameBase::Raise();
+    ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                      ,HWND_TOP
+                      ,0
+                      ,0
+                      ,0
+                      ,0
+                      ,SWP_ZORDER
+                     );
+}

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

-, long                              lStyle
+, long                              lulStyle

 , wxWindowID                        vId
 , const wxString&                   rName
 )
 {
     wxStatusBar*                    pStatusBar = NULL;
 , wxWindowID                        vId
 , const wxString&                   rName
 )
 {
     wxStatusBar*                    pStatusBar = NULL;

+    SWP                             vSwp;
+    ERRORID                         vError;
+    wxString                        sError;

 
     pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
 
     pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber

-                                                ,lStyle
+                                                ,lulStyle

                                                 ,vId
                                                 ,rName
                                                 ,vId
                                                 ,rName

-                                               );
+                                                 );
+
+    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
+    //
+    if(::WinIsWindowShowing(m_hFrame))
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+

     return pStatusBar;
 } // end of wxFrame::OnCreateStatusBar
 
 void wxFrame::PositionStatusBar()
 {
     return pStatusBar;
 } // end of wxFrame::OnCreateStatusBar
 
 void wxFrame::PositionStatusBar()
 {

+    SWP                             vSwp;
+    ERRORID                         vError;
+    wxString                        sError;
+

     //
     // Native status bar positions itself
     //
     if (m_frameStatusBar)
     {
     //
     // Native status bar positions itself
     //
     if (m_frameStatusBar)
     {

-        int                         nWidth
-        int                         nHeight;
-        int                         nStatbarWidth
+        int                         nWidth;
+        int                         nY;
+        int                         nStatbarWidth;

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

+        RECTL                       vFRect;

 
 

-        hWndClient = ::WinWindowFromId(GetHwnd(), FID_CLIENT);
-        ::WinQueryWindowRect(hWndClient, &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.xTop - vRect.xBottom;
-        
+        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
                                  );

+        if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp))
+        {
+            vError = ::WinGetLastError(vHabmain);
+            sError = wxPMErrorToStr(vError);
+            wxLogError("Error setting parent for StautsBar. Error: %s\n", sError);
+            return;
+        }

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

+#if wxUSE_MENUS_NATIVE

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


@@ -518,175 +331,396 @@ void wxFrame::DetachMenuBar()
 } // end of wxFrame::DetachMenuBar
 
 void wxFrame::SetMenuBar(
 } // end of wxFrame::DetachMenuBar
 
 void wxFrame::SetMenuBar(

-  wxMenuBar*                        pMenuBbar
+  wxMenuBar*                        pMenuBar

 )
 {
 )
 {

+    ERRORID                         vError;
+    wxString                        sError;
+    HWND                            hTitlebar = NULLHANDLE;
+    HWND                            hHScroll = NULLHANDLE;
+    HWND                            hVScroll = NULLHANDLE;
+    HWND                            hMenuBar = NULLHANDLE;
+    SWP                             vSwp;
+    SWP                             vSwpTitlebar;
+    SWP                             vSwpVScroll;
+    SWP                             vSwpHScroll;
+    SWP                             vSwpMenu;
+

     if (!pMenuBar)
     {
         DetachMenuBar();
     if (!pMenuBar)
     {
         DetachMenuBar();

-        return;
+
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();
+    }
+    else // set new non NULL menu bar
+    {
+        m_frameMenuBar = NULL;
+
+        //
+        // Can set a menubar several times.
+        // TODO: how to prevent a memory leak if you have a currently-unattached
+        // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+        // there are problems for MDI).
+        //
+        if (pMenuBar->GetHMenu())
+        {
+            m_hMenu = pMenuBar->GetHMenu();
+        }
+        else
+        {
+            pMenuBar->Detach();
+            m_hMenu = pMenuBar->Create();
+            if (!m_hMenu)
+                return;
+        }
+        InternalSetMenuBar();
+        m_frameMenuBar = pMenuBar;
+        pMenuBar->Attach((wxFrame*)this);
+    }
+} // 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;
+    wxString                        sError;
+    //
+    // Set the parent and owner of the menubar to be the frame
+    //
+    if (!::WinSetParent(m_hMenu, m_hFrame, FALSE))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }
+
+    if (!::WinSetOwner(m_hMenu, m_hFrame))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }
+    ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+} // end of wxFrame::InternalSetMenuBar
+#endif // wxUSE_MENUS_NATIVE
+
+//
+// Responds to colour changes, and passes event on to children
+//
+void wxFrame::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)
+{
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+    Refresh();
+
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar)
+    {
+        wxSysColourChangedEvent     vEvent2;
+
+        vEvent2.SetEventObject(m_frameStatusBar);
+        m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
+    }
+#endif //wxUSE_STATUSBAR
+
+    //
+    // Propagate the event to the non-top-level children
+    //
+    wxWindow::OnSysColourChanged(rEvent);
+} // end of wxFrame::OnSysColourChanged
+
+// Pass TRUE to show full screen, FALSE to restore.
+bool wxFrame::ShowFullScreen(
+  bool                              bShow
+, long                              lStyle
+)
+{
+    if (bShow)
+    {
+        if (IsFullScreen())
+            return FALSE;
+
+        m_bFsIsShowing = TRUE;
+        m_lFsStyle = lStyle;
+
+#if wxUSE_TOOLBAR
+        wxToolBar*                  pTheToolBar = GetToolBar();
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+        wxStatusBar*                pTheStatusBar = GetStatusBar();
+#endif //wxUSE_STATUSBAR
+
+        int                         nDummyWidth;
+
+#if wxUSE_TOOLBAR
+        if (pTheToolBar)
+            pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+        if (pTheStatusBar)
+            pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
+#endif //wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+        //
+        // Zap the toolbar, menubar, and statusbar
+        //
+        if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
+        {
+            pTheToolBar->SetSize(-1,0);
+            pTheToolBar->Show(FALSE);
+        }
+#endif //wxUSE_TOOLBAR
+
+        if (lStyle & wxFULLSCREEN_NOMENUBAR)
+        {
+            ::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
+        //
+        if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)
+        {
+            m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();
+            SetStatusBar((wxStatusBar*) NULL);
+            delete pTheStatusBar;
+        }
+        else
+            m_nFsStatusBarFields = 0;
+#endif //wxUSE_STATUSBAR
+
+        //
+        // Zap the frame borders
+        //
+
+        //
+        // Save the 'normal' window style
+        //
+        m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE);

 
 

-    wxCHECK_RET(!pMenuBar->GetFrame(), wxT("this menubar is already attached"));
+        //
+        // Save the old position, width & height, maximize state
+        //
+        m_vFsOldSize = GetRect();
+        m_bFsIsMaximized = IsMaximized();

 
 

-    if (m_frameMenuBar)
-        delete m_frameMenuBar;
+        //
+        // Decide which window style flags to turn off
+        //
+        LONG                        lNewStyle = m_lFsOldWindowStyle;
+        LONG                        lOffFlags = 0;

 
 

-    m_hMenu = pMenuBbar->Create();
-    m_ulMenubarId = pMenubar->GetMenubarId();
-    if (m_ulMenubarId != FID_MENU)
-    {
-        ::WinSetWIndowUShort( m_hMenu
-                             ,QWS_ID
-                             ,(unsigned short(m_ulMenubarId)
-                            );
-    }
+        if (lStyle & wxFULLSCREEN_NOBORDER)
+            lOffFlags |= FCF_BORDER;
+        if (lStyle & wxFULLSCREEN_NOCAPTION)
+            lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU);

 
 

-    if (!m_hMenu)
-        return;
+        lNewStyle &= (~lOffFlags);

 
 

-    InternalSetMenuBar();
+        //
+        // Change our window style to be compatible with full-screen mode
+        //
+        ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle);

 
 

-    m_frameMenuBar = menu_bar;
-    menu_bar->Attach(this);
-} // end of wxFrame::SetMenuBar
+        //
+        // Resize to the size of the desktop
+        int                         nWidth;
+        int                         nHeight;

 
 

-void wxFrame::InternalSetMenuBar()
-{
-        
-    ::WinPostMsg( GetHwnd()
-                 ,WM_UPDATEFRAME
-                 ,FCF_MENU
-                 ,NULL
-                );
-} // end of wxFrame::InternalSetMenuBar
+        RECTL                       vRect;

 
 

-// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
-{
-// TODO:
-/*
-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-    Refresh();
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nWidth = vRect.xRight - vRect.xLeft;
+        //
+        // Rmember OS/2 is backwards!
+        //
+        nHeight = vRect.yTop - vRect.yBottom;

 
 

-    if ( m_frameStatusBar )
-    {
-        wxSysColourChangedEvent event2;
-        event2.SetEventObject( m_frameStatusBar );
-        m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
-    }
+        SetSize( nWidth
+                ,nHeight
+               );

 
 

-    // Propagate the event to the non-top-level children
-    wxWindow::OnSysColourChanged(event);
-*/
-}
+        //
+        // Now flush the window style cache and actually go full-screen
+        //
+        ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                          ,HWND_TOP
+                          ,0
+                          ,0
+                          ,nWidth
+                          ,nHeight
+                          ,SWP_SIZE | SWP_SHOW
+                         );

 
 

-/*
- * Frame window
- *
- */
+        wxSizeEvent                 vEvent( wxSize( nWidth
+                                                   ,nHeight
+                                                  )
+                                           ,GetId()
+                                          );

 
 

-bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
-                   int x, int y, int width, int height, long style)
+        GetEventHandler()->ProcessEvent(vEvent);
+        return TRUE;
+    }
+    else
+    {
+        if (!IsFullScreen())
+            return FALSE;

 
 

-{
-  m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-
-  // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
-  // could be the culprit. But without it, you can get a lot of flicker.
-
-// TODO:
-/*
-  DWORD msflags = 0;
-  if ((style & wxCAPTION) == wxCAPTION)
-    msflags = WS_OVERLAPPED;
-  else
-    msflags = WS_POPUP;
-
-  if (style & wxMINIMIZE_BOX)
-    msflags |= WS_MINIMIZEBOX;
-  if (style & wxMAXIMIZE_BOX)
-    msflags |= WS_MAXIMIZEBOX;
-  if (style & wxTHICK_FRAME)
-    msflags |= WS_THICKFRAME;
-  if (style & wxSYSTEM_MENU)
-    msflags |= WS_SYSMENU;
-  if ((style & wxMINIMIZE) || (style & wxICONIZE))
-    msflags |= WS_MINIMIZE;
-  if (style & wxMAXIMIZE)
-    msflags |= WS_MAXIMIZE;
-  if (style & wxCAPTION)
-    msflags |= WS_CAPTION;
-  if (style & wxCLIP_CHILDREN)
-    msflags |= WS_CLIPCHILDREN;
-
-  // Keep this in wxFrame because it saves recoding this function
-  // in wxTinyFrame
-#if wxUSE_ITSY_BITSY
-  if (style & wxTINY_CAPTION_VERT)
-    msflags |= IBS_VERTCAPTION;
-  if (style & wxTINY_CAPTION_HORIZ)
-    msflags |= IBS_HORZCAPTION;
-#else
-  if (style & wxTINY_CAPTION_VERT)
-    msflags |= WS_CAPTION;
-  if (style & wxTINY_CAPTION_HORIZ)
-    msflags |= WS_CAPTION;
-#endif
-  if ((style & wxTHICK_FRAME) == 0)
-    msflags |= WS_BORDER;
+        m_bFsIsShowing = FALSE;

 
 

-  WXDWORD extendedStyle = MakeExtendedStyle(style);
+#if wxUSE_TOOLBAR
+        wxToolBar*                  pTheToolBar = GetToolBar();

 
 

-#if !defined(__WIN16__) && !defined(__SC__)
-  if (style & wxFRAME_TOOL_WINDOW)
-    extendedStyle |= WS_EX_TOOLWINDOW;
-#endif
+        //
+        // Restore the toolbar, menubar, and statusbar
+        //
+        if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
+        {
+            pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
+            pTheToolBar->Show(TRUE);
+        }
+#endif //wxUSE_TOOLBAR

 
 

-  if (style & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
+#if wxUSE_STATUSBAR
+        if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
+        {
+            CreateStatusBar(m_nFsStatusBarFields);
+//          PositionStatusBar();
+        }
+#endif //wxUSE_STATUSBAR

 
 

-  m_iconized = FALSE;
-  if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
-         msflags, NULL, extendedStyle) )
-         return FALSE;
+        if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 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);

 
 

-  // Seems to be necessary if we use WS_POPUP
-  // style instead of WS_OVERLAPPED
-  if (width > -1 && height > -1)
-    ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
-*/
-  return TRUE;
-}
+        ::WinSetWindowULong( m_hFrame
+                            ,QWL_STYLE
+                            ,(ULONG)m_lFsOldWindowStyle
+                           );
+        ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                          ,HWND_TOP
+                          ,m_vFsOldSize.x
+                          ,m_vFsOldSize.y
+                          ,m_vFsOldSize.width
+                          ,m_vFsOldSize.height
+                          ,SWP_SIZE | SWP_SHOW
+                         );
+        return TRUE;
+    }
+} // end of wxFrame::ShowFullScreen

 
 

+//
+// Frame window
+//
+//

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

-void wxFrame::OnActivate(wxActivateEvent& event)
+//
+void wxFrame::OnActivate(
+  wxActivateEvent&                  rEvent
+)

 {
 {

-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
+    if ( rEvent.GetActive() )

     {
     {

-        // FIXME all this is totally bogus - we need to do the same as wxPanel,
-        //       but how to do it without duplicating the code?
+        // restore focus to the child which was last focused
+        wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);

 
 

-        // restore focus
-        wxWindow *child = node->GetData();
+        wxWindow*                           pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
+                                            : NULL;
+        if (!pParent)
+        {
+            pParent = this;
+        }
+
+        wxSetFocusToChild( pParent
+                          ,&m_pWinLastFocused
+                         );
+    }
+    else // deactivating
+    {
+        //
+        // Remember the last focused child if it is our child
+        //
+        m_pWinLastFocused = FindFocus();

 
 

-        if ( !child->IsTopLevel()
+        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?
+
+            // restore focus
+            wxWindow*                   pChild = pNode->GetData();
+
+            if (!pChild->IsTopLevel()

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

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

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

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

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

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

         }
     }
         }
     }

-}
+} // end of wxFrame::OnActivate

 
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars
 
 // ----------------------------------------------------------------------------
 // wxFrame size management: we exclude the areas taken by menu/status/toolbars


@@ -697,47 +731,31 @@ void wxFrame::OnActivate(wxActivateEvent& event)
 // Checks if there is a toolbar, and returns the first free client position
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
 // Checks if there is a toolbar, and returns the first free client position
 wxPoint wxFrame::GetClientAreaOrigin() const
 {

-    wxPoint pt(0, 0);
+    wxPoint                         vPoint(0, 0);
+
+#if wxUSE_TOOLBAR

     if (GetToolBar())
     {
     if (GetToolBar())
     {

-        int w, h;
-        GetToolBar()->GetSize(& w, & h);
+        int                         nWidth;
+        int                         nHeight;
+
+        GetToolBar()->GetSize( &nWidth
+                              ,&nHeight
+                             );

 
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
 
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {

-            pt.x += w;
+            vPoint.x += nWidth;

         }
         else
         {
         }
         else
         {

-            pt.y += h;
+            // PM is backwards from windows
+            vPoint.y += nHeight;

         }
     }
         }
     }

-    return pt;
-}
-
-void wxFrame::DoScreenToClient(int *x, int *y) const
-{
-    wxWindow::DoScreenToClient(x, y);
-
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    wxPoint pt(GetClientAreaOrigin());
-    *x -= pt.x;
-    *y -= pt.y;
-}
-
-void wxFrame::DoClientToScreen(int *x, int *y) const
-{
-    // We may be faking the client origin.
-    // So a window that's really at (0, 30) may appear
-    // (to wxWin apps) to be at (0, 0).
-    wxPoint pt1(GetClientAreaOrigin());
-    *x += pt1.x;
-    *y += pt1.y;
-
-    wxWindow::DoClientToScreen(x, y);
-}
+#endif //wxUSE_TOOLBAR
+    return vPoint;
+} // end of wxFrame::GetClientAreaOrigin

 
 // ----------------------------------------------------------------------------
 // tool/status bar stuff
 
 // ----------------------------------------------------------------------------
 // tool/status bar stuff


@@ -745,75 +763,125 @@ void wxFrame::DoClientToScreen(int *x, int *y) const
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrame::CreateToolBar(
+  long                              lStyle
+, wxWindowID                        vId
+, const wxString&                   rName
+)

 {
 {

-    if ( wxFrameBase::CreateToolBar(style, id, name) )
+    if (wxFrameBase::CreateToolBar( lStyle
+                                   ,vId
+                                   ,rName
+                                  ))

     {
         PositionToolBar();
     }
     {
         PositionToolBar();
     }

-

     return m_frameToolBar;
     return m_frameToolBar;

-}
+} // end of wxFrame::CreateToolBar

 
 void wxFrame::PositionToolBar()
 {
 
 void wxFrame::PositionToolBar()
 {

-// TODO:
-/*
-    RECT rect;
-    ::GetClientRect(GetHwnd(), &rect);
+    HWND                            hWndClient;
+    RECTL                           vRect;
+
+    ::WinQueryWindowRect(GetHwnd(), &vRect);

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-    if ( GetStatusBar() )
+    if (GetStatusBar())

     {
     {

-        int statusX, statusY;
-        GetStatusBar()->GetClientSize(&statusX, &statusY);
-        rect.bottom -= statusY;
+        int                         nStatusX;
+        int                         nStatusY;
+
+        GetStatusBar()->GetClientSize( &nStatusX
+                                      ,&nStatusY
+                                     );
+        // PM is backwards from windows
+        vRect.yBottom += nStatusY;

     }
 #endif // wxUSE_STATUSBAR
 
     }
 #endif // wxUSE_STATUSBAR
 

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

     {
     {

-        int tw, th;
-        GetToolBar()->GetSize(&tw, &th);
+        int                         nToolbarWidth;
+        int                         nToolbarHeight;
+
+        m_frameToolBar->GetSize( &nToolbarWidth
+                              ,&nToolbarHeight
+                             );

 
 

-        if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)

         {
         {

-            th = rect.bottom;
+            nToolbarHeight = vRect.yBottom;

         }
         else
         {
         }
         else
         {

-            tw = rect.right;
+            nToolbarWidth = vRect.xRight;

         }
 
         }
 

-        // Use the 'real' MSW position here
-        GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS);
+        //
+        // Use the 'real' PM position here
+        //
+        GetToolBar()->SetSize( 0
+                              ,0
+                              ,nToolbarWidth
+                              ,nToolbarHeight
+                              ,wxSIZE_NO_ADJUSTMENTS
+                             );

     }
     }

-*/
-}
+} // end of wxFrame::PositionToolBar

 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // frame state (iconized/maximized/...)
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 // frame state (iconized/maximized/...)
 // ----------------------------------------------------------------------------
 

+//

 // propagate our state change to all child frames: this allows us to emulate X
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it
 // propagate our state change to all child frames: this allows us to emulate X
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it

-void wxFrame::IconizeChildFrames(bool bIconize)
+//
+void wxFrame::IconizeChildFrames(
+  bool                              bIconize
+)

 {
 {

-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
+    for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+         pNode;
+         pNode = pNode->GetNext() )

     {
     {

-        wxWindow *win = node->GetData();
+        wxWindow*                   pWin = pNode->GetData();
+        wxFrame*                    pFrame = wxDynamicCast(pWin, wxFrame);

 
 

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

         {
         {

-            ((wxFrame *)win)->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

 
 

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

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


@@ -821,69 +889,113 @@ void wxFrame::IconizeChildFrames(bool bIconize)
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------

-
-bool wxFrame::OS2TranslateMessage(WXMSG* pMsg)
+bool wxFrame::OS2TranslateMessage(
+  WXMSG*                            pMsg
+)

 {
 {

-// TODO:
-/*
-    if ( wxWindow::OS2TranslateMessage(pMsg) )
-        return TRUE;
-*/
+    //

     // try the menu bar accels
     // try the menu bar accels

-    wxMenuBar *menuBar = GetMenuBar();
-    if ( !menuBar )
+    //
+    wxMenuBar*                      pMenuBar = GetMenuBar();
+
+    if (!pMenuBar)

         return FALSE;
 
         return FALSE;
 

-    const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
-    return acceleratorTable.Translate(this, pMsg);
-}
+#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE
+    const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
+    return rAcceleratorTable.Translate(GetHWND(), pMsg);
+#else
+    return FALSE;
+#endif //wxUSE_ACCEL
+} // end of wxFrame::OS2TranslateMessage

 
 // ---------------------------------------------------------------------------
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // our private (non virtual) message handlers
 // ---------------------------------------------------------------------------

-

 bool wxFrame::HandlePaint()
 {
 bool wxFrame::HandlePaint()
 {

-// TODO:
-/*
-    RECT rect;
-    if ( GetUpdateRect(GetHwnd(), &rect, FALSE) )
+    RECTL                           vRect;
+
+    if (::WinQueryUpdateRect(GetHWND(), &vRect))

     {
     {

-        if ( m_iconized )
+        if (m_bIconized)

         {
         {

-            HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
-                                      : (HICON)m_defaultIcon;
-
+            //
+            // Icons in PM are the same as "pointers"
+            //
+            const wxIcon&           vIcon = GetIcon();
+            HPOINTER                hIcon;
+
+            if (vIcon.Ok())
+                hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+            else
+                hIcon = (HPOINTER)m_hDefaultIcon;
+
+            //

             // Hold a pointer to the dc so long as the OnPaint() message
             // is being processed
             // Hold a pointer to the dc so long as the OnPaint() message
             // is being processed

-            PAINTSTRUCT ps;
-            HDC hdc = ::BeginPaint(GetHwnd(), &ps);
+            //
+            RECTL                   vRect2;
+            HPS                     hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2);

 
 

+            //

             // Erase background before painting or we get white background
             // Erase background before painting or we get white background

-            MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L);
+            //
+            OS2DefWindowProc(WM_ERASEBACKGROUND, (MPARAM)hPs, (MPARAM)&vRect2);

 
 

-            if ( hIcon )
+            if (hIcon)

             {
             {

-                RECT rect;
-                ::GetClientRect(GetHwnd(), &rect);
+                HWND                            hWndClient;
+                RECTL                           vRect3;

 
 

-                // FIXME: why hardcoded?
-                static const int icon_width = 32;
-                static const int icon_height = 32;
+                ::WinQueryWindowRect(GetHwnd(), &vRect3);

 
 

-                int icon_x = (int)((rect.right - icon_width)/2);
-                int icon_y = (int)((rect.bottom - icon_height)/2);
+                static const int    nIconWidth = 32;
+                static const int    nIconHeight = 32;
+                int                 nIconX = (int)((vRect3.xRight - nIconWidth)/2);
+                int                 nIconY = (int)((vRect3.yBottom + nIconHeight)/2);

 
 

-                ::DrawIcon(hdc, icon_x, icon_y, hIcon);
+                ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);

             }
             }

-
-            ::EndPaint(GetHwnd(), &ps);
-
+            ::WinEndPaint(hPs);

             return TRUE;
         }
         else
         {
             return TRUE;
         }
         else
         {

-            return wxWindow::HandlePaint();
+            if (!wxWindow::HandlePaint())
+            {
+                HPS                     hPS;
+                RECTL                   vRect;
+
+                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


@@ -891,188 +1003,456 @@ bool wxFrame::HandlePaint()
         // nothing to paint - processed
         return TRUE;
     }
         // nothing to paint - processed
         return TRUE;
     }

-*/

     return FALSE;
     return FALSE;

-}
+} // end of wxFrame::HandlePaint

 
 

-bool wxFrame::HandleSize(int x, int y, WXUINT id)
+bool wxFrame::HandleSize(
+  int                               nX
+, int                               nY
+, WXUINT                            nId
+)

 {
 {

-    bool processed = FALSE;
+    bool                            bProcessed = FALSE;

 
 

-// TODO:
-/*
-    switch ( id )
+    switch (nId)

     {
     {

-        case SIZENORMAL:
-            // only do it it if we were iconized before, otherwise resizing the
+        case kSizeNormal:
+            //
+            // Only do it it if we were iconized before, otherwise resizing the

             // parent frame has a curious side effect of bringing it under it's
             // children
             // parent frame has a curious side effect of bringing it under it's
             // children

-            if ( !m_iconized )
+            if (!m_bIconized )

                 break;
 
                 break;
 

+            //

             // restore all child frames too
             // restore all child frames too

+            //

             IconizeChildFrames(FALSE);
             IconizeChildFrames(FALSE);

+            (void)SendIconizeEvent(FALSE);

 
 

+            //

             // fall through
             // fall through

+            //

 
 

-        case SIZEFULLSCREEN:
-            m_iconized = FALSE;
+        case kSizeMax:
+            m_bIconized = FALSE;

             break;
 
             break;
 

-        case SIZEICONIC:
-            // iconize all child frames too
+        case kSizeMin:
+            //
+            // Iconize all child frames too
+            //

             IconizeChildFrames(TRUE);
             IconizeChildFrames(TRUE);

-
-            m_iconized = TRUE;
+            (void)SendIconizeEvent();
+            m_bIconized = TRUE;

             break;
     }
 
             break;
     }
 

-    if ( !m_iconized )
+    if (!m_bIconized)

     {
     {

+        //

         // forward WM_SIZE to status bar control
         // forward WM_SIZE to status bar control

+        //

 #if wxUSE_NATIVE_STATUSBAR
         if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
         {
 #if wxUSE_NATIVE_STATUSBAR
         if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
         {

-            wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId());
-            event.SetEventObject( m_frameStatusBar );
+            wxSizeEvent             vEvent( wxSize( nX
+                                                   ,nY
+                                                  )
+                                           ,m_frameStatusBar->GetId()
+                                          );

 
 

-            ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event);
+            vEvent.SetEventObject(m_frameStatusBar);
+            m_frameStatusBar->OnSize(vEvent);

         }
 #endif // wxUSE_NATIVE_STATUSBAR
 
         PositionStatusBar();
         }
 #endif // wxUSE_NATIVE_STATUSBAR
 
         PositionStatusBar();

+#if  wxUSE_TOOLBAR

         PositionToolBar();
         PositionToolBar();

+#endif // wxUSE_TOOLBAR

 
 

-        wxSizeEvent event(wxSize(x, y), m_windowId);
-        event.SetEventObject( this );
-        processed = GetEventHandler()->ProcessEvent(event);
+        bProcessed = wxWindow::HandleSize( nX
+                                          ,nY
+                                          ,nId
+                                         );

     }
     }

-*/
-    return processed;
-}
+    return bProcessed;
+} // end of wxFrame::HandleSize

 
 

-bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
+bool wxFrame::HandleCommand(
+  WXWORD                            nId
+, WXWORD                            nCmd
+, WXHWND                            hControl
+)

 {
 {

-// TODO:
-/*
-    if ( control )
+    if (hControl)

     {
     {

+        //

         // In case it's e.g. a toolbar.
         // In case it's e.g. a toolbar.

-        wxWindow *win = wxFindWinFromHandle(control);
-        if ( win )
-            return win->MSWCommand(cmd, id);
+        //
+        wxWindow*                   pWin = wxFindWinFromHandle(hControl);
+
+        if (pWin)
+            return pWin->OS2Command( nCmd
+                                    ,nId
+                                   );

     }
 
     }
 

-    // handle here commands from menus and accelerators
-    if ( cmd == 0 || cmd == 1 )
+    //
+    // Handle here commands from menus and accelerators
+    //
+    if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)

     {
     {

-        if ( wxCurrentPopupMenu )
+#if wxUSE_MENUS_NATIVE
+        if (wxCurrentPopupMenu)

         {
         {

-            wxMenu *popupMenu = wxCurrentPopupMenu;
+            wxMenu*                 pPopupMenu = wxCurrentPopupMenu;
+

             wxCurrentPopupMenu = NULL;
 
             wxCurrentPopupMenu = NULL;
 

-            return popupMenu->MSWCommand(cmd, id);
+            return pPopupMenu->OS2Command( nCmd
+                                          ,nId
+                                         );
+            return TRUE;

         }
         }

+#endif

 
 

-        if ( ProcessCommand(id) )
+        if (ProcessCommand(nId))

         {
             return TRUE;
         }
     }
         {
             return TRUE;
         }
     }

-*/

     return FALSE;
     return FALSE;

-}
+} // end of wxFrame::HandleCommand
+
+bool wxFrame::HandleMenuSelect(
+  WXWORD                            nItem
+, WXWORD                            nFlags
+, WXHMENU                           hMenu
+)
+{
+    if( !nFlags )
+    {
+        MENUITEM mItem;
+        MRESULT  rc;
+
+        rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);
+
+        if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR)))
+        {
+            wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nItem);

 
 

-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+            vEvent.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM
+        }
+    }
+    return TRUE;
+} // end of wxFrame::HandleMenuSelect
+
+// ---------------------------------------------------------------------------
+// Main Frame window proc
+// ---------------------------------------------------------------------------
+MRESULT EXPENTRY wxFrameMainWndProc(
+  HWND                              hWnd
+, ULONG                             ulMsg
+, MPARAM                            wParam
+, MPARAM                            lParam
+)

 {
 {

-    int item;
-    if ( flags == 0xFFFF && hMenu == 0 )
+    MRESULT                         rc = (MRESULT)0;
+    bool                            bProcessed = FALSE;
+    wxFrame*                        pWnd  = NULL;
+
+    pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+    switch (ulMsg)

     {
     {

-        // menu was removed from screen
-        item = -1;
+        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);

     }
     }

-// TODO:
-/*
-    else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
+    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())

     {
     {

-        item = nItem;
+        pWnd->SetHWND((WXHWND) hWnd);
+        rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam );
+        pWnd->SetHWND(0);

     }
     else
     {
     }
     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 (pWnd)
+            rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+        else
+            rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);

     }
     }

-*/
-    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
-    event.SetEventObject( this );
-
-    return GetEventHandler()->ProcessEvent(event);
-}
-
-// ---------------------------------------------------------------------------
-// the window proc for wxFrame
-// ---------------------------------------------------------------------------
+    return rc;
+} // end of wxFrameWndProc

 
 

-MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
+MRESULT wxFrame::OS2WindowProc(
+  WXUINT                            uMessage
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)

 {
 {

-    long rc = 0;
-    bool processed = FALSE;
+    MRESULT                         mRc = 0L;
+    bool                            bProcessed = FALSE;

 
 

-// TODO:
-/*
-    switch ( message )
+    switch (uMessage)

     {
         case WM_CLOSE:
     {
         case WM_CLOSE:

-            // if we can't close, tell the system that we processed the
+            //
+            // If we can't close, tell the system that we processed the

             // message - otherwise it would close us
             // message - otherwise it would close us

-            processed = !Close();
+            //
+            bProcessed = !Close();

             break;
 
             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 id, cmd;
-                WXHWND hwnd;
-                UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
-                              &id, &hwnd, &cmd);
+                WORD                wId;
+                WORD                wCmd;
+                WXHWND              hWnd;
+
+                UnpackCommand( (WXWPARAM)wParam
+                              ,(WXLPARAM)lParam
+                              ,&wId
+                              ,&hWnd
+                              ,&wCmd
+                             );

 
 

-                processed = HandleCommand(id, cmd, (WXHWND)hwnd);
+                bProcessed = HandleCommand( wId
+                                           ,wCmd
+                                           ,(WXHWND)hWnd
+                                          );

             }
             break;
 
         case WM_MENUSELECT:
             {
             }
             break;
 
         case WM_MENUSELECT:
             {

-                WXWORD item, flags;
-                WXHMENU hmenu;
-                UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
-
-                processed = HandleMenuSelect(item, flags, hmenu);
+                WXWORD              wItem;
+                WXWORD              wFlags;
+                WXHMENU             hMenu;
+
+                UnpackMenuSelect( wParam
+                                 ,lParam
+                                 ,&wItem
+                                 ,&wFlags
+                                 ,&hMenu
+                                );
+                bProcessed = HandleMenuSelect( wItem
+                                              ,wFlags
+                                              ,hMenu
+                                             );
+                mRc = (MRESULT)TRUE;

             }
             break;
 
             }
             break;
 

-        case WM_PAINT:
-            processed = HandlePaint();
+        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.
+
+                lParam = MRFROM2SHORT( nScxnew - 20
+                                      ,nScynew - 30
+                                     );
+            }
+            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
+            mRc = (MRESULT)FALSE;

             break;
 
             break;
 

-        case WM_QUERYDRAGICON:
+        case CM_QUERYDRAGIMAGE:

             {
             {

-                HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
-                                          : (HICON)(m_defaultIcon);
-                rc = (long)hIcon;
-                processed = rc != 0;
+                const wxIcon&           vIcon = GetIcon();
+                HPOINTER                hIcon;
+
+                if (vIcon.Ok())
+                    hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
+                else
+                    hIcon = (HPOINTER)m_hDefaultIcon;
+                mRc = (MRESULT)hIcon;
+                bProcessed = mRc != 0;

             }
             break;
             }
             break;

+    }

 
 

-        case WM_SIZE:
-            processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
-            break;
+    if (!bProcessed )
+        mRc = wxWindow::OS2WindowProc( uMessage
+                                      ,wParam
+                                      ,lParam
+                                     );
+    return (MRESULT)mRc;
+} // wxFrame::OS2WindowProc
+
+void wxFrame::SetClient(WXHWND c_Hwnd)
+{
+   // Duh...nothing to do under OS/2
+}
+
+void wxFrame::SetClient(
+  wxWindow*                         pWindow
+)
+{
+    wxWindow*                       pOldClient      = this->GetClient();
+    bool                            bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
+
+    if(pOldClient == pWindow)  // nothing to do
+        return;
+    if(pWindow == NULL) // just need to remove old client
+    {
+        if(pOldClient == NULL) // nothing to do
+            return;
+
+        if(bClientHasFocus )
+            this->SetFocus();
+
+        pOldClient->Enable( FALSE );
+        pOldClient->Show( FALSE );
+        ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
+        // to avoid OS/2 bug need to update frame
+        ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+        return;

     }
 
     }
 

-    if ( !processed )
-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
+    //
+    // Else need to change client
+    //
+    if(bClientHasFocus)
+         this->SetFocus();

 
 

-    return rc;
-*/
-    return (MRESULT)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()
+{
+    return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
+}