]> 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
no message
[wxWidgets.git] / src / os2 / frame.cpp
diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 4c6fb21326aab8b2e01923ae486f7b3c2d1eee92..a4b2fc5ddfdb633f94f9724b3ba97cb372adb833 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -3,561 +3,1184 @@
 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:
 // Purpose:     wxFrame
 // Author:      David Webster
 // Modified by:
-// Created:     08/12/99
+// Created:     10/27/99
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // RCS-ID:      $Id$
 // Copyright:   (c) David Webster
 // 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/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)
+#include "wx/log.h"
+
+// ----------------------------------------------------------------------------
+// globals
+// ----------------------------------------------------------------------------
+
+extern wxWindowList wxModelessWindows;
+extern wxList WXDLLEXPORT wxPendingDelete;
+extern wxChar wxFrameClassName[];
+extern wxMenu *wxCurrentPopupMenu;
+
+// ----------------------------------------------------------------------------
+// event tables
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+    EVT_ACTIVATE(wxFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-#endif
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// static class members
+// ----------------------------------------------------------------------------
 
 #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
 
-wxFrame::wxFrame()
-{
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-
-  m_iconized = FALSE;
-
-  m_frameToolBar = NULL ;
-}
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------
 
 
-bool wxFrame::Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+void wxFrame::Init()
 {
 {
-  if (!parent)
-    wxTopLevelWindows.Append(this);
-
-  SetName(name);
-  m_windowStyle = style;
-  m_frameMenuBar = NULL;
-  m_frameToolBar = NULL ;
-  m_frameStatusBar = NULL;
-
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
+    m_bIconized = FALSE;
 
 
-  if (parent) parent->AddChild(this);
+#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;
+} // end of wxFrame::Init
+
+bool wxFrame::Create(
+  wxWindow*                         pParent
+, wxWindowID                        vId
+, const wxString&                   rsTitle
+, const wxPoint&                    rPos
+, const wxSize&                     rSize
+, long                              lulStyle
+, const wxString&                   rsName
+)
+{
+    int                             nX      = rPos.x;
+    int                             nY      = rPos.y;
+    int                             nWidth  = rSize.x;
+    int                             nHeight = rSize.y;
 
 
-  wxModelessWindows.Append(this);
+    SetName(rsName);
+    m_windowStyle    = lulStyle;
+    m_frameMenuBar   = NULL;
+    m_frameToolBar   = NULL;
+    m_frameStatusBar = NULL;
 
 
-  // TODO: create frame.
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
-  return FALSE;
-}
+    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 ulStyle.
+    //
+    if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
+        pParent = NULL;
+
+    if (!pParent)
+        wxTopLevelWindows.Append(this);
+
+    OS2Create( m_windowId
+              ,pParent
+              ,wxFrameClassName
+              ,this
+              ,rsTitle
+              ,nX
+              ,nY
+              ,nWidth
+              ,nHeight
+              ,lulStyle
+             );
+
+    wxModelessWindows.Append(this);
+    return TRUE;
+} // end of wxFrame::Create
 
 wxFrame::~wxFrame()
 {
 
 wxFrame::~wxFrame()
 {
-  wxTopLevelWindows.DeleteObject(this);
-
-  if (m_frameStatusBar)
-    delete m_frameStatusBar;
-  if (m_frameMenuBar)
-    delete m_frameMenuBar;
+    m_isBeingDeleted = TRUE;
+    wxTopLevelWindows.DeleteObject(this);
 
 
-/* Check if it's the last top-level window */
+    DeleteAllBars();
 
 
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
+    if (wxTheApp && (wxTopLevelWindows.Number() == 0))
+    {
+        wxTheApp->SetTopWindow(NULL);
 
 
-    if (wxTheApp->GetExitOnFrameDelete())
+        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)
     {
     {
-       // TODO signal to the app that we're going to close
+        if (GetParent() && GetParent()->GetHWND())
+        {
+            ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                              ,HWND_TOP
+                              ,0
+                              ,0
+                              ,0
+                              ,0
+                              ,SWP_ZORDER
+                             );
+        }
     }
     }
-  }
-
-  wxModelessWindows.DeleteObject(this);
-}
+} // end of wxFrame::~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 wxFrame::DoGetClientSize(
+  int*                              pX
+, int*                              pY
+) const
 {
 {
-    // TODO
-}
+    //
+    // 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!
+    //
+    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.yBottom += vPoint.y;
+    vRect.xRight -= vPoint.x;
+
+    if (pX)
+        *pX = vRect.xRight;
+    if (pY)
+        *pY = vRect.yBottom;
+} // 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)
-void wxFrame::SetClientSize(int width, int height)
+//
+void wxFrame::DoSetClientSize(
+  int                               nWidth
+, int                               nHeight
+)
 {
 {
-    // TODO
-}
+    HWND                            hWnd = GetHwnd();
+    HWND                            hWndClient;
+    RECTL                           vRect;
+    RECT                            vRect2;
 
 
-void wxFrame::GetSize(int *width, int *height) const
-{
-    // TODO
-}
+    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    ::WinQueryWindowRect(hWndClient, &vRect);
 
 
-void wxFrame::GetPosition(int *x, int *y) const
-{
-    // TODO
-}
+    ::WinQueryWindowRect(hWnd, &vRect2);
 
 
-void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // TODO
-}
+    //
+    // 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;
 
 
-bool wxFrame::Show(bool show)
-{
-    // TODO
-    return FALSE;
-}
+#if wxUSE_STATUSBAR
+    if ( GetStatusBar() )
+    {
+        int                         nStatusX;
+        int                         nStatusY;
 
 
-void wxFrame::Iconize(bool iconize)
+        GetStatusBar()->GetClientSize( &nStatusX
+                                      ,&nStatusY
+                                     );
+        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
+
+void wxFrame::DoGetSize(
+  int*                              pWidth
+, int*                              pHeight
+) const
 {
 {
-    // TODO
-}
+    RECTL                           vRect;
 
 
-// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
-{
-    // TODO
-}
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    *pWidth = vRect.xRight - vRect.xLeft;
+    *pHeight = vRect.yTop - vRect.yBottom;
+} // end of wxFrame::DoGetSize
 
 
-bool wxFrame::IsIconized() const
+void wxFrame::DoGetPosition(
+  int*                              pX
+, int*                              pY
+) const
 {
 {
-    // TODO
-    return FALSE;
-}
+    RECTL                           vRect;
+    POINTL                          vPoint;
 
 
-// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
-{
-    // TODO
-    return FALSE;
-}
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    vPoint.x = vRect.xLeft;
 
 
-void wxFrame::SetTitle(const wxString& title)
-{
-    // TODO
-}
+    //
+    // OS/2 is backwards [WIN32 it is vRect.yTop]
+    //
+    vPoint.y = vRect.yBottom;
 
 
-wxString wxFrame::GetTitle() const
-{
-    // TODO
-    return wxString("");
-}
+    *pX = vPoint.x;
+    *pY = vPoint.y;
+} // end of wxFrame::DoGetPosition
 
 
-void wxFrame::SetIcon(const wxIcon& icon)
+// ----------------------------------------------------------------------------
+// variations around ::ShowWindow()
+// ----------------------------------------------------------------------------
+
+void wxFrame::DoShowWindow(
+  int                               nShowCmd
+)
 {
 {
-  m_icon = icon;
-  // TODO
-}
+    ::WinShowWindow(GetHwnd(), nShowCmd);
+    m_bIconized = nShowCmd == SWP_MINIMIZE;
+} // end of wxFrame::DoShowWindow
 
 
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name)
+bool wxFrame::Show(
+  bool                              bShow
+)
 {
 {
-    wxStatusBar *statusBar = NULL;
+    DoShowWindow(bShow ? SWP_SHOW : SWP_HIDE);
 
 
-    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20),
-        style, name);
+    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
 
 
-    // Set the height according to the font and the border size
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
+void wxFrame::Iconize(
+  bool                              bIconize
+)
+{
+    DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
+} // end of wxFrame::Iconize
 
 
-    long x, y;
-    dc.GetTextExtent("X", &x, &y, NULL, NULL, NULL);
+void wxFrame::Maximize(
+  bool                              bMaximize)
+{
+    DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
+} // end of wxFrame::Maximize
 
 
-    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
+void wxFrame::Restore()
+{
+    DoShowWindow(SWP_RESTORE);
+} // end of wxFrame::Restore
 
 
-    statusBar->SetSize(-1, -1, 100, height);
+bool wxFrame::IsIconized() const
+{
+    SWP                             vSwp;
+    bool                            bIconic;
+
+    ::WinQueryWindowPos(GetHwnd(), &vSwp);
 
 
-    statusBar->SetFieldsCount(number);
-    return statusBar;
-}
+    if (vSwp.fl & SWP_MINIMIZE)
+        ((wxFrame*)this)->m_bIconized = TRUE;
+    else
+        ((wxFrame*)this)->m_bIconized = FALSE;
+    return m_bIconized;
+} // end of wxFrame::IsIconized
 
 
-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name)
+// Is it maximized?
+bool wxFrame::IsMaximized() const
 {
 {
-  // Calling CreateStatusBar twice is an error.
-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
-               "recreating status bar in wxFrame" );
+    SWP                             vSwp;
+    bool                            bIconic;
 
 
-  m_frameStatusBar = OnCreateStatusBar(number, style, id,
-    name);
-  if ( m_frameStatusBar )
-  {
-    PositionStatusBar();
-    return m_frameStatusBar;
-  }
-  else
-    return NULL;
-}
+    ::WinQueryWindowPos(GetHwnd(), &vSwp);
+    return (vSwp.fl & SWP_MAXIMIZE);
+} // end of wxFrame::IsMaximized
 
 
-void wxFrame::SetStatusText(const wxString& text, int number)
+void wxFrame::SetIcon(
+  const wxIcon&                     rIcon
+)
 {
 {
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
+    wxFrameBase::SetIcon(rIcon);
 
 
-  m_frameStatusBar->SetStatusText(text, number);
-}
-
-void wxFrame::SetStatusWidths(int n, const int widths_field[])
+    if (m_icon.Ok())
+    {
+        WinSendMsg( GetHwnd()
+                   ,WM_SETICON
+                   ,(MPARAM)((HICON)m_icon.GetHICON())
+                   ,NULL
+                  );
+    }
+} // end of wxFrame::SetIcon
+
+#if wxUSE_STATUSBAR
+wxStatusBar* wxFrame::OnCreateStatusBar(
+  int                               nNumber
+, long                              lulStyle
+, wxWindowID                        vId
+, const wxString&                   rName
+)
 {
 {
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
+    wxStatusBar*                    pStatusBar = NULL;
 
 
-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-  PositionStatusBar();
-}
+    pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
+                                                ,lulStyle
+                                                ,vId
+                                                ,rName
+                                               );
+    return pStatusBar;
+} // end of wxFrame::OnCreateStatusBar
 
 void wxFrame::PositionStatusBar()
 {
 
 void wxFrame::PositionStatusBar()
 {
-    int w, h;
-    GetClientSize(&w, &h);
-    int sw, sh;
-    m_frameStatusBar->GetSize(&sw, &sh);
-
-    // 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);
-}
+    //
+    // Native status bar positions itself
+    //
+    if (m_frameStatusBar)
+    {
+        int                         nWidth;
+        int                         nHeight;
+        int                         nStatbarWidth;
+        int                         nStatbarHeight;
+        HWND                        hWndClient;
+        RECTL                       vRect;
+
+        hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+        ::WinQueryWindowRect(hWndClient, &vRect);
+        nWidth = vRect.xRight - vRect.xLeft;
+        nHeight = vRect.yTop - vRect.yBottom;
+
+        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( 0
+                                  ,nHeight
+                                  ,nWidth
+                                  ,nStatbarHeight
+                                 );
+    }
+} // end of wxFrame::PositionStatusBar
+#endif // wxUSE_STATUSBAR
 
 
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
+void wxFrame::DetachMenuBar()
 {
 {
-    if (!menuBar)
+    if (m_frameMenuBar)
     {
     {
+        m_frameMenuBar->Detach();
         m_frameMenuBar = NULL;
         m_frameMenuBar = NULL;
-        return;
     }
     }
+} // end of wxFrame::DetachMenuBar
 
 
-    m_frameMenuBar = menuBar;
+void wxFrame::SetMenuBar(
+  wxMenuBar*                        pMenuBar
+)
+{
+    if (!pMenuBar)
+    {
+        DetachMenuBar();
+        return;
+    }
 
 
-    // TODO
-}
+    wxCHECK_RET(!pMenuBar->GetFrame(), wxT("this menubar is already attached"));
 
 
-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 (m_frameMenuBar)
+        delete m_frameMenuBar;
 
 
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-         !win->IsKindOf(CLASSINFO(wxDialog)))
+    m_hMenu = pMenuBar->Create();
+    m_ulMenubarId = pMenuBar->GetMenubarId();
+    if (m_ulMenubarId != FID_MENU)
     {
     {
-      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;
+        ::WinSetWindowUShort( m_hMenu
+                             ,QWS_ID
+                             ,(unsigned short)m_ulMenubarId
+                            );
     }
     }
-    node = node->Next();
-  }
-  SetClientSize(max_width, max_height);
-}
 
 
-// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+    if (!m_hMenu)
+        return;
+
+    InternalSetMenuBar();
+
+    m_frameMenuBar = pMenuBar;
+    pMenuBar->Attach(this);
+} // end of wxFrame::SetMenuBar
+
+void wxFrame::InternalSetMenuBar()
+{
+
+    ::WinPostMsg( GetHwnd()
+                 ,WM_UPDATEFRAME
+                 ,(MPARAM)FCF_MENU
+                 ,NULL
+                );
+} // end of wxFrame::InternalSetMenuBar
+
+//
+// Responds to colour changes, and passes event on to children
+//
+void wxFrame::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
-    if ( m_frameStatusBar )
+    if (m_frameStatusBar)
     {
     {
-        wxSysColourChangedEvent event2;
-        event2.SetEventObject( m_frameStatusBar );
-        m_frameStatusBar->ProcessEvent(event2);
+        wxSysColourChangedEvent     vEvent2;
+
+        vEvent2.SetEventObject(m_frameStatusBar);
+        m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
     }
 
     }
 
+    //
     // 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)
-{
-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-      Layout();
-      return;
-    }
-  #endif
-
-  // 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()) )
+    //
+    wxWindow::OnSysColourChanged(rEvent);
+} // end of wxFrame::OnSysColourChanged
+
+//
+// Frame window
+//
+bool wxFrame::OS2Create(
+  int                               nId
+, wxWindow*                         pParent
+, const wxChar*                     zWclass
+, wxWindow*                         pWxWin
+, const wxChar*                     zTitle
+, int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, long                              ulStyle
+)
+{
+    ULONG                           ulPmFlags = 0;
+    ULONG                           ulExtraFlags = 0;
+    ULONG                           ulTempFlags = FCF_TITLEBAR |
+                                                  FCF_SYSMENU |
+                                                  FCF_MINBUTTON |
+                                                  FCF_MAXBUTTON |
+                                                  FCF_SIZEBORDER |
+                                                  FCF_ICON |
+                                                  FCF_MENU |
+                                                  FCF_ACCELTABLE |
+                                                  FCF_SHELLPOSITION |
+                                                  FCF_TASKLIST;
+
+    m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
+
+    if ((ulStyle & wxCAPTION) == wxCAPTION)
+        ulPmFlags = FCF_TASKLIST;
+    else
+        ulPmFlags = FCF_NOMOVEWITHOWNER;
+
+    if (ulStyle & wxMINIMIZE_BOX)
+        ulPmFlags |= FCF_MINBUTTON;
+    if (ulStyle & wxMAXIMIZE_BOX)
+        ulPmFlags |= FCF_MAXBUTTON;
+    if (ulStyle & wxTHICK_FRAME)
+        ulPmFlags |= FCF_DLGBORDER;
+    if (ulStyle & wxSYSTEM_MENU)
+        ulPmFlags |= FCF_SYSMENU;
+    if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
+        ulPmFlags |= WS_MINIMIZED;
+    if (ulStyle & wxMAXIMIZE)
+        ulPmFlags |= WS_MAXIMIZED;
+    if (ulStyle & wxCAPTION)
+        ulPmFlags |= FCF_TASKLIST;
+    if (ulStyle & wxCLIP_CHILDREN)
     {
     {
-      if ( child )
-        return;     // it's our second subwindow - nothing to do
-      child = win;
+        // Invalid for frame windows under PM
     }
     }
-  }
-
-  if ( child ) {
-    // we have exactly one child - set it's size to fill the whole frame
-    int clientW, clientH;
-    GetClientSize(&clientW, &clientH);
 
 
-    int x = 0;
-    int y = 0;
-
-    child->SetSize(x, y, clientW, clientH);
-  }
-}
+    //
+    // Keep this in wxFrame because it saves recoding this function
+    // in wxTinyFrame
+    //
+#if wxUSE_ITSY_BITSY
+    if (ulStyle & wxTINY_CAPTION_VERT)
+        ulExtraFlags |= kVertCaption;
+    if (ulStyle & wxTINY_CAPTION_HORIZ)
+        ulExtraFlags |= kHorzCaption;
+#else
+    if (ulStyle & wxTINY_CAPTION_VERT)
+        ulPmFlags |= FCF_TASKLIST;
+    if (ulStyle & wxTINY_CAPTION_HORIZ)
+        ulPmFlags |= FCF_TASKLIST;
+#endif
+    if ((ulStyle & wxTHICK_FRAME) == 0)
+        ulPmFlags |= FCF_BORDER;
+    if (ulStyle & wxFRAME_TOOL_WINDOW)
+        ulExtraFlags = kFrameToolWindow;
+
+    if (ulStyle & wxSTAY_ON_TOP)
+        ulPmFlags |= FCF_SYSMODAL;
+
+    if (ulPmFlags & ulTempFlags)
+        ulPmFlags = FCF_STANDARD;
+    //
+    // Clear the visible flag, we always call show
+    //
+    ulPmFlags &= (unsigned long)~WS_VISIBLE;
+    m_bIconized = FALSE;
+    if ( !wxWindow::OS2Create( nId
+                              ,pParent
+                              ,zWclass
+                              ,pWxWin
+                              ,zTitle
+                              ,nX
+                              ,nY
+                              ,nWidth
+                              ,nHeight
+                              ,ulPmFlags
+                              ,NULL
+                              ,ulExtraFlags))
+    {
+        return FALSE;
+    }
+    return TRUE;
+} // end of wxFrame::OS2Create
 
 
+//
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
-{
-  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)))
+//
+void wxFrame::OnActivate(
+  wxActivateEvent&                  rEvent
+)
+{
+    for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+         pNode;
+         pNode = pNode->GetNext())
     {
     {
-      child->SetFocus();
-      return;
+        // 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 wxFrame::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)
-{
-    this->Destroy();
-}
-
-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
+// Checks if there is a toolbar, and returns the first free client position
+wxPoint wxFrame::GetClientAreaOrigin() const
 {
 {
-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
+    wxPoint                         vPoint(0, 0);
 
 
-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
-  if (GetStatusBar())
-  {
-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    if (GetToolBar())
     {
     {
-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
-      {
-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-        if (helpString != "")
-          SetStatusText(helpString);
-      }
-    }
-  }
-}
-
-wxMenuBar *wxFrame::GetMenuBar() const
-{
-  return m_frameMenuBar;
-}
+        int                         nWidth;
+        int                         nHeight;
 
 
-void wxFrame::Centre(int direction)
-{
-  int display_width, display_height, width, height, x, y;
-  wxDisplaySize(&display_width, &display_height);
+        GetToolBar()->GetSize( &nWidth
+                              ,&nHeight
+                             );
 
 
-  GetSize(&width, &height);
-  GetPosition(&x, &y);
+        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        {
+            vPoint.x += nWidth;
+        }
+        else
+        {
+            // PM is backwards from windows
+            vPoint.y += nHeight;
+        }
+    }
+    return vPoint;
+} // end of wxFrame::GetClientAreaOrigin
 
 
-  if (direction & wxHORIZONTAL)
-    x = (int)((display_width - width)/2);
-  if (direction & wxVERTICAL)
-    y = (int)((display_height - height)/2);
+// ----------------------------------------------------------------------------
+// tool/status bar stuff
+// ----------------------------------------------------------------------------
 
 
-  SetSize(x, y, width, height);
-}
+#if wxUSE_TOOLBAR
 
 
-// Call this to simulate a menu command
-void wxFrame::Command(int id)
+wxToolBar* wxFrame::CreateToolBar(
+  long                              lStyle
+, wxWindowID                        vId
+, const wxString&                   rName
+)
 {
 {
-  ProcessCommand(id);
-}
+    if (wxFrameBase::CreateToolBar( lStyle
+                                   ,vId
+                                   ,rName
+                                  ))
+    {
+        PositionToolBar();
+    }
+    return m_frameToolBar;
+} // end of wxFrame::CreateToolBar
 
 
-void wxFrame::ProcessCommand(int id)
+void wxFrame::PositionToolBar()
 {
 {
-  wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-  commandEvent.SetInt( id );
-  commandEvent.SetEventObject( this );
-
-  wxMenuBar *bar = GetMenuBar() ;
-  if (!bar)
-    return;
+    HWND                            hWndClient;
+    RECTL                           vRect;
 
 
-/* TODO: check the menu item if required
-  wxMenuItem *item = bar->FindItemForId(id) ;
-  if (item && item->IsCheckable())
-  {
-    bar->Check(id,!bar->Checked(id)) ;
-  }
-*/
+    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    ::WinQueryWindowRect(hWndClient, &vRect);
 
 
-  wxEvtHandler* evtHandler = GetEventHandler();
-  evtHandler->ProcessEvent(commandEvent);
-}
+#if wxUSE_STATUSBAR
+    if (GetStatusBar())
+    {
+        int                         nStatusX;
+        int                         nStatusY;
+
+        GetStatusBar()->GetClientSize( &nStatusX
+                                      ,&nStatusY
+                                     );
+        // PM is backwards from windows
+        vRect.yBottom += nStatusY;
+    }
+#endif // wxUSE_STATUSBAR
 
 
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
-{
-    wxPoint pt(0, 0);
-    if (GetToolBar())
+    if ( GetToolBar() )
     {
     {
-        int w, h;
-        GetToolBar()->GetSize(& w, & h);
+        int                         nToolbarWidth;
+        int                         nToolbarHeight;
+
+        GetToolBar()->GetSize( &nToolbarWidth
+                              ,&nToolbarHeight
+                             );
 
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
 
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
-            pt.x += w;
+            nToolbarHeight = vRect.yBottom;
         }
         else
         {
         }
         else
         {
-            pt.y += h;
+            nToolbarWidth = vRect.xRight;
         }
         }
-    }
-    return pt;
-}
 
 
-void wxFrame::ScreenToClient(int *x, int *y) const
+        //
+        // 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/...)
+// ----------------------------------------------------------------------------
+
+//
+// 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
+)
 {
 {
-    wxWindow::ScreenToClient(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;
-}
+    for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+         pNode;
+         pNode = pNode->GetNext() )
+    {
+        wxWindow*                   pWin = pNode->GetData();
 
 
-void wxFrame::ClientToScreen(int *x, int *y) const
+        if (pWin->IsKindOf(CLASSINFO(wxFrame)) )
+        {
+            ((wxFrame *)pWin)->Iconize(bIconize);
+        }
+    }
+} // end of wxFrame::IconizeChildFrames
+
+// ===========================================================================
+// message processing
+// ===========================================================================
+
+// ---------------------------------------------------------------------------
+// preprocessing
+// ---------------------------------------------------------------------------
+bool wxFrame::OS2TranslateMessage(
+  WXMSG*                            pMsg
+)
 {
 {
-    // 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::ClientToScreen(x, y);
-}
-
-wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
+    if (wxWindow::OS2TranslateMessage(pMsg))
+        return TRUE;
+    //
+    // try the menu bar accels
+    //
+    wxMenuBar*                      pMenuBar = GetMenuBar();
+
+    if (!pMenuBar )
+        return FALSE;
+
+    const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
+    return rAcceleratorTable.Translate(this, pMsg);
+} // end of wxFrame::OS2TranslateMessage
+
+// ---------------------------------------------------------------------------
+// our private (non virtual) message handlers
+// ---------------------------------------------------------------------------
+bool wxFrame::HandlePaint()
 {
 {
-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
-               "recreating toolbar in wxFrame" );
+    RECTL                           vRect;
 
 
-    wxToolBar* toolBar = OnCreateToolBar(style, id, name);
-    if (toolBar)
+    if (::WinQueryUpdateRect(GetHwnd(), &vRect))
     {
     {
-        SetToolBar(toolBar);
-        PositionToolBar();
-        return toolBar;
+        if (m_bIconized)
+        {
+            //
+            // Icons in PM are the same as "pointers"
+            //
+            HPOINTER                hIcon;
+
+            if (m_icon.Ok())
+                hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), 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;
+
+                hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+                ::WinQueryWindowRect(hWndClient, &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
+        {
+            return wxWindow::HandlePaint();
+        }
     }
     else
     {
     }
     else
     {
-        return NULL;
+        // nothing to paint - processed
+        return TRUE;
     }
     }
-}
-
-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
-{
-    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
-}
+    return FALSE;
+} // end of wxFrame::HandlePaint
 
 
-void wxFrame::PositionToolBar()
+bool wxFrame::HandleSize(
+  int                               nX
+, int                               nY
+, WXUINT                            nId
+)
 {
 {
-    int cw, ch;
+    bool                            bProcessed = FALSE;
 
 
-    // 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.
+    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);
+
+            //
+            // fall through
+            //
+
+        case kSizeMax:
+            m_bIconized = FALSE;
+            break;
+
+        case kSizeMin:
+            //
+            // Iconize all child frames too
+            //
+            IconizeChildFrames(TRUE);
+            m_bIconized = TRUE;
+            break;
+    }
 
 
-    GetClientSize(& cw, &ch);
+    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
 
 
-    if ( GetStatusBar() )
+        PositionStatusBar();
+        PositionToolBar();
+        wxSizeEvent                 vEvent( wxSize( nX
+                                                   ,nY
+                                                  )
+                                           ,m_windowId
+                                          );
+
+        vEvent.SetEventObject(this);
+        bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+    }
+    return bProcessed;
+} // end of wxFrame::HandleSize
+
+bool wxFrame::HandleCommand(
+  WXWORD                            nId
+, WXWORD                            nCmd
+, WXHWND                            hControl
+)
+{
+    if (hControl)
     {
     {
-      int statusX, statusY;
-      GetStatusBar()->GetClientSize(&statusX, &statusY);
-      ch -= statusY;
+        //
+        // In case it's e.g. a toolbar.
+        //
+        wxWindow*                   pWin = wxFindWinFromHandle(hControl);
+
+        if (pWin)
+            return pWin->OS2Command( nCmd
+                                    ,nId
+                                   );
     }
 
     }
 
-    if (GetToolBar())
+    //
+    // Handle here commands from menus and accelerators
+    //
+    if (nCmd == 0 || nCmd == 1)
     {
     {
-        int tw, th;
-        GetToolBar()->GetSize(& tw, & th);
-
-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        if (wxCurrentPopupMenu)
         {
         {
-            // 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);
+            wxMenu*                 pPopupMenu = wxCurrentPopupMenu;
+
+            wxCurrentPopupMenu = NULL;
+
+            return pPopupMenu->OS2Command( nCmd
+                                          ,nId
+                                         );
         }
         }
-        else
+
+        if (ProcessCommand(nId))
         {
         {
-            // Use the 'real' position
-            GetToolBar()->SetSize(0, 0, cw, th, wxSIZE_NO_ADJUSTMENTS);
+            return TRUE;
         }
     }
         }
     }
-}
+    return FALSE;
+} // end of wxFrame::HandleCommand
+
+bool wxFrame::HandleMenuSelect(
+  WXWORD                            nItem
+, WXWORD                            nFlags
+, WXHMENU                           hMenu
+)
+{
+    int                             nMenuItem;
+
+    if (nFlags == 0xFFFF && hMenu == 0)
+    {
+        //
+        // Menu was removed from screen
+        //
+        nMenuItem = -1;
+    }
+    else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR))
+    {
+        nMenuItem = nItem;
+    }
+    else
+    {
+        //
+        // Don't give hints for separators (doesn't make sense) nor for the
+        // items opening popup menus (they don't have them anyhow)
+        //
+        return FALSE;
+    }
+    wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem);
+
+    vEvent.SetEventObject(this);
+    return GetEventHandler()->ProcessEvent(vEvent);
+} // end of wxFrame::HandleMenuSelect
+
+// ---------------------------------------------------------------------------
+// the window proc for wxFrame
+// ---------------------------------------------------------------------------
+
+MRESULT wxFrame::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_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
+                                             );
+            }
+            break;
+
+        case WM_PAINT:
+            bProcessed = HandlePaint();
+            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;
+
+        case WM_SIZE:
+            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
+            break;
+    }
+
+    if (!bProcessed )
+        mRc = wxWindow::OS2WindowProc( uMessage
+                                      ,wParam
+                                      ,lParam
+                                     );
+    return (MRESULT)0;
+} // wxFrame::OS2WindowProc
 
 
wxWidgets (Impactor)