Added some WXDLLEXPORTs

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index f3faceb427628e10d4d7e47c1b518561030b8081..f21c945ae65d5bf4306eaa2cd4eda96dff0edf68 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp

-// Purpose:     wxFrame
+// Purpose:     wxFrameOS2

 // Author:      David Webster
 // Modified by:
 // Created:     10/27/99
 // Author:      David Webster
 // Modified by:
 // Created:     10/27/99


@@ -13,6 +13,15 @@
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
 #include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP

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

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


@@ -46,16 +55,24 @@ extern wxList WXDLLEXPORT wxPendingDelete;
 extern wxChar wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 
 extern wxChar wxFrameClassName[];
 extern wxMenu *wxCurrentPopupMenu;
 

+extern void  wxAssociateWinWithHandle( HWND      hWnd
+                                      ,wxWindow* pWin
+                                     );
+

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

-BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
-    EVT_ACTIVATE(wxFrame::OnActivate)
-    EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+BEGIN_EVENT_TABLE(wxFrameOS2, wxFrameBase)
+    EVT_ACTIVATE(wxFrameOS2::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxFrameOS2::OnSysColourChanged)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameOS2, wxWindow)
+
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW)
+#endif

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -64,18 +81,21 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 // ----------------------------------------------------------------------------
 // static class members
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static class members
 // ----------------------------------------------------------------------------

+#if wxUSE_STATUSBAR

 
 #if wxUSE_NATIVE_STATUSBAR
 
 #if wxUSE_NATIVE_STATUSBAR

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

 #else
 #else

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

 #endif
 
 #endif
 

+#endif //wxUSE_STATUSBAR
+

 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 

-void wxFrame::Init()
+void wxFrameOS2::Init()

 {
     m_bIconized = FALSE;
 
 {
     m_bIconized = FALSE;
 


@@ -90,6 +110,13 @@ void wxFrame::Init()
     m_nFsToolBarHeight   = 0;
     m_bFsIsMaximized     = FALSE;
     m_bFsIsShowing       = FALSE;
     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
 
     //
     // Initialize SWP's


@@ -102,9 +129,9 @@ void wxFrame::Init()
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));
     memset(&m_vSwpVScroll, 0, sizeof(SWP));
     memset(&m_vSwpStatusBar, 0, sizeof(SWP));
     memset(&m_vSwpToolBar, 0, sizeof(SWP));

-} // end of wxFrame::Init
+} // end of wxFrameOS2::Init

 
 

-bool wxFrame::Create(
+bool wxFrameOS2::Create(

   wxWindow*                         pParent
 , wxWindowID                        vId
 , const wxString&                   rsTitle
   wxWindow*                         pParent
 , wxWindowID                        vId
 , const wxString&                   rsTitle


@@ -118,12 +145,18 @@ bool wxFrame::Create(
     int                             nY      = rPos.y;
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;
     int                             nY      = rPos.y;
     int                             nWidth  = rSize.x;
     int                             nHeight = rSize.y;

+    bool                            bOk = FALSE;

 
     SetName(rsName);
     m_windowStyle    = lulStyle;
     m_frameMenuBar   = NULL;
 
     SetName(rsName);
     m_windowStyle    = lulStyle;
     m_frameMenuBar   = NULL;

+#if wxUSE_TOOLBAR

     m_frameToolBar   = NULL;
     m_frameToolBar   = NULL;

+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif //wxUSE_STATUSBAR

 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 


@@ -140,28 +173,30 @@ bool wxFrame::Create(
     if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
         pParent = NULL;
 
     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
+    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

 
 

-wxFrame::~wxFrame()
+wxFrameOS2::~wxFrameOS2()

 {
     m_isBeingDeleted = TRUE;
 {
     m_isBeingDeleted = TRUE;

+

     wxTopLevelWindows.DeleteObject(this);
 
     DeleteAllBars();
     wxTopLevelWindows.DeleteObject(this);
 
     DeleteAllBars();


@@ -172,9 +207,10 @@ wxFrame::~wxFrame()
 
         if (wxTheApp->GetExitOnFrameDelete())
         {
 
         if (wxTheApp->GetExitOnFrameDelete())
         {

-            ::WinPostMsg(m_hFrame, WM_QUIT, 0, 0);
+            ::WinPostMsg(NULL, WM_QUIT, 0, 0);

         }
     }
         }
     }

+

     wxModelessWindows.DeleteObject(this);
 
     //
     wxModelessWindows.DeleteObject(this);
 
     //


@@ -199,57 +235,36 @@ wxFrame::~wxFrame()
                              );
         }
     }
                              );
         }
     }

-} // end of wxFrame::~wxFrame
+} // 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::DoGetClientSize(
+void wxFrameOS2::DoGetClientSize(

   int*                              pX
 , int*                              pY
 ) const
 {
   int*                              pX
 , int*                              pY
 ) const
 {

-    //
-    // OS/2 PM's coordinates go from bottom-left not
-    // top-left thus the += instead of the -=
-    //

     RECTL                           vRect;
     RECTL                           vRect;

+    ::WinQueryWindowRect(GetHwnd(), &vRect);

 
     //
 
     //

-    // PM has no GetClientRect that inherantly knows about the client window
-    // We have to explicitly go fetch it!
+    // No need to use statusbar code as in WIN32 as the FORMATFRAME
+    // window procedure ensures PM knows about the new frame client
+    // size internally.  A ::WinQueryWindowRect is all that is needed!

     //
     //

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

 
     if (pX)
 
     if (pX)

-        *pX = vRect.xRight;
+        *pX = vRect.xRight - vRect.xLeft;

     if (pY)
     if (pY)

-        *pY = vRect.yBottom;
-} // end of wxFrame::DoGetClientSize
+        *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::DoSetClientSize(
+void wxFrameOS2::DoSetClientSize(

   int                               nWidth
 , int                               nHeight
 )
   int                               nWidth
 , int                               nHeight
 )


@@ -259,8 +274,7 @@ void wxFrame::DoSetClientSize(
     RECTL                           vRect2;
 
     ::WinQueryWindowRect(GetHwnd(), &vRect);
     RECTL                           vRect2;
 
     ::WinQueryWindowRect(GetHwnd(), &vRect);

-
-    ::WinQueryWindowRect(m_hFrame, &vRect2);
+    ::WinQueryWindowRect(GetHwnd(), &vRect2);

 
     //
     // Find the difference between the entire window (title bar and all)
 
     //
     // Find the difference between the entire window (title bar and all)


@@ -290,9 +304,9 @@ void wxFrame::DoSetClientSize(
     POINTL                          vPointl;
 
     vPointl.x = vRect2.xLeft;
     POINTL                          vPointl;
 
     vPointl.x = vRect2.xLeft;

-    vPoint.y  = vRect2.yTop;
+    vPointl.y  = vRect2.yTop;

 
 

-    ::WinSetWindowPos( m_hFrame
+    ::WinSetWindowPos( hWnd

                       ,HWND_TOP
                       ,vPointl.x
                       ,vPointl.y
                       ,HWND_TOP
                       ,vPointl.x
                       ,vPointl.y


@@ -308,9 +322,9 @@ void wxFrame::DoSetClientSize(
                                           );
     vEvent.SetEventObject(this);
     GetEventHandler()->ProcessEvent(vEvent);
                                           );
     vEvent.SetEventObject(this);
     GetEventHandler()->ProcessEvent(vEvent);

-} // end of wxFrame::DoSetClientSize
+} // end of wxFrameOS2::DoSetClientSize

 
 

-void wxFrame::DoGetSize(
+void wxFrameOS2::DoGetSize(

   int*                              pWidth
 , int*                              pHeight
 ) const
   int*                              pWidth
 , int*                              pHeight
 ) const


@@ -320,9 +334,9 @@ void wxFrame::DoGetSize(
     ::WinQueryWindowRect(m_hFrame, &vRect);
     *pWidth = vRect.xRight - vRect.xLeft;
     *pHeight = vRect.yTop - vRect.yBottom;
     ::WinQueryWindowRect(m_hFrame, &vRect);
     *pWidth = vRect.xRight - vRect.xLeft;
     *pHeight = vRect.yTop - vRect.yBottom;

-} // end of wxFrame::DoGetSize
+} // end of wxFrameOS2::DoGetSize

 
 

-void wxFrame::DoGetPosition(
+void wxFrameOS2::DoGetPosition(

   int*                              pX
 , int*                              pY
 ) const
   int*                              pX
 , int*                              pY
 ) const


@@ -331,45 +345,24 @@ void wxFrame::DoGetPosition(
     POINTL                          vPoint;
 
     ::WinQueryWindowRect(m_hFrame, &vRect);
     POINTL                          vPoint;
 
     ::WinQueryWindowRect(m_hFrame, &vRect);

-    vPoint.x = vRect.xLeft;
-
-    //
-    // OS/2 is backwards [WIN32 it is vRect.yTop]
-    //
-    vPoint.y = vRect.yBottom;

 
 

-    *pX = vPoint.x;
-    *pY = vPoint.y;
-} // end of wxFrame::DoGetPosition
+    *pX = vRect.xRight - vRect.xLeft;
+    *pY = vRect.yTop - vRect.yBottom;
+} // end of wxFrameOS2::DoGetPosition

 
 // ----------------------------------------------------------------------------
 // variations around ::ShowWindow()
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // variations around ::ShowWindow()
 // ----------------------------------------------------------------------------
 

-void wxFrame::DoShowWindow(
+void wxFrameOS2::DoShowWindow(

   int                               bShowCmd
 )
 {
   int                               bShowCmd
 )
 {

-    HWND                            hClient = NULLHANDLE;
-    SWP                             vSwp;
-
-    //
-    // Reset the window position
-    //
-    WinQueryWindowPos(m_hFrame, &vSwp);
-    WinSetWindowPos( GetHwnd()
-                    ,HWND_TOP
-                    ,vSwp.x
-                    ,vSwp.y
-                    ,vSwp.cx
-                    ,vSwp.cy
-                    ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
-                   );

     ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
     ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);

-    ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
-} // end of wxFrame::DoShowWindow
+    m_bIconized = bShowCmd == SWP_MINIMIZE;
+} // end of wxFrameOS2::DoShowWindow

 
 

-bool wxFrame::Show(
+bool wxFrameOS2::Show(

   bool                              bShow
 )
 {
   bool                              bShow
 )
 {


@@ -383,6 +376,7 @@ bool wxFrame::Show(
 
         ::WinQueryWindowPos(m_hFrame, &vSwp);
         m_bIconized = vSwp.fl & SWP_MINIMIZE;
 
         ::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);
         ::WinEnableWindow(m_hFrame, TRUE);
         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);


@@ -411,51 +405,50 @@ bool wxFrame::Show(
         }
     }
     return TRUE;
         }
     }
     return TRUE;

-} // end of wxFrame::Show
+} // end of wxFrameOS2::Show

 
 

-void wxFrame::Iconize(
+void wxFrameOS2::Iconize(

   bool                              bIconize
 )
 {
     DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);
   bool                              bIconize
 )
 {
     DoShowWindow(bIconize ? SWP_MINIMIZE : SWP_RESTORE);

-} // end of wxFrame::Iconize
+} // end of wxFrameOS2::Iconize

 
 

-void wxFrame::Maximize(
+void wxFrameOS2::Maximize(

   bool                              bMaximize)
 {
     DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);
   bool                              bMaximize)
 {
     DoShowWindow(bMaximize ? SWP_MAXIMIZE : SWP_RESTORE);

-} // end of wxFrame::Maximize
+} // end of wxFrameOS2::Maximize

 
 

-void wxFrame::Restore()
+void wxFrameOS2::Restore()

 {
     DoShowWindow(SWP_RESTORE);
 {
     DoShowWindow(SWP_RESTORE);

-} // end of wxFrame::Restore
+} // end of wxFrameOS2::Restore

 
 

-bool wxFrame::IsIconized() const
+bool wxFrameOS2::IsIconized() const

 {
     SWP                             vSwp;
 {
     SWP                             vSwp;

-    bool                            bIconic;

 
 

-    ::WinQueryWindowPos(GetHwnd(), &vSwp);
+    ::WinQueryWindowPos(m_hFrame, &vSwp);

 
     if (vSwp.fl & SWP_MINIMIZE)
         ((wxFrame*)this)->m_bIconized = TRUE;
     else
         ((wxFrame*)this)->m_bIconized = FALSE;
     return m_bIconized;
 
     if (vSwp.fl & SWP_MINIMIZE)
         ((wxFrame*)this)->m_bIconized = TRUE;
     else
         ((wxFrame*)this)->m_bIconized = FALSE;
     return m_bIconized;

-} // end of wxFrame::IsIconized
+} // end of wxFrameOS2::IsIconized

 
 // Is it maximized?
 
 // Is it maximized?

-bool wxFrame::IsMaximized() const
+bool wxFrameOS2::IsMaximized() const

 {
     SWP                             vSwp;
     bool                            bIconic;
 
     ::WinQueryWindowPos(m_hFrame, &vSwp);
     return (vSwp.fl & SWP_MAXIMIZE);
 {
     SWP                             vSwp;
     bool                            bIconic;
 
     ::WinQueryWindowPos(m_hFrame, &vSwp);
     return (vSwp.fl & SWP_MAXIMIZE);

-} // end of wxFrame::IsMaximized
+} // end of wxFrameOS2::IsMaximized

 
 

-void wxFrame::SetIcon(
+void wxFrameOS2::SetIcon(

   const wxIcon&                     rIcon
 )
 {
   const wxIcon&                     rIcon
 )
 {


@@ -474,10 +467,10 @@ void wxFrame::SetIcon(
                      ,(MPARAM)0
                     );
     }
                      ,(MPARAM)0
                     );
     }

-} // end of wxFrame::SetIcon
+} // end of wxFrameOS2::SetIcon

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

-wxStatusBar* wxFrame::OnCreateStatusBar(
+wxStatusBar* wxFrameOS2::OnCreateStatusBar(

   int                               nNumber
 , long                              lulStyle
 , wxWindowID                        vId
   int                               nNumber
 , long                              lulStyle
 , wxWindowID                        vId


@@ -488,55 +481,33 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
     SWP                             vSwp;
     ERRORID                         vError;
     wxString                        sError;
     SWP                             vSwp;
     ERRORID                         vError;
     wxString                        sError;

-    HWND                            hWnd;

 
     pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
                                                 ,lulStyle
                                                 ,vId
                                                 ,rName
 
     pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber
                                                 ,lulStyle
                                                 ,vId
                                                 ,rName

-                                               );
-    //
-    // The default parent set for the Statusbar is m_hWnd which, of course,
-    // is the handle to the client window of the frame.  We don't want that,
-    // so we have to set the parent to actually be the Frame.
-    //
-    hWnd = pStatusBar->GetHWND();
-    if (!::WinSetParent(hWnd, m_hFrame, FALSE))
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-        wxLogError("Error setting parent for statusbar. Error: %s\n", sError);
+                                                 );
+
+    if( !pStatusBar )

         return NULL;
         return NULL;

-    }

 
 

+    ::WinSetParent( pStatusBar->GetHWND()
+                   ,m_hFrame
+                   ,FALSE
+                  );
+    ::WinSetOwner( pStatusBar->GetHWND()
+                  ,m_hFrame
+                 );

     //
     //

-    // Also we need to reset it positioning to enable the SHOW attribute
+    // to show statusbar

     //
     //

-    if (!::WinQueryWindowPos((HWND)pStatusBar->GetHWND(), &vSwp))
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-        wxLogError("Error querying frame for statusbar position. Error: %s\n", sError);
-        return NULL;
-    }
-    if (!::WinSetWindowPos( (HWND)pStatusBar->GetHWND()
-                           ,HWND_TOP
-                           ,vSwp.cx
-                           ,vSwp.cy
-                           ,vSwp.x
-                           ,vSwp.y
-                           ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER
-                          ))
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-        wxLogError("Error setting statusbar position. Error: %s\n", sError);
-        return NULL;
-    }
+    if(::WinIsWindowShowing(m_hFrame))
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+

     return pStatusBar;
     return pStatusBar;

-} // end of wxFrame::OnCreateStatusBar
+} // end of wxFrameOS2::OnCreateStatusBar

 
 

-void wxFrame::PositionStatusBar()
+void wxFrameOS2::PositionStatusBar()

 {
     SWP                             vSwp;
     ERRORID                         vError;
 {
     SWP                             vSwp;
     ERRORID                         vError;


@@ -548,15 +519,17 @@ void wxFrame::PositionStatusBar()
     if (m_frameStatusBar)
     {
         int                         nWidth;
     if (m_frameStatusBar)
     {
         int                         nWidth;

-        int                         nHeight;

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

+        RECTL                       vFRect;

 
 

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

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

-        nHeight = vRect.yTop - vRect.yBottom;

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


@@ -566,8 +539,8 @@ void wxFrame::PositionStatusBar()
         // Since we wish the status bar to be directly under the client area,
         // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
         //
         // Since we wish the status bar to be directly under the client area,
         // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
         //

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

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


@@ -575,44 +548,28 @@ void wxFrame::PositionStatusBar()
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);
         {
             vError = ::WinGetLastError(vHabmain);
             sError = wxPMErrorToStr(vError);

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

             return;
         }
     }
             return;
         }
     }

-} // end of wxFrame::PositionStatusBar
+} // end of wxFrameOS2::PositionStatusBar

 #endif // wxUSE_STATUSBAR
 
 #endif // wxUSE_STATUSBAR
 

-void wxFrame::DetachMenuBar()
+void wxFrameOS2::DetachMenuBar()

 {
     if (m_frameMenuBar)
     {
         m_frameMenuBar->Detach();
         m_frameMenuBar = NULL;
     }
 {
     if (m_frameMenuBar)
     {
         m_frameMenuBar->Detach();
         m_frameMenuBar = NULL;
     }

-} // end of wxFrame::DetachMenuBar
+} // end of wxFrameOS2::DetachMenuBar

 
 

-void wxFrame::SetMenuBar(
+void wxFrameOS2::SetMenuBar(

   wxMenuBar*                        pMenuBar
 )
 {
     ERRORID                         vError;
     wxString                        sError;
   wxMenuBar*                        pMenuBar
 )
 {
     ERRORID                         vError;
     wxString                        sError;

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

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


@@ -626,29 +583,81 @@ void wxFrame::SetMenuBar(
     if (!pMenuBar)
     {
         DetachMenuBar();
     if (!pMenuBar)
     {
         DetachMenuBar();

-        return;
+
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();
+    }
+    else // set new non NULL menu bar
+    {
+        m_frameMenuBar = NULL;
+
+        //
+        // Can set a menubar several times.
+        // TODO: how to prevent a memory leak if you have a currently-unattached
+        // menubar? wxWindows assumes that the frame will delete the menu (otherwise
+        // there are problems for MDI).
+        //
+        if (pMenuBar->GetHMenu())
+        {
+            m_hMenu = pMenuBar->GetHMenu();
+        }
+        else
+        {
+            pMenuBar->Detach();
+            m_hMenu = pMenuBar->Create();
+            if (!m_hMenu)
+                return;
+        }
+        InternalSetMenuBar();
+        m_frameMenuBar = pMenuBar;
+        pMenuBar->Attach((wxFrame*)this);

     }
     }

+} // end of wxFrameOS2::SetMenuBar

 
 

-    m_frameMenuBar = NULL;
+void wxFrameOS2::AttachMenuBar(
+  wxMenuBar*                        pMenubar
+)
+{
+    m_frameMenuBar = pMenubar;

 
 

-    // 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())
+    if (!pMenubar)

     {
     {

-        m_hMenu = pMenuBar->GetHMenu();
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();

     }
     }

-    else
+    else // Set new non NULL menu bar

     {
     {

-        pMenuBar->Detach();
+        //
+        // Can set a menubar several times.
+        //
+        if (pMenubar->GetHMenu())
+        {
+            m_hMenu = pMenubar->GetHMenu();
+        }
+        else
+        {
+            if (pMenubar->IsAttached())
+                pMenubar->Detach();

 
 

-        m_hMenu = pMenuBar->Create();
+            m_hMenu = pMenubar->Create();

 
 

-        if (!m_hMenu)
-            return;
+            if (!m_hMenu)
+                return;
+        }
+        InternalSetMenuBar();

     }
     }

+} // end of wxFrameOS2::AttachMenuBar

 
 

+void wxFrameOS2::InternalSetMenuBar()
+{
+    ERRORID                         vError;
+    wxString                        sError;

     //
     // Set the parent and owner of the menubar to be the frame
     //
     //
     // Set the parent and owner of the menubar to be the frame
     //


@@ -665,48 +674,20 @@ void wxFrame::SetMenuBar(
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }
         sError = wxPMErrorToStr(vError);
         wxLogError("Error setting parent for submenu. Error: %s\n", sError);
     }

-    InternalSetMenuBar();
-
-    m_frameMenuBar = pMenuBar;
-    pMenuBar->Attach(this);
-
-    //
-    // Now resize the client to fit the new frame
-    //
-    WinQueryWindowPos(m_hFrame, &vSwp);
-    hTitlebar = WinWindowFromID(m_hFrame, FID_TITLEBAR);
-    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
-    hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL);
-    WinQueryWindowPos(hHScroll, &vSwpHScroll);
-    hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL);
-    WinQueryWindowPos(hVScroll, &vSwpVScroll);
-    hMenuBar = WinWindowFromID(m_hFrame, FID_MENU);
-    WinQueryWindowPos(hMenuBar, &vSwpMenu);
-    WinSetWindowPos( GetHwnd()
-                    ,HWND_TOP
-                    ,SV_CXSIZEBORDER/2
-                    ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2
-                    ,vSwp.cx - ((SV_CXSIZEBORDER + 1) + vSwpVScroll.cx)
-                    ,vSwp.cy - ((SV_CYSIZEBORDER + 1) + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy/2)
-                    ,SWP_SIZE | SWP_MOVE
-                   );
-} // end of wxFrame::SetMenuBar
-
-void wxFrame::InternalSetMenuBar()
-{
-    WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
-} // end of wxFrame::InternalSetMenuBar
+    ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+} // end of wxFrameOS2::InternalSetMenuBar

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

-void wxFrame::OnSysColourChanged(
+void wxFrameOS2::OnSysColourChanged(

   wxSysColourChangedEvent&          rEvent
 )
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
   wxSysColourChangedEvent&          rEvent
 )
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 

+#if wxUSE_STATUSBAR

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


@@ -714,99 +695,150 @@ void wxFrame::OnSysColourChanged(
         vEvent2.SetEventObject(m_frameStatusBar);
         m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
     }
         vEvent2.SetEventObject(m_frameStatusBar);
         m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);
     }

+#endif //wxUSE_STATUSBAR

 
     //
     // Propagate the event to the non-top-level children
     //
     wxWindow::OnSysColourChanged(rEvent);
 
     //
     // Propagate the event to the non-top-level children
     //
     wxWindow::OnSysColourChanged(rEvent);

-} // end of wxFrame::OnSysColourChanged
+} // end of wxFrameOS2::OnSysColourChanged

 
 // Pass TRUE to show full screen, FALSE to restore.
 
 // Pass TRUE to show full screen, FALSE to restore.

-bool wxFrame::ShowFullScreen(
+bool wxFrameOS2::ShowFullScreen(

   bool                              bShow
 , long                              lStyle
 )
 {
   bool                              bShow
 , long                              lStyle
 )
 {

-    /*
-    // TODO
-    if (show)
+    if (bShow)

     {
         if (IsFullScreen())
             return FALSE;
 
     {
         if (IsFullScreen())
             return FALSE;
 

-        m_fsIsShowing = TRUE;
-        m_fsStyle = style;
+        m_bFsIsShowing = TRUE;
+        m_lFsStyle = lStyle;

 
 

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

 
 

-        int dummyWidth;
+        int                         nDummyWidth;

 
 

-        if (theToolBar)
-            theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
-        if (theStatusBar)
-            theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+#if wxUSE_TOOLBAR
+        if (pTheToolBar)
+            pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+#endif //wxUSE_TOOLBAR

 
 

-        // zap the toolbar, menubar, and statusbar
+#if wxUSE_STATUSBAR
+        if (pTheStatusBar)
+            pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
+#endif //wxUSE_STATUSBAR

 
 

-        if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar)
+#if wxUSE_TOOLBAR
+        //
+        // Zap the toolbar, menubar, and statusbar
+        //
+        if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)

         {
         {

-            theToolBar->SetSize(-1,0);
-            theToolBar->Show(FALSE);
+            pTheToolBar->SetSize(-1,0);
+            pTheToolBar->Show(FALSE);

         }
         }

+#endif //wxUSE_TOOLBAR

 
 

-        if (style & wxFULLSCREEN_NOMENUBAR)
-            SetMenu((HWND)GetHWND(), (HMENU) NULL);
+        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
         // Save the number of fields in the statusbar

-        if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar)
+        //
+        if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)

         {
         {

-            m_fsStatusBarFields = theStatusBar->GetFieldsCount();
+            m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();

             SetStatusBar((wxStatusBar*) NULL);
             SetStatusBar((wxStatusBar*) NULL);

-                delete theStatusBar;
+            delete pTheStatusBar;

         }
         else
         }
         else

-            m_fsStatusBarFields = 0;
+            m_nFsStatusBarFields = 0;
+#endif //wxUSE_STATUSBAR

 
 

-        // zap the frame borders
+        //
+        // Zap the frame borders
+        //

 
 

-        // save the 'normal' window style
-        m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
+        //
+        // Save the 'normal' window style
+        //
+        m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE);

 
 

-           // save the old position, width & height, maximize state
-        m_fsOldSize = GetRect();
-            m_fsIsMaximized = IsMaximized();
+        //
+        // Save the old position, width & height, maximize state
+        //
+        m_vFsOldSize = GetRect();
+        m_bFsIsMaximized = IsMaximized();

 
 

-           // decide which window style flags to turn off
-        LONG newStyle = m_fsOldWindowStyle;
-        LONG offFlags = 0;
+        //
+        // Decide which window style flags to turn off
+        //
+        LONG                        lNewStyle = m_lFsOldWindowStyle;
+        LONG                        lOffFlags = 0;

 
 

-        if (style & wxFULLSCREEN_NOBORDER)
-            offFlags |= WS_BORDER;
-        if (style & wxFULLSCREEN_NOCAPTION)
-            offFlags |= (WS_CAPTION | WS_SYSMENU);
+        if (lStyle & wxFULLSCREEN_NOBORDER)
+            lOffFlags |= FCF_BORDER;
+        if (lStyle & wxFULLSCREEN_NOCAPTION)
+            lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU);

 
 

-        newStyle &= (~offFlags);
+        lNewStyle &= (~lOffFlags);

 
 

-        // change our window style to be compatible with full-screen mode
-        SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
+        //
+        // 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 width, height;
+        //
+        // Resize to the size of the desktop
+        int                         nWidth;
+        int                         nHeight;

 
 

-        RECT rect;
-        ::GetWindowRect(GetDesktopWindow(), &rect);
-        width = rect.right - rect.left;
-        height = rect.bottom - rect.top;
+        RECTL                       vRect;

 
 

-        SetSize(width, height);
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nWidth = vRect.xRight - vRect.xLeft;
+        //
+        // Rmember OS/2 is backwards!
+        //
+        nHeight = vRect.yTop - vRect.yBottom;

 
 

-        // now flush the window style cache and actually go full-screen
-        SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
+        SetSize( nWidth
+                ,nHeight
+               );

 
 

-        wxSizeEvent event(wxSize(width, height), GetId());
-        GetEventHandler()->ProcessEvent(event);
+        //
+        // Now flush the window style cache and actually go full-screen
+        //
+        ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                          ,HWND_TOP
+                          ,0
+                          ,0
+                          ,nWidth
+                          ,nHeight
+                          ,SWP_SIZE | SWP_SHOW
+                         );
+
+        wxSizeEvent                 vEvent( wxSize( nWidth
+                                                   ,nHeight
+                                                  )
+                                           ,GetId()
+                                          );

 
 

+        GetEventHandler()->ProcessEvent(vEvent);

         return TRUE;
     }
     else
         return TRUE;
     }
     else


@@ -814,41 +846,57 @@ bool wxFrame::ShowFullScreen(
         if (!IsFullScreen())
             return FALSE;
 
         if (!IsFullScreen())
             return FALSE;
 

-        m_fsIsShowing = FALSE;
+        m_bFsIsShowing = FALSE;

 
 

-        wxToolBar *theToolBar = GetToolBar();
+#if wxUSE_TOOLBAR
+        wxToolBar*                  pTheToolBar = GetToolBar();

 
 

-        // restore the toolbar, menubar, and statusbar
-        if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR))
+        //
+        // Restore the toolbar, menubar, and statusbar
+        //
+        if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))

         {
         {

-            theToolBar->SetSize(-1, m_fsToolBarHeight);
-            theToolBar->Show(TRUE);
+            pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
+            pTheToolBar->Show(TRUE);

         }
         }

+#endif //wxUSE_TOOLBAR

 
 

-        if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0))
+#if wxUSE_STATUSBAR
+        if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))

         {
         {

-            CreateStatusBar(m_fsStatusBarFields);
-            PositionStatusBar();
+            CreateStatusBar(m_nFsStatusBarFields);
+//          PositionStatusBar();

         }
         }

+#endif //wxUSE_STATUSBAR

 
 

-        if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
-            SetMenu((HWND)GetHWND(), (HMENU)m_hMenu);
-
-        Maximize(m_fsIsMaximized);
-        SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
-        SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
-            m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
-
+        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;
     }
         return TRUE;
     }

-*/
-    return TRUE;
-} // end of wxFrame::ShowFullScreen
+} // end of wxFrameOS2::ShowFullScreen

 
 //
 // Frame window
 //
 
 //
 // Frame window
 //

-bool wxFrame::OS2Create(
+bool wxFrameOS2::OS2Create(

   int                               nId
 , wxWindow*                         pParent
 , const wxChar*                     zWclass
   int                               nId
 , wxWindow*                         pParent
 , const wxChar*                     zWclass


@@ -866,14 +914,16 @@ bool wxFrame::OS2Create(
     ULONG                           ulExtraFlags = 0L;
     FRAMECDATA                      vFrameCtlData;
     HWND                            hParent = NULLHANDLE;
     ULONG                           ulExtraFlags = 0L;
     FRAMECDATA                      vFrameCtlData;
     HWND                            hParent = NULLHANDLE;

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

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

+    HWND                            hFrame = NULLHANDLE;
+    HWND                            hClient = NULLHANDLE;

     SWP                             vSwp[10];
     RECTL                           vRect[10];
     USHORT                          uCtlCount;
     SWP                             vSwp[10];
     RECTL                           vRect[10];
     USHORT                          uCtlCount;

+    ERRORID                         vError;
+    wxString                        sError;

 
     m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
 
 
     m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
 


@@ -944,44 +994,65 @@ bool wxFrame::OS2Create(
     vFrameCtlData.idResources   = 0;
 
     //
     vFrameCtlData.idResources   = 0;
 
     //

-    // Create the frame window
+    // 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.

     //
     //

-    if ((m_hFrame = ::WinCreateWindow( hParent               // Frame is parent
-                                      ,WC_FRAME              // standard frame class
-                                      ,(PSZ)zTitle           // Window title
-                                      ,0                     // No styles
-                                      ,0, 0, 0, 0            // Window position
-                                      ,NULLHANDLE            // Owner
-                                      ,HWND_TOP              // Sibling
-                                      ,(ULONG)nId            // ID
-                                      ,(PVOID)&vFrameCtlData // Creation data
-                                      ,NULL                  // Window Pres Params
-                                     )) == 0L)
+
+     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;
     }
 
         return FALSE;
     }
 

-    if (!wxWindow::OS2Create( m_hFrame
-                             ,wxFrameClassName
-                             ,NULL
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,NULLHANDLE
-                             ,HWND_TOP
-                             ,(unsigned long)FID_CLIENT
-                             ,NULL
-                             ,NULL
-                            ))
+    //
+    // wxWindow class' m_hWnd set here and needed associations
+    //
+    m_hFrame = hFrame;
+    m_hWnd   = hClient;
+    wxAssociateWinWithHandle(m_hWnd, this);
+    wxAssociateWinWithHandle(m_hFrame, this);
+
+    m_backgroundColour.Set(wxString("GREY"));
+
+    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;
     }
 
         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.
     //
     //
     // Now size everything.  If adding a menu the client will need to be resized.
     //

+

     if (!::WinSetWindowPos( m_hFrame
                            ,HWND_TOP
                            ,nX
     if (!::WinSetWindowPos( m_hFrame
                            ,HWND_TOP
                            ,nX


@@ -990,71 +1061,88 @@ bool wxFrame::OS2Create(
                            ,nHeight
                            ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
                           ))
                            ,nHeight
                            ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
                           ))

-        return FALSE;
-
-    uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
-    for (int i = 0; i < uCtlCount; i++)

     {
     {

-        if (vSwp[i].hwnd == m_hFrame)
-            memcpy(&m_vSwp, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hVScroll)
-            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hHScroll)
-            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
-        else if (vSwp[i].hwnd == m_hTitleBar)
-            memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error sizing frame. Error: %s\n", sError);
+        return FALSE;

     }
     }

-

     //
     //

-    // Now set the size of the client
-    //
-    WinSetWindowPos( hClient
-                    ,HWND_TOP
-                    ,SV_CXSIZEBORDER/2
-                    ,(SV_CYSIZEBORDER/2) + m_vSwpHScroll.cy/2
-                    ,m_vSwp.cx - ((SV_CXSIZEBORDER + 1) + m_vSwpVScroll.cx)
-                    ,m_vSwp.cy - ((SV_CYSIZEBORDER + 1) + m_vSwpTitleBar.cy + m_vSwpHScroll.cy/2)
-                    ,SWP_SIZE | SWP_MOVE
-                   );
-
-    //
-    // Set the client window's background, otherwise it is transparent!
+    // 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;
     return TRUE;

-} // end of wxFrame::OS2Create
+} // 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(
+void wxFrameOS2::OnActivate(

   wxActivateEvent&                  rEvent
 )
 {
   wxActivateEvent&                  rEvent
 )
 {

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

     {
     {

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

 
 

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

 
 

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

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

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

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

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

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

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

         }
     }
         }
     }

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

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


@@ -1063,10 +1151,11 @@ void wxFrame::OnActivate(
 // ----------------------------------------------------------------------------
 
 // Checks if there is a toolbar, and returns the first free client position
 // ----------------------------------------------------------------------------
 
 // Checks if there is a toolbar, and returns the first free client position

-wxPoint wxFrame::GetClientAreaOrigin() const
+wxPoint wxFrameOS2::GetClientAreaOrigin() const

 {
     wxPoint                         vPoint(0, 0);
 
 {
     wxPoint                         vPoint(0, 0);
 

+#if wxUSE_TOOLBAR

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


@@ -1086,8 +1175,9 @@ wxPoint wxFrame::GetClientAreaOrigin() const
             vPoint.y += nHeight;
         }
     }
             vPoint.y += nHeight;
         }
     }

+#endif //wxUSE_TOOLBAR

     return vPoint;
     return vPoint;

-} // end of wxFrame::GetClientAreaOrigin
+} // end of wxFrameOS2::GetClientAreaOrigin

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


@@ -1095,7 +1185,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

-wxToolBar* wxFrame::CreateToolBar(
+wxToolBar* wxFrameOS2::CreateToolBar(

   long                              lStyle
 , wxWindowID                        vId
 , const wxString&                   rName
   long                              lStyle
 , wxWindowID                        vId
 , const wxString&                   rName


@@ -1109,9 +1199,9 @@ wxToolBar* wxFrame::CreateToolBar(
         PositionToolBar();
     }
     return m_frameToolBar;
         PositionToolBar();
     }
     return m_frameToolBar;

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

 
 

-void wxFrame::PositionToolBar()
+void wxFrameOS2::PositionToolBar()

 {
     HWND                            hWndClient;
     RECTL                           vRect;
 {
     HWND                            hWndClient;
     RECTL                           vRect;


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

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

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

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

                               ,&nToolbarHeight
                              );
 
                               ,&nToolbarHeight
                              );
 


@@ -1160,7 +1250,7 @@ void wxFrame::PositionToolBar()
                               ,wxSIZE_NO_ADJUSTMENTS
                              );
     }
                               ,wxSIZE_NO_ADJUSTMENTS
                              );
     }

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

 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_TOOLBAR
 
 // ----------------------------------------------------------------------------


@@ -1172,7 +1262,7 @@ void wxFrame::PositionToolBar()
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it
 //
 // Windows behaviour where child frames float independently of the parent one
 // on the desktop, but are iconized/restored with it
 //

-void wxFrame::IconizeChildFrames(
+void wxFrameOS2::IconizeChildFrames(

   bool                              bIconize
 )
 {
   bool                              bIconize
 )
 {


@@ -1187,7 +1277,7 @@ void wxFrame::IconizeChildFrames(
             ((wxFrame *)pWin)->Iconize(bIconize);
         }
     }
             ((wxFrame *)pWin)->Iconize(bIconize);
         }
     }

-} // end of wxFrame::IconizeChildFrames
+} // end of wxFrameOS2::IconizeChildFrames

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


@@ -1196,7 +1286,7 @@ void wxFrame::IconizeChildFrames(
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------

-bool wxFrame::OS2TranslateMessage(
+bool wxFrameOS2::OS2TranslateMessage(

   WXMSG*                            pMsg
 )
 {
   WXMSG*                            pMsg
 )
 {


@@ -1208,18 +1298,22 @@ bool wxFrame::OS2TranslateMessage(
     if (!pMenuBar )
         return FALSE;
 
     if (!pMenuBar )
         return FALSE;
 

+#if wxUSE_ACCEL

     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();

-    return rAcceleratorTable.Translate(m_hFrame, pMsg);
-} // end of wxFrame::OS2TranslateMessage
+    return rAcceleratorTable.Translate(GetHWND(), pMsg);
+#else
+    return FALSE;
+#endif //wxUSE_ACCEL
+} // end of wxFrameOS2::OS2TranslateMessage

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

-bool wxFrame::HandlePaint()
+bool wxFrameOS2::HandlePaint()

 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

-    if (::WinQueryUpdateRect(m_hFrame, &vRect))
+    if (::WinQueryUpdateRect(GetHWND(), &vRect))

     {
         if (m_bIconized)
         {
     {
         if (m_bIconized)
         {


@@ -1238,7 +1332,7 @@ bool wxFrame::HandlePaint()
             // is being processed
             //
             RECTL                   vRect2;
             // is being processed
             //
             RECTL                   vRect2;

-            HPS                     hPs = ::WinBeginPaint(m_hFrame, NULLHANDLE, &vRect2);
+            HPS                     hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2);

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


@@ -1264,14 +1358,7 @@ bool wxFrame::HandlePaint()
         }
         else
         {
         }
         else
         {

-            HPS                             hPS;
-            RECTL                           vRect;
-
-            hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
-            WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
-            WinEndPaint(hPS);
-
-            return wxWindow::HandlePaint();
+            return(wxWindow::HandlePaint());

         }
     }
     else
         }
     }
     else


@@ -1280,9 +1367,9 @@ bool wxFrame::HandlePaint()
         return TRUE;
     }
     return FALSE;
         return TRUE;
     }
     return FALSE;

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

 
 

-bool wxFrame::HandleSize(
+bool wxFrameOS2::HandleSize(

   int                               nX
 , int                               nY
 , WXUINT                            nId
   int                               nX
 , int                               nY
 , WXUINT                            nId


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

+            (void)SendIconizeEvent(FALSE);

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


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

+            (void)SendIconizeEvent();

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


@@ -1342,7 +1431,10 @@ bool wxFrame::HandleSize(
 #endif // wxUSE_NATIVE_STATUSBAR
 
         PositionStatusBar();
 #endif // wxUSE_NATIVE_STATUSBAR
 
         PositionStatusBar();

+#if  wxUSE_TOOLBAR

         PositionToolBar();
         PositionToolBar();

+#endif // wxUSE_TOOLBAR
+

         wxSizeEvent                 vEvent( wxSize( nX
                                                    ,nY
                                                   )
         wxSizeEvent                 vEvent( wxSize( nX
                                                    ,nY
                                                   )


@@ -1353,9 +1445,9 @@ bool wxFrame::HandleSize(
         bProcessed = GetEventHandler()->ProcessEvent(vEvent);
     }
     return bProcessed;
         bProcessed = GetEventHandler()->ProcessEvent(vEvent);
     }
     return bProcessed;

-} // end of wxFrame::HandleSize
+} // end of wxFrameOS2::HandleSize

 
 

-bool wxFrame::HandleCommand(
+bool wxFrameOS2::HandleCommand(

   WXWORD                            nId
 , WXWORD                            nCmd
 , WXHWND                            hControl
   WXWORD                            nId
 , WXWORD                            nCmd
 , WXHWND                            hControl


@@ -1377,7 +1469,7 @@ bool wxFrame::HandleCommand(
     //
     // Handle here commands from menus and accelerators
     //
     //
     // Handle here commands from menus and accelerators
     //

-    if (nCmd == 0 || nCmd == 1)
+    if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR)

     {
         if (wxCurrentPopupMenu)
         {
     {
         if (wxCurrentPopupMenu)
         {


@@ -1396,46 +1488,167 @@ bool wxFrame::HandleCommand(
         }
     }
     return FALSE;
         }
     }
     return FALSE;

-} // end of wxFrame::HandleCommand
+} // end of wxFrameOS2::HandleCommand

 
 

-bool wxFrame::HandleMenuSelect(
+bool wxFrameOS2::HandleMenuSelect(

   WXWORD                            nItem
 , WXWORD                            nFlags
 , WXHMENU                           hMenu
 )
 {
   WXWORD                            nItem
 , WXWORD                            nFlags
 , WXHMENU                           hMenu
 )
 {

-    int                             nMenuItem;
+    if( !nFlags )
+    {
+        MENUITEM mItem;
+        MRESULT  rc;
+
+        rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem);
+
+        if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR)))
+        {
+            wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nItem);
+
+            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;

 
 

-    if (nFlags == 0xFFFF && hMenu == 0)
+    pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+    switch (ulMsg)

     {
     {

-        //
-        // Menu was removed from screen
-        //
-        nMenuItem = -1;
+        case WM_QUERYFRAMECTLCOUNT:
+            if(pWnd && pWnd->m_fnOldWndProc)
+            {
+                USHORT              uItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
+
+                rc = MRFROMSHORT(uItemCount);
+            }
+            break;
+
+        case WM_FORMATFRAME:
+/////////////////////////////////////////////////////////////////////////////////
+// Applications that subclass frame controls may find that the frame is already
+// subclassed the number of frame controls is variable.
+// The WM_FORMATFRAME and WM_QUERYFRAMECTLCOUNT messages must always be
+// subclassed by calling the previous window procedure and modifying its result.
+////////////////////////////////////////////////////////////////////////////////
+            {
+                int                 nItemCount;
+                int                 i;
+                PSWP                pSWP = NULL;
+                SWP                 vSwpStb;
+                RECTL               vRectl;
+                RECTL               vRstb;
+                int                 nHeight=0;
+
+                pSWP = (PSWP)PVOIDFROMMP(wParam);
+                nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam));
+                if(pWnd->m_frameStatusBar)
+                {
+                    ::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb);
+                    pWnd->m_frameStatusBar->GetSize(NULL, &nHeight);
+                    ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
+                    ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
+                    vRstb = vRectl;
+                    ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE);
+
+                    vSwpStb.x                = vRectl.xLeft - vRstb.xLeft;
+                    vSwpStb.y                = vRectl.yBottom - vRstb.yBottom;
+                    vSwpStb.cx               = vRectl.xRight - vRectl.xLeft - 1; //?? -1 ??
+                    vSwpStb.cy               = nHeight;
+                    vSwpStb.fl               = SWP_SIZE |SWP_MOVE | SWP_SHOW;
+                    vSwpStb.hwnd             = pWnd->m_frameStatusBar->GetHWND();
+                    vSwpStb.hwndInsertBehind = HWND_TOP;
+                }
+                ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl);
+                ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2);
+                ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE);
+                ::WinMapWindowPoints(HWND_DESKTOP, pWnd->m_hFrame, (PPOINTL)&vRectl, 2);
+                for(i = 0; i < nItemCount; i++)
+                {
+                    if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd)
+                    {
+                        pSWP[i].x    = vRectl.xLeft;
+                        pSWP[i].y    = vRectl.yBottom + nHeight;
+                        pSWP[i].cx   = vRectl.xRight - vRectl.xLeft;
+                        pSWP[i].cy   = vRectl.yTop - vRectl.yBottom - nHeight;
+                        pSWP[i].fl   = SWP_SIZE | SWP_MOVE | SWP_SHOW;
+                        pSWP[i].hwndInsertBehind = HWND_TOP;
+                    }
+                }
+                bProcessed = TRUE;
+                rc = MRFROMSHORT(nItemCount);
+            }
+            break;
+
+       default:
+            if(pWnd && pWnd->m_fnOldWndProc)
+                rc = pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam);
+            else
+                rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);

     }
     }

-    else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR))
+    return rc;
+} // end of wxFrameMainWndProc
+
+MRESULT EXPENTRY wxFrameWndProc(
+  HWND                              hWnd
+, ULONG                             ulMsg
+, MPARAM                            wParam
+, MPARAM                            lParam
+)
+{
+    //
+    // Trace all ulMsgs - useful for the debugging
+    //
+    HWND                            parentHwnd;
+    wxFrame*                        pWnd  = NULL;
+
+    parentHwnd  = WinQueryWindow(hWnd,QW_PARENT);
+    pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd);
+
+    //
+    // When we get the first message for the HWND we just created, we associate
+    // it with wxWindow stored in wxWndHook
+    //
+
+    MRESULT                         rc = (MRESULT)0;
+    bool                            bProcessed = FALSE;
+
+    //
+    // Stop right here if we don't have a valid handle in our wxWindow object.
+    //
+    if (pWnd && !pWnd->GetHWND())

     {
     {

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

     }
     else
     {
     }
     else
     {

-        //
-        // Don't give hints for separators (doesn't make sense) nor for the
-        // items opening popup menus (they don't have them anyhow)
-        //
-        return FALSE;
+        if (pWnd)
+            rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam);
+        else
+            rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam);

     }
     }

-    wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem);
-
-    vEvent.SetEventObject(this);
-    return GetEventHandler()->ProcessEvent(vEvent);
-} // end of wxFrame::HandleMenuSelect
+    return rc;
+} // end of wxFrameWndProc

 
 

-// ---------------------------------------------------------------------------
-// the window proc for wxFrame
-// ---------------------------------------------------------------------------
-
-MRESULT wxFrame::OS2WindowProc(
+MRESULT wxFrameOS2::OS2WindowProc(

   WXUINT                            uMessage
 , WXWPARAM                          wParam
 , WXLPARAM                          lParam
   WXUINT                            uMessage
 , WXWPARAM                          wParam
 , WXLPARAM                          lParam


@@ -1454,7 +1667,23 @@ MRESULT wxFrame::OS2WindowProc(
             bProcessed = !Close();
             break;
 
             bProcessed = !Close();
             break;
 

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

             {
                 WORD                wId;
                 WORD                wCmd;
             {
                 WORD                wId;
                 WORD                wCmd;


@@ -1466,6 +1695,7 @@ MRESULT wxFrame::OS2WindowProc(
                               ,&hWnd
                               ,&wCmd
                              );
                               ,&hWnd
                               ,&wCmd
                              );

+

                 bProcessed = HandleCommand( wId
                                            ,wCmd
                                            ,(WXHWND)hWnd
                 bProcessed = HandleCommand( wId
                                            ,wCmd
                                            ,(WXHWND)hWnd


@@ -1489,20 +1719,23 @@ MRESULT wxFrame::OS2WindowProc(
                                               ,wFlags
                                               ,hMenu
                                              );
                                               ,wFlags
                                               ,hMenu
                                              );

+                mRc = (MRESULT)TRUE;

             }
             break;
 
             }
             break;
 

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

 
 

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

             break;
 
         case CM_QUERYDRAGIMAGE:
             break;
 
         case CM_QUERYDRAGIMAGE:


@@ -1510,17 +1743,13 @@ MRESULT wxFrame::OS2WindowProc(
                 HPOINTER                hIcon;
 
                 if (m_icon.Ok())
                 HPOINTER                hIcon;
 
                 if (m_icon.Ok())

-                    hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L);
+                    hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);

                 else
                     hIcon = (HPOINTER)m_hDefaultIcon;
                 mRc = (MRESULT)hIcon;
                 bProcessed = mRc != 0;
             }
             break;
                 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 )
     }
 
     if (!bProcessed )


@@ -1528,6 +1757,65 @@ MRESULT wxFrame::OS2WindowProc(
                                       ,wParam
                                       ,lParam
                                      );
                                       ,wParam
                                       ,lParam
                                      );

-    return (MRESULT)0;
-} // wxFrame::OS2WindowProc
+    return (MRESULT)mRc;
+} // wxFrameOS2::OS2WindowProc
+
+void wxFrameOS2::SetClient(WXHWND c_Hwnd)
+{
+   // Duh...nothing to do under OS/2
+}

 
 

+void wxFrameOS2::SetClient(
+  wxWindow*                         pWindow
+)
+{
+    wxWindow*                       pOldClient      = this->GetClient();
+    bool                            bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus());
+
+    if(pOldClient == pWindow)  // nothing to do
+        return;
+    if(pWindow == NULL) // just need to remove old client
+    {
+        if(pOldClient == NULL) // nothing to do
+            return;
+
+        if(bClientHasFocus )
+            this->SetFocus();
+
+        pOldClient->Enable( FALSE );
+        pOldClient->Show( FALSE );
+        ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
+        // to avoid OS/2 bug need to update frame
+        ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+        return;
+    }
+
+    //
+    // Else need to change client
+    //
+    if(bClientHasFocus)
+         this->SetFocus();
+
+    ::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));
+}