]> git.saurik.com Git - wxWidgets.git/blobdiff - src/os2/frame.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added some WXDLLEXPORTs
[wxWidgets.git] / src / os2 / frame.cpp
diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index e84c30b9d2d9434631ec78774ca62ed7d72c1fe6..f21c945ae65d5bf4306eaa2cd4eda96dff0edf68 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -1,563 +1,1821 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
-// Purpose:     wxFrame
-// Author:      AUTHOR
+// Purpose:     wxFrameOS2
+// Author:      David Webster
 // Modified by:
 // Modified by:
-// Created:     ??/??/98
+// Created:     10/27/99
 // RCS-ID:      $Id$
 // RCS-ID:      $Id$
-// Copyright:   (c) AUTHOR
+// Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "frame.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#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/app.h"
+    #include "wx/utils.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/dcclient.h"
+#endif // WX_PRECOMP
+
+#include "wx/os2/private.h"
+
+#if wxUSE_STATUSBAR
+    #include "wx/statusbr.h"
+    #include "wx/generic/statusbr.h"
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    #include "wx/toolbar.h"
+#endif // wxUSE_TOOLBAR
 
 
-#include "wx/frame.h"
-#include "wx/event.h"
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
 #include "wx/menuitem.h"
 #include "wx/menuitem.h"
-#include "wx/menu.h"
-#include "wx/dcclient.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/app.h"
-
-extern wxList wxModelessWindows;
-extern wxList wxPendingDelete;
-
-#if !USE_SHARED_LIBRARY
-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
-  EVT_ACTIVATE(wxFrame::OnActivate)
-  EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-  EVT_IDLE(wxFrame::OnIdle)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
-END_EVENT_TABLE()
+#include "wx/log.h"
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
 
 
-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
+extern wxWindowList wxModelessWindows;
+extern wxList WXDLLEXPORT wxPendingDelete;
+extern wxChar wxFrameClassName[];
+extern wxMenu *wxCurrentPopupMenu;
 
 
-wxFrame::wxFrame()
-{
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
+extern void  wxAssociateWinWithHandle( HWND      hWnd
+                                      ,wxWindow* pWin
+                                     );
 
 
-  m_iconized = FALSE;
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
 
 
-  m_frameToolBar = NULL ;
-}
+BEGIN_EVENT_TABLE(wxFrameOS2, wxFrameBase)
+    EVT_ACTIVATE(wxFrameOS2::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrameOS2::OnSysColourChanged)
+END_EVENT_TABLE()
 
 
-bool wxFrame::Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
-{
-  if (!parent)
-    wxTopLevelWindows.Append(this);
+IMPLEMENT_DYNAMIC_CLASS(wxFrameOS2, wxWindow)
 
 
-  SetName(name);
-  m_windowStyle = style;
-  m_frameMenuBar = NULL;
-  m_frameToolBar = NULL ;
-  m_frameStatusBar = NULL;
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
+#endif
 
 
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+// ============================================================================
+// implementation
+// ============================================================================
 
 
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
+// ----------------------------------------------------------------------------
+// static class members
+// ----------------------------------------------------------------------------
+#if wxUSE_STATUSBAR
 
 
-  if (parent) parent->AddChild(this);
+#if wxUSE_NATIVE_STATUSBAR
+    bool wxFrameOS2::m_bUseNativeStatusBar = TRUE;
+#else
+    bool wxFrameOS2::m_bUseNativeStatusBar = FALSE;
+#endif
 
 
-  wxModelessWindows.Append(this);
+#endif //wxUSE_STATUSBAR
 
 
-  // TODO: create frame.
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------
 
 
-  return FALSE;
-}
+void wxFrameOS2::Init()
+{
+    m_bIconized = FALSE;
 
 
-wxFrame::~wxFrame()
+#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_bFsIsMaximized     = FALSE;
+    m_bFsIsShowing       = FALSE;
+    m_bIsShown           = FALSE;
+    m_pWinLastFocused    = (wxWindow *)NULL;
+
+    m_hFrame    = NULL;
+    m_hTitleBar = NULL;
+    m_hHScroll  = NULL;
+    m_hVScroll  = NULL;
+
+    //
+    // 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));
+} // end of wxFrameOS2::Init
+
+bool wxFrameOS2::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxString&                   rsTitle
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lulStyle
+, const wxString&                   rsName
+)
 {
 {
-  wxTopLevelWindows.DeleteObject(this);
+    int                             nX      = rPos.x;
+    int                             nY      = rPos.y;
+    int                             nWidth  = rSize.x;
+    int                             nHeight = rSize.y;
+    bool                            bOk = FALSE;
+
+    SetName(rsName);
+    m_windowStyle    = lulStyle;
+    m_frameMenuBar   = NULL;
+#if wxUSE_TOOLBAR
+    m_frameToolBar   = NULL;
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+    m_frameStatusBar = NULL;
+#endif //wxUSE_STATUSBAR
 
 
-  if (m_frameStatusBar)
-    delete m_frameStatusBar;
-  if (m_frameMenuBar)
-    delete m_frameMenuBar;
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
-/* Check if it's the last top-level window */
+    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;
+
+    bOk = OS2Create( m_windowId
+                    ,pParent
+                    ,wxFrameClassName
+                    ,this
+                    ,rsTitle
+                    ,nX
+                    ,nY
+                    ,nWidth
+                    ,nHeight
+                    ,lulStyle
+                   );
+    if (bOk)
+    {
+        if (!pParent)
+            wxTopLevelWindows.Append(this);
+        wxModelessWindows.Append(this);
+    }
+    return(bOk);
+} // end of wxFrameOS2::Create
+
+wxFrameOS2::~wxFrameOS2()
+{
+    m_isBeingDeleted = TRUE;
+
+    wxTopLevelWindows.DeleteObject(this);
 
 
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
+    DeleteAllBars();
 
 
-    if (wxTheApp->GetExitOnFrameDelete())
+    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
     {
     {
-       // TODO signal to the app that we're going to close
+        wxTheApp->SetTopWindow(NULL);
+
+        if (wxTheApp->GetExitOnFrameDelete())
+        {
+            ::WinPostMsg(NULL, WM_QUIT, 0, 0);
+        }
     }
     }
-  }
 
 
-  wxModelessWindows.DeleteObject(this);
-}
+    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 wxFrameOS2::~wxFrame
 
 
+//
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
 // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc.
-void wxFrame::GetClientSize(int *x, int *y) const
+//
+void wxFrameOS2::DoGetClientSize(
+  int*                              pX
+, int*                              pY
+) const
 {
 {
-    // TODO
-}
-
+    RECTL                           vRect;
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+
+    //
+    // 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 is all that is needed!
+    //
+
+    if (pX)
+        *pX = vRect.xRight - vRect.xLeft;
+    if (pY)
+        *pY = vRect.yTop - vRect.yBottom;
+} // end of wxFrameOS2::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)
-void wxFrame::SetClientSize(int width, int height)
+//
+void wxFrameOS2::DoSetClientSize(
+  int                               nWidth
+, int                               nHeight
+)
 {
 {
-    // TODO
-}
+    HWND                            hWnd = GetHwnd();
+    RECTL                           vRect;
+    RECTL                           vRect2;
+
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    ::WinQueryWindowRect(GetHwnd(), &vRect2);
+
+    //
+    // 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!
+    //
+    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;
 
 
-void wxFrame::GetSize(int *width, int *height) const
+        GetStatusBar()->GetClientSize( &nStatusX
+                                      ,&nStatusY
+                                     );
+        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 wxFrameOS2::DoSetClientSize
+
+void wxFrameOS2::DoGetSize(
+  int*                              pWidth
+, int*                              pHeight
+) const
 {
 {
-    // TODO
-}
+    RECTL                           vRect;
 
 
-void wxFrame::GetPosition(int *x, int *y) const
-{
-    // TODO
-}
+    ::WinQueryWindowRect(m_hFrame, &vRect);
+    *pWidth = vRect.xRight - vRect.xLeft;
+    *pHeight = vRect.yTop - vRect.yBottom;
+} // end of wxFrameOS2::DoGetSize
 
 
-void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxFrameOS2::DoGetPosition(
+  int*                              pX
+, int*                              pY
+) const
 {
 {
-    // TODO
-}
+    RECTL                           vRect;
+    POINTL                          vPoint;
 
 
-bool wxFrame::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+    ::WinQueryWindowRect(m_hFrame, &vRect);
 
 
-void wxFrame::Iconize(bool iconize)
-{
-    // TODO
-}
+    *pX = vRect.xRight - vRect.xLeft;
+    *pY = vRect.yTop - vRect.yBottom;
+} // end of wxFrameOS2::DoGetPosition
 
 
-// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
-{
-    // TODO
-}
+// ----------------------------------------------------------------------------
+// variations around ::ShowWindow()
+// ----------------------------------------------------------------------------
 
 
-bool wxFrame::IsIconized() const
+void wxFrameOS2::DoShowWindow(
+  int                               bShowCmd
+)
 {
 {
-    // TODO
-    return FALSE;
-}
+    ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
+    m_bIconized = bShowCmd == SWP_MINIMIZE;
+} // end of wxFrameOS2::DoShowWindow
 
 
-// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
+bool wxFrameOS2::Show(
+  bool                              bShow
+)
 {
 {
-    // TODO
-    return FALSE;
-}
+    SWP                             vSwp;
 
 
-void wxFrame::SetTitle(const wxString& title)
-{
-    // TODO
-}
+    DoShowWindow((int)bShow);
 
 
-wxString wxFrame::GetTitle() const
-{
-    // TODO
-    return wxString("");
-}
+    if (bShow)
+    {
+        wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
+
+        ::WinQueryWindowPos(m_hFrame, &vSwp);
+        m_bIconized = vSwp.fl & SWP_MINIMIZE;
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+        ::WinEnableWindow(m_hFrame, 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 wxFrameOS2::Show
 
 
-void wxFrame::SetIcon(const wxIcon& icon)
+void wxFrameOS2::Iconize(
+  bool                              bIconize
+)
 {
 {
-  m_icon = icon;
-  // TODO
-}
+    DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
+} // end of wxFrameOS2::Iconize
 
 
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name)
+void wxFrameOS2::Maximize(
+  bool                              bMaximize)
 {
 {
-    wxStatusBar *statusBar = NULL;
+    DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
+} // end of wxFrameOS2::Maximize
 
 
-    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
-        style, name);
-
-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
+void wxFrameOS2::Restore()
+{
+    DoShowWindow(SWP_RESTORE);
+} // end of wxFrameOS2::Restore
 
 
-    long x, y;
-    dc.GetTextExtent("X", &x, &y, NULL, NULL, NULL);
+bool wxFrameOS2::IsIconized() const
+{
+    SWP                             vSwp;
 
 
-    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
+    ::WinQueryWindowPos(m_hFrame, &vSwp);
 
 
-    statusBar->SetSize(-1, -1, 100, height);
+    if (vSwp.fl & SWP_MINIMIZE)
+        ((wxFrame*)this)->m_bIconized = TRUE;
+    else
+        ((wxFrame*)this)->m_bIconized = FALSE;
+    return m_bIconized;
+} // end of wxFrameOS2::IsIconized
 
 
-    statusBar->SetFieldsCount(number);
-    return statusBar;
-}
+// Is it maximized?
+bool wxFrameOS2::IsMaximized() const
+{
+    SWP                             vSwp;
+    bool                            bIconic;
 
 
-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name)
-{
-  // Calling CreateStatusBar twice is an error.
-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
-               "recreating status bar in wxFrame" );
-
-  m_frameStatusBar = OnCreateStatusBar(number, style, id,
-    name);
-  if ( m_frameStatusBar )
-  {
-    PositionStatusBar();
-    return m_frameStatusBar;
-  }
-  else
-    return NULL;
-}
+    ::WinQueryWindowPos(m_hFrame, &vSwp);
+    return (vSwp.fl & SWP_MAXIMIZE);
+} // end of wxFrameOS2::IsMaximized
 
 
-void wxFrame::SetStatusText(const wxString& text, int number)
+void wxFrameOS2::SetIcon(
+  const wxIcon&                     rIcon
+)
 {
 {
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+    wxFrameBase::SetIcon(rIcon);
 
 
-  m_frameStatusBar->SetStatusText(text, number);
-}
+    if ((m_icon.GetHICON()) != NULLHANDLE)
+    {
+        ::WinSendMsg( m_hFrame
+                     ,WM_SETICON
+                     ,(MPARAM)((HPOINTER)m_icon.GetHICON())
+                     ,NULL
+                    );
+        ::WinSendMsg( m_hFrame
+                     ,WM_UPDATEFRAME
+                     ,(MPARAM)FCF_ICON
+                     ,(MPARAM)0
+                    );
+    }
+} // end of wxFrameOS2::SetIcon
+
+#if wxUSE_STATUSBAR
+wxStatusBar* wxFrameOS2::OnCreateStatusBar(
+  int                               nNumber
+, long                              lulStyle
+, wxWindowID                        vId
+, const wxString&                   rName
+)
+{
+    wxStatusBar*                    pStatusBar = NULL;
+    SWP                             vSwp;
+    ERRORID                         vError;
+    wxString                        sError;
+
+    pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
+                                                ,lulStyle
+                                                ,vId
+                                                ,rName
+                                                 );
+
+    if( !pStatusBar )
+        return NULL;
 
 
-void wxFrame::SetStatusWidths(int n, const int widths_field[])
+    ::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 wxFrameOS2::OnCreateStatusBar
+
+void wxFrameOS2::PositionStatusBar()
 {
 {
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    SWP                             vSwp;
+    ERRORID                         vError;
+    wxString                        sError;
+
+    //
+    // Native status bar positions itself
+    //
+    if (m_frameStatusBar)
+    {
+        int                         nWidth;
+        int                         nStatbarWidth;
+        int                         nStatbarHeight;
+        HWND                        hWndClient;
+        RECTL                       vRect;
+        RECTL                       vFRect;
+
+        ::WinQueryWindowRect(m_hFrame, &vRect);
+        ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2);
+        vFRect = vRect;
+        ::WinCalcFrameRect(m_hFrame, &vRect, TRUE);
+        nWidth = vRect.xRight - vRect.xLeft;
+
+        m_frameStatusBar->GetSize( &nStatbarWidth
+                                  ,&nStatbarHeight
+                                 );
+
+        //
+        // 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( vRect.xLeft - vFRect.xLeft
+                                  ,vRect.yBottom - vFRect.yBottom
+                                  ,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 wxFrameOS2::PositionStatusBar
+#endif // wxUSE_STATUSBAR
 
 
-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-  PositionStatusBar();
-}
+void wxFrameOS2::DetachMenuBar()
+{
+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->Detach();
+        m_frameMenuBar = NULL;
+    }
+} // end of wxFrameOS2::DetachMenuBar
 
 
-void wxFrame::PositionStatusBar()
+void wxFrameOS2::SetMenuBar(
+  wxMenuBar*                        pMenuBar
+)
 {
 {
-    int w, h;
-    GetClientSize(&w, &h);
-    int sw, sh;
-    m_frameStatusBar->GetSize(&sw, &sh);
+    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();
 
 
-    // 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, h, w, sh);
-}
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();
+    }
+    else // set new non NULL menu bar
+    {
+        m_frameMenuBar = NULL;
 
 
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
+        //
+        // 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 wxFrameOS2::SetMenuBar
+
+void wxFrameOS2::AttachMenuBar(
+  wxMenuBar*                        pMenubar
+)
 {
 {
-    if (!menuBar)
+    m_frameMenuBar = pMenubar;
+
+    if (!pMenubar)
     {
     {
-        m_frameMenuBar = NULL;
-        return;
+        //
+        // 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_frameMenuBar = menuBar;
+            m_hMenu = pMenubar->Create();
 
 
-    // TODO
-}
+            if (!m_hMenu)
+                return;
+        }
+        InternalSetMenuBar();
+    }
+} // end of wxFrameOS2::AttachMenuBar
 
 
-void wxFrame::Fit()
-{
-  // Work out max. size
-  wxNode *node = GetChildren().First();
-  int max_width = 0;
-  int max_height = 0;
-  while (node)
-  {
-    // Find a child that's a subwindow, but not a dialog box.
-    wxWindow *win = (wxWindow *)node->Data();
-
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-         !win->IsKindOf(CLASSINFO(wxDialog)))
-    {
-      int width, height;
-      int x, y;
-      win->GetSize(&width, &height);
-      win->GetPosition(&x, &y);
-
-      if ((x + width) > max_width)
-        max_width = x + width;
-      if ((y + height) > max_height)
-        max_height = y + height;
-    }
-    node = node->Next();
-  }
-  SetClientSize(max_width, max_height);
-}
+void wxFrameOS2::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);
+    }
 
 
-// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+    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 wxFrameOS2::InternalSetMenuBar
+
+//
+// Responds to colour changes, and passes event on to children
+//
+void wxFrameOS2::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
-    if ( m_frameStatusBar )
+#if wxUSE_STATUSBAR
+    if (m_frameStatusBar)
     {
     {
-        wxSysColourChangedEvent event2;
-        event2.SetEventObject( m_frameStatusBar );
-        m_frameStatusBar->ProcessEvent(event2);
+        wxSysColourChangedEvent     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
-    wxWindow::OnSysColourChanged(event);
-}
-
-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
-void wxFrame::OnSize(wxSizeEvent& event)
+    //
+    wxWindow::OnSysColourChanged(rEvent);
+} // end of wxFrameOS2::OnSysColourChanged
+
+// Pass TRUE to show full screen, FALSE to restore.
+bool wxFrameOS2::ShowFullScreen(
+  bool                              bShow
+, long                              lStyle
+)
 {
 {
-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-      Layout();
-      return;
+    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);
+
+        //
+        // Save the old position, width & height, maximize state
+        //
+        m_vFsOldSize = GetRect();
+        m_bFsIsMaximized = IsMaximized();
+
+        //
+        // Decide which window style flags to turn off
+        //
+        LONG                        lNewStyle = m_lFsOldWindowStyle;
+        LONG                        lOffFlags = 0;
+
+        if (lStyle & wxFULLSCREEN_NOBORDER)
+            lOffFlags |= FCF_BORDER;
+        if (lStyle & wxFULLSCREEN_NOCAPTION)
+            lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU);
+
+        lNewStyle &= (~lOffFlags);
+
+        //
+        // Change our window style to be compatible with full-screen mode
+        //
+        ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle);
+
+        //
+        // Resize to the size of the desktop
+        int                         nWidth;
+        int                         nHeight;
+
+        RECTL                       vRect;
+
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nWidth = vRect.xRight - vRect.xLeft;
+        //
+        // Rmember OS/2 is backwards!
+        //
+        nHeight = vRect.yTop - vRect.yBottom;
+
+        SetSize( nWidth
+                ,nHeight
+               );
+
+        //
+        // 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
+                         );
+
+        wxSizeEvent                 vEvent( wxSize( nWidth
+                                                   ,nHeight
+                                                  )
+                                           ,GetId()
+                                          );
+
+        GetEventHandler()->ProcessEvent(vEvent);
+        return TRUE;
+    }
+    else
+    {
+        if (!IsFullScreen())
+            return FALSE;
+
+        m_bFsIsShowing = FALSE;
+
+#if wxUSE_TOOLBAR
+        wxToolBar*                  pTheToolBar = GetToolBar();
+
+        //
+        // Restore the toolbar, menubar, and statusbar
+        //
+        if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
+        {
+            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();
+        }
+#endif //wxUSE_STATUSBAR
+
+        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);
+
+        ::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;
     }
     }
-  #endif
+} // end of wxFrameOS2::ShowFullScreen
+
+//
+// Frame window
+//
+bool wxFrameOS2::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                            hTitlebar = NULLHANDLE;
+    HWND                            hHScroll = NULLHANDLE;
+    HWND                            hVScroll = NULLHANDLE;
+    HWND                            hFrame = NULLHANDLE;
+    HWND                            hClient = NULLHANDLE;
+    SWP                             vSwp[10];
+    RECTL                           vRect[10];
+    USHORT                          uCtlCount;
+    ERRORID                         vError;
+    wxString                        sError;
+
+    m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
+
+    if (pParent)
+        hParent = GetWinHwnd(pParent);
+    else
+        hParent = HWND_DESKTOP;
 
 
-  // do we have _exactly_ one child?
-  wxWindow *child = NULL;
-  for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
-         !win->IsKindOf(CLASSINFO(wxDialog)) &&
-         (win != GetStatusBar()) &&
-         (win != GetToolBar()) )
+    if (ulStyle == wxDEFAULT_FRAME_STYLE)
+        ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
+                        FCF_MINMAX | FCF_TASKLIST;
+    else
     {
     {
-      if ( child )
-        return;     // it's our second subwindow - nothing to do
-      child = win;
+        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:  We break ranks with other ports now
+    // and instead of calling down into the base wxWindow class' OS2Create
+    // we do all our own stuff here.  We will set the needed pieces
+    // of wxWindow manually, here.
+    //
+
+     hFrame = ::WinCreateStdWindow( hParent
+                                   ,ulStyleFlags   // frame-window style
+                                   ,&ulCreateFlags // window style
+                                   ,(PSZ)zWclass   // class name
+                                   ,(PSZ)zTitle    // window title
+                                   ,0L             // default client style
+                                   ,NULLHANDLE     // resource in executable file
+                                   ,0              // resource id
+                                   ,&hClient       // receives client window handle
+                                  );
+    if (!hFrame)
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error creating frame. Error: %s\n", sError);
+        return FALSE;
     }
     }
-  }
 
 
-  if ( child ) {
-    // we have exactly one child - set it's size to fill the whole frame
-    int clientW, clientH;
-    GetClientSize(&clientW, &clientH);
+    //
+    // wxWindow class' m_hWnd set here and needed associations
+    //
+    m_hFrame = hFrame;
+    m_hWnd   = hClient;
+    wxAssociateWinWithHandle(m_hWnd, this);
+    wxAssociateWinWithHandle(m_hFrame, this);
 
 
-    int x = 0;
-    int y = 0;
+    m_backgroundColour.Set(wxString("GREY"));
 
 
-    child->SetSize(x, y, clientW, clientH);
-  }
-}
+    LONG                            lColor = (LONG)m_backgroundColour.GetPixel();
 
 
+    if (!::WinSetPresParam( m_hWnd
+                           ,PP_BACKGROUNDCOLOR
+                           ,sizeof(LONG)
+                           ,(PVOID)&lColor
+                          ))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error creating frame. Error: %s\n", sError);
+        return FALSE;
+    }
+
+    //
+    // Now need to subclass window.  Instead of calling the SubClassWin in wxWindow
+    // we manually subclass here because we don't want to use the main wxWndProc
+    // by default
+    //
+    m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc);
+
+    //
+    // Now size everything.  If adding a menu the client will need to be resized.
+    //
+
+    if (!::WinSetWindowPos( m_hFrame
+                           ,HWND_TOP
+                           ,nX
+                           ,nY
+                           ,nWidth
+                           ,nHeight
+                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
+                          ))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error sizing frame. Error: %s\n", sError);
+        return FALSE;
+    }
+    //
+    // We may have to be smarter here when variable sized toolbars are added!
+    //
+    if (!::WinSetWindowPos( m_hWnd
+                           ,HWND_TOP
+                           ,nX // + 20
+                           ,nY // + 20
+                           ,nWidth // - 60
+                           ,nHeight // - 60
+                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
+                          ))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error sizing client. Error: %s\n", sError);
+        return FALSE;
+    }
+    return TRUE;
+} // end of wxFrameOS2::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.
-void wxFrame::OnActivate(wxActivateEvent& event)
+//
+void wxFrameOS2::OnActivate(
+  wxActivateEvent&                  rEvent
+)
 {
 {
-  for(wxNode *node = GetChildren().First(); node; node = node->Next())
-  {
-    // Find a child that's a subwindow, but not a dialog box.
-    wxWindow *child = (wxWindow *)node->Data();
-    if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
-         !child->IsKindOf(CLASSINFO(wxDialog)))
+    if ( rEvent.GetActive() )
     {
     {
-      child->SetFocus();
-      return;
+        // 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
+    {
+        //
+        // Remember the last focused child if it is our child
+        //
+        m_pWinLastFocused = FindFocus();
+
+        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
+                 && !wxDynamicCast(pChild, wxToolBar)
+#endif // wxUSE_TOOLBAR
+#if wxUSE_STATUSBAR
+                 && !wxDynamicCast(pChild, wxStatusBar)
+#endif // wxUSE_STATUSBAR
+               )
+            {
+                pChild->SetFocus();
+                return;
+            }
+        }
+    }
+} // end of wxFrameOS2::OnActivate
 
 
-// The default implementation for the close window event.
+// ----------------------------------------------------------------------------
+// wxFrame size management: we exclude the areas taken by menu/status/toolbars
+// from the client area, so the client area is what's really available for the
+// frame contents
+// ----------------------------------------------------------------------------
 
 
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
+// Checks if there is a toolbar, and returns the first free client position
+wxPoint wxFrameOS2::GetClientAreaOrigin() const
 {
 {
-    this->Destroy();
-}
+    wxPoint                         vPoint(0, 0);
 
 
-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
-{
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
+#if wxUSE_TOOLBAR
+    if (GetToolBar())
+    {
+        int                         nWidth;
+        int                         nHeight;
 
 
-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
+        GetToolBar()->GetSize( &nWidth
+                              ,&nHeight
+                             );
+
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            vPoint.x += nWidth;
+        }
+        else
+        {
+            // PM is backwards from windows
+            vPoint.y += nHeight;
+        }
+    }
+#endif //wxUSE_TOOLBAR
+    return vPoint;
+} // end of wxFrameOS2::GetClientAreaOrigin
+
+// ----------------------------------------------------------------------------
+// tool/status bar stuff
+// ----------------------------------------------------------------------------
+
+#if wxUSE_TOOLBAR
+
+wxToolBar* wxFrameOS2::CreateToolBar(
+  long                              lStyle
+, wxWindowID                        vId
+, const wxString&                   rName
+)
 {
 {
-  if (GetStatusBar())
-  {
-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    if (wxFrameBase::CreateToolBar( lStyle
+                                   ,vId
+                                   ,rName
+                                  ))
     {
     {
-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
-      {
-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-        if (helpString != "")
-          SetStatusText(helpString);
-      }
+        PositionToolBar();
     }
     }
-  }
-}
+    return m_frameToolBar;
+} // end of wxFrameOS2::CreateToolBar
 
 
-wxMenuBar *wxFrame::GetMenuBar() const
+void wxFrameOS2::PositionToolBar()
 {
 {
-  return m_frameMenuBar;
-}
+    HWND                            hWndClient;
+    RECTL                           vRect;
 
 
-void wxFrame::Centre(int direction)
-{
-  int display_width, display_height, width, height, x, y;
-  wxDisplaySize(&display_width, &display_height);
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
 
 
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+#if wxUSE_STATUSBAR
+    if (GetStatusBar())
+    {
+        int                         nStatusX;
+        int                         nStatusY;
+
+        GetStatusBar()->GetClientSize( &nStatusX
+                                      ,&nStatusY
+                                     );
+        // PM is backwards from windows
+        vRect.yBottom += nStatusY;
+    }
+#endif // wxUSE_STATUSBAR
 
 
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
+    if ( m_frameToolBar )
+    {
+        int                         nToolbarWidth;
+        int                         nToolbarHeight;
 
 
-  SetSize(x, y, width, height);
-}
+        m_frameToolBar->GetSize( &nToolbarWidth
+                              ,&nToolbarHeight
+                             );
 
 
-// Call this to simulate a menu command
-void wxFrame::Command(int id)
-{
-  ProcessCommand(id);
-}
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            nToolbarHeight = vRect.yBottom;
+        }
+        else
+        {
+            nToolbarWidth = vRect.xRight;
+        }
 
 
-void wxFrame::ProcessCommand(int id)
+        //
+        // Use the 'real' PM position here
+        //
+        GetToolBar()->SetSize( 0
+                              ,0
+                              ,nToolbarWidth
+                              ,nToolbarHeight
+                              ,wxSIZE_NO_ADJUSTMENTS
+                             );
+    }
+} // end of wxFrameOS2::PositionToolBar
+#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
+//
+void wxFrameOS2::IconizeChildFrames(
+  bool                              bIconize
+)
 {
 {
-  wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-  commandEvent.SetInt( id );
-  commandEvent.SetEventObject( this );
+    for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+         pNode;
+         pNode = pNode->GetNext() )
+    {
+        wxWindow*                   pWin = pNode->GetData();
 
 
-  wxMenuBar *bar = GetMenuBar() ;
-  if (!bar)
-    return;
+        if (pWin->IsKindOf(CLASSINFO(wxFrame)) )
+        {
+            ((wxFrame *)pWin)->Iconize(bIconize);
+        }
+    }
+} // end of wxFrameOS2::IconizeChildFrames
+
+// ===========================================================================
+// message processing
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// preprocessing
+// ---------------------------------------------------------------------------
+bool wxFrameOS2::OS2TranslateMessage(
+  WXMSG*                            pMsg
+)
+{
+    //
+    // try the menu bar accels
+    //
+    wxMenuBar*                      pMenuBar = GetMenuBar();
 
 
-/* TODO: check the menu item if required
-  wxMenuItem *item = bar->FindItemForId(id) ;
-  if (item && item->IsCheckable())
-  {
-    bar->Check(id,!bar->Checked(id)) ;
-  }
-*/
+    if (!pMenuBar )
+        return FALSE;
 
 
-  wxEvtHandler* evtHandler = GetEventHandler();
-  evtHandler->ProcessEvent(commandEvent);
-}
+#if wxUSE_ACCEL
+    const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
+    return rAcceleratorTable.Translate(GetHWND(), pMsg);
+#else
+    return FALSE;
+#endif //wxUSE_ACCEL
+} // end of wxFrameOS2::OS2TranslateMessage
 
 
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
+// ---------------------------------------------------------------------------
+// our private (non virtual) message handlers
+// ---------------------------------------------------------------------------
+bool wxFrameOS2::HandlePaint()
 {
 {
-    wxPoint pt(0, 0);
-    if (GetToolBar())
-    {
-        int w, h;
-        GetToolBar()->GetSize(& w, & h);
+    RECTL                           vRect;
 
 
-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+    if (::WinQueryUpdateRect(GetHWND(), &vRect))
+    {
+        if (m_bIconized)
         {
         {
-            pt.x += w;
+            //
+            // Icons in PM are the same as "pointers"
+            //
+            HPOINTER                hIcon;
+
+            if (m_icon.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
+            //
+            RECTL                   vRect2;
+            HPS                     hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2);
+
+            //
+            // Erase background before painting or we get white background
+            //
+            OS2DefWindowProc(WM_ERASEBACKGROUND, (MPARAM)hPs, (MPARAM)&vRect2);
+
+            if (hIcon)
+            {
+                HWND                            hWndClient;
+                RECTL                           vRect3;
+
+                ::WinQueryWindowRect(GetHwnd(), &vRect3);
+
+                static const int    nIconWidth = 32;
+                static const int    nIconHeight = 32;
+                int                 nIconX = (int)((vRect3.xRight - nIconWidth)/2);
+                int                 nIconY = (int)((vRect3.yBottom + nIconHeight)/2);
+
+                ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL);
+            }
+            ::WinEndPaint(hPs);
+            return TRUE;
         }
         else
         {
         }
         else
         {
-            pt.y += h;
+            return(wxWindow::HandlePaint());
         }
     }
         }
     }
-    return pt;
-}
+    else
+    {
+        // nothing to paint - processed
+        return TRUE;
+    }
+    return FALSE;
+} // end of wxFrameOS2::HandlePaint
 
 
-void wxFrame::ScreenToClient(int *x, int *y) const
+bool wxFrameOS2::HandleSize(
+  int                               nX
+, int                               nY
+, WXUINT                            nId
+)
 {
 {
-    wxWindow::ScreenToClient(x, y);
+    bool                            bProcessed = FALSE;
 
 
-    // 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;
-}
+    switch (nId)
+    {
+        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
+            if (!m_bIconized )
+                break;
+
+            //
+            // restore all child frames too
+            //
+            IconizeChildFrames(FALSE);
+            (void)SendIconizeEvent(FALSE);
+
+            //
+            // fall through
+            //
+
+        case kSizeMax:
+            m_bIconized = FALSE;
+            break;
+
+        case kSizeMin:
+            //
+            // Iconize all child frames too
+            //
+            IconizeChildFrames(TRUE);
+            (void)SendIconizeEvent();
+            m_bIconized = TRUE;
+            break;
+    }
 
 
-void wxFrame::ClientToScreen(int *x, int *y) const
+    if (!m_bIconized)
+    {
+        //
+        // forward WM_SIZE to status bar control
+        //
+#if wxUSE_NATIVE_STATUSBAR
+        if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)))
+        {
+            wxSizeEvent             vEvent( wxSize( nX
+                                                   ,nY
+                                                  )
+                                           ,m_frameStatusBar->GetId()
+                                          );
+
+            vEvent.SetEventObject(m_frameStatusBar);
+            m_frameStatusBar->OnSize(vEvent);
+        }
+#endif // wxUSE_NATIVE_STATUSBAR
+
+        PositionStatusBar();
+#if  wxUSE_TOOLBAR
+        PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
+        wxSizeEvent                 vEvent( wxSize( nX
+                                                   ,nY
+                                                  )
+                                           ,m_windowId
+                                          );
+
+        vEvent.SetEventObject(this);
+        bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+    }
+    return bProcessed;
+} // end of wxFrameOS2::HandleSize
+
+bool wxFrameOS2::HandleCommand(
+  WXWORD                            nId
+, WXWORD                            nCmd
+, WXHWND                            hControl
+)
 {
 {
-    // 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;
+    if (hControl)
+    {
+        //
+        // In case it's e.g. a toolbar.
+        //
+        wxWindow*                   pWin = wxFindWinFromHandle(hControl);
+
+        if (pWin)
+            return pWin->OS2Command( nCmd
+                                    ,nId
+                                   );
+    }
 
 
-    wxWindow::ClientToScreen(x, y);
-}
+    //
+    // Handle here commands from menus and accelerators
+    //
+    if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)
+    {
+        if (wxCurrentPopupMenu)
+        {
+            wxMenu*                 pPopupMenu = wxCurrentPopupMenu;
+
+            wxCurrentPopupMenu = NULL;
 
 
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+            return pPopupMenu->OS2Command( nCmd
+                                          ,nId
+                                         );
+        }
+
+        if (ProcessCommand(nId))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+} // end of wxFrameOS2::HandleCommand
+
+bool wxFrameOS2::HandleMenuSelect(
+  WXWORD                            nItem
+, WXWORD                            nFlags
+, WXHMENU                           hMenu
+)
 {
 {
-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
-               "recreating toolbar in wxFrame" );
+    if( !nFlags )
+    {
+        MENUITEM mItem;
+        MRESULT  rc;
+
+        rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);
 
 
-    wxToolBar* toolBar = OnCreateToolBar(style, id, name);
-    if (toolBar)
+        if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR)))
+        {
+            wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nItem);
+
+            vEvent.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM
+        }
+    }
+    return TRUE;
+} // end of wxFrameOS2::HandleMenuSelect
+
+// ---------------------------------------------------------------------------
+// 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)
     {
     {
-        SetToolBar(toolBar);
-        PositionToolBar();
-        return toolBar;
+        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
     {
     }
     else
     {
-        return NULL;
+        if (pWnd)
+            rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+        else
+            rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);
     }
     }
-}
+    return rc;
+} // end of wxFrameWndProc
+
+MRESULT wxFrameOS2::OS2WindowProc(
+  WXUINT                            uMessage
+, WXWPARAM                          wParam
+, WXLPARAM                          lParam
+)
+{
+    MRESULT                         mRc = 0L;
+    bool                            bProcessed = FALSE;
+
+    switch (uMessage)
+    {
+        case WM_CLOSE:
+            //
+            // If we can't close, tell the system that we processed the
+            // message - otherwise it would close us
+            //
+            bProcessed = !Close();
+            break;
+
+        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
+                              ,(WXLPARAM)lParam
+                              ,&wId
+                              ,&hWnd
+                              ,&wCmd
+                             );
+
+                bProcessed = HandleCommand( wId
+                                           ,wCmd
+                                           ,(WXHWND)hWnd
+                                          );
+            }
+            break;
+
+        case WM_MENUSELECT:
+            {
+                WXWORD              wItem;
+                WXWORD              wFlags;
+                WXHMENU             hMenu;
+
+                UnpackMenuSelect( wParam
+                                 ,lParam
+                                 ,&wItem
+                                 ,&wFlags
+                                 ,&hMenu
+                                );
+                bProcessed = HandleMenuSelect( wItem
+                                              ,wFlags
+                                              ,hMenu
+                                             );
+                mRc = (MRESULT)TRUE;
+            }
+            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.
+
+                lParam = MRFROM2SHORT( nScxnew - 20
+                                      ,nScynew - 30
+                                     );
+            }
+            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
+            mRc = (MRESULT)FALSE;
+            break;
+
+        case CM_QUERYDRAGIMAGE:
+            {
+                HPOINTER                hIcon;
+
+                if (m_icon.Ok())
+                    hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
+                else
+                    hIcon = (HPOINTER)m_hDefaultIcon;
+                mRc = (MRESULT)hIcon;
+                bProcessed = mRc != 0;
+            }
+            break;
+    }
+
+    if (!bProcessed )
+        mRc = wxWindow::OS2WindowProc( uMessage
+                                      ,wParam
+                                      ,lParam
+                                     );
+    return (MRESULT)mRc;
+} // wxFrameOS2::OS2WindowProc
 
 
-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
+void wxFrameOS2::SetClient(WXHWND c_Hwnd)
 {
 {
-    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+   // Duh...nothing to do under OS/2
 }
 
 }
 
-void wxFrame::PositionToolBar()
+void wxFrameOS2::SetClient(
+  wxWindow*                         pWindow
+)
 {
 {
-    int cw, ch;
+    wxWindow*                       pOldClient      = this->GetClient();
+    bool                            bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
 
 
-    // TODO: we actually need to use the low-level client size, before
-    // the toolbar/status bar were added.
-    // So DEFINITELY replace the line below with something appropriate.
+    if(pOldClient == pWindow)  // nothing to do
+        return;
+    if(pWindow == NULL) // just need to remove old client
+    {
+        if(pOldClient == NULL) // nothing to do
+            return;
 
 
-    GetClientSize(& cw, &ch);
+        if(bClientHasFocus )
+            this->SetFocus();
 
 
-    if ( GetStatusBar() )
-    {
-      int statusX, statusY;
-      GetStatusBar()->GetClientSize(&statusX, &statusY);
-      ch -= statusY;
+        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 (GetToolBar())
-    {
-        int tw, th;
-        GetToolBar()->GetSize(& tw, & th);
+    //
+    // Else need to change client
+    //
+    if(bClientHasFocus)
+         this->SetFocus();
 
 
-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
-        {
-            // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
-            // means, pretend we don't have toolbar/status bar, so we
-            // have the original client size.
-            GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS);
-        }
-        else
-        {
-            // Use the 'real' position
-            GetToolBar()->SetSize(0, 0, cw, th, wxSIZE_NO_ADJUSTMENTS);
-        }
+    ::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* wxFrameOS2::GetClient()
+{
+    return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
+}
wxWidgets (Impactor)