Suppress "Assignement in logical expression" type warnings for compilers that compain...

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

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

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

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


@@ -46,6 +55,10 @@ 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
 // ----------------------------------------------------------------------------


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

+#if wxUSE_STATUSBAR

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


@@ -71,6 +85,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
     bool wxFrame::m_bUseNativeStatusBar = FALSE;
 #endif
 
     bool wxFrame::m_bUseNativeStatusBar = FALSE;
 #endif
 

+#endif //wxUSE_STATUSBAR
+

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


@@ -90,6 +106,25 @@ 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
+    //
+    memset(&m_vSwp, 0, sizeof(SWP));
+    memset(&m_vSwpClient, 0, sizeof(SWP));
+    memset(&m_vSwpTitleBar, 0, sizeof(SWP));
+    memset(&m_vSwpMenuBar, 0, sizeof(SWP));
+    memset(&m_vSwpHScroll, 0, sizeof(SWP));
+    memset(&m_vSwpVScroll, 0, sizeof(SWP));
+    memset(&m_vSwpStatusBar, 0, sizeof(SWP));
+    memset(&m_vSwpToolBar, 0, sizeof(SWP));

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


@@ -106,12 +141,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));
 


@@ -125,37 +166,33 @@ bool wxFrame::Create(
 
     m_bIconized = FALSE;
 
 
     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 ((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;
+    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 wxFrame::Create
 
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 } // end of wxFrame::Create
 
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

+

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


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

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

         }
     }
         }
     }

+

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


@@ -203,24 +241,12 @@ void wxFrame::DoGetClientSize(
 , int*                              pY
 ) const
 {
 , int*                              pY
 ) const
 {

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

     RECTL                           vRect;
     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);
-
+    ::WinQueryWindowRect(GetHwnd(), &vRect);

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-    if ( GetStatusBar() )
+    if ( GetStatusBar() && GetStatusBar()->IsShown() )

     {
     {

-        int                         nStatusX;
+        int                         nStatusX

         int                         nStatusY;
 
         GetStatusBar()->GetClientSize( &nStatusX
         int                         nStatusY;
 
         GetStatusBar()->GetClientSize( &nStatusX


@@ -229,16 +255,10 @@ void wxFrame::DoGetClientSize(
         vRect.yBottom += nStatusY;
     }
 #endif // wxUSE_STATUSBAR
         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;
+        *pY = vRect.yTop - vRect.yBottom;

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


@@ -251,14 +271,11 @@ void wxFrame::DoSetClientSize(
 )
 {
     HWND                            hWnd = GetHwnd();
 )
 {
     HWND                            hWnd = GetHwnd();

-    HWND                            hWndClient;

     RECTL                           vRect;
     RECTL                           vRect;

-    RECT                            vRect2;
+    RECTL                           vRect2;

 
 

-    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
-    ::WinQueryWindowRect(hWndClient, &vRect);
-
-    ::WinQueryWindowRect(hWnd, &vRect2);
+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    ::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)


@@ -288,7 +305,7 @@ void wxFrame::DoSetClientSize(
     POINTL                          vPointl;
 
     vPointl.x = vRect2.xLeft;
     POINTL                          vPointl;
 
     vPointl.x = vRect2.xLeft;

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

 
     ::WinSetWindowPos( hWnd
                       ,HWND_TOP
 
     ::WinSetWindowPos( hWnd
                       ,HWND_TOP


@@ -315,7 +332,7 @@ void wxFrame::DoGetSize(
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

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

     *pWidth = vRect.xRight - vRect.xLeft;
     *pHeight = vRect.yTop - vRect.yBottom;
 } // end of wxFrame::DoGetSize
     *pWidth = vRect.xRight - vRect.xLeft;
     *pHeight = vRect.yTop - vRect.yBottom;
 } // end of wxFrame::DoGetSize


@@ -328,7 +345,7 @@ void wxFrame::DoGetPosition(
     RECTL                           vRect;
     POINTL                          vPoint;
 
     RECTL                           vRect;
     POINTL                          vPoint;
 

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

     vPoint.x = vRect.xLeft;
 
     //
     vPoint.x = vRect.xLeft;
 
     //


@@ -345,31 +362,29 @@ void wxFrame::DoGetPosition(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(

-  int                               nShowCmd
+  int                               bShowCmd

 )
 {
 )
 {

-    ::WinShowWindow(GetHwnd(), nShowCmd);
-    m_bIconized = nShowCmd == SWP_MINIMIZE;
+    ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
+    m_bIconized = bShowCmd == SWP_MINIMIZE;

 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
   bool                              bShow
 )
 {
 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
   bool                              bShow
 )
 {

-    DoShowWindow(bShow ? SWP_SHOW : SWP_HIDE);
+    SWP                             vSwp;
+
+    DoShowWindow((int)bShow);

 
     if (bShow)
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
 
     if (bShow)
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 

-        ::WinSetWindowPos( (HWND) GetHWND()
-                          ,HWND_TOP
-                          ,0
-                          ,0
-                          ,0
-                          ,0
-                          ,SWP_ZORDER
-                         );
+        ::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);
     }
         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);
     }


@@ -382,15 +397,18 @@ bool wxFrame::Show(
         {
             HWND                    hWndParent = GetHwndOf(GetParent());
 
         {
             HWND                    hWndParent = GetHwndOf(GetParent());
 

+            ::WinQueryWindowPos(hWndParent, &vSwp);
+            m_bIconized = vSwp.fl & SWP_MINIMIZE;

             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP
             if (hWndParent)
                 ::WinSetWindowPos( hWndParent
                                   ,HWND_TOP

-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,0
-                                  ,SWP_ZORDER
+                                  ,vSwp.x
+                                  ,vSwp.y
+                                  ,vSwp.cx
+                                  ,vSwp.cy
+                                  ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE

                                  );
                                  );

+            ::WinEnableWindow(hWndParent, TRUE);

         }
     }
     return TRUE;
         }
     }
     return TRUE;


@@ -417,9 +435,8 @@ void wxFrame::Restore()
 bool wxFrame::IsIconized() const
 {
     SWP                             vSwp;
 bool wxFrame::IsIconized() const
 {
     SWP                             vSwp;

-    bool                            bIconic;

 
 

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

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


@@ -434,7 +451,7 @@ bool wxFrame::IsMaximized() const
     SWP                             vSwp;
     bool                            bIconic;
 
     SWP                             vSwp;
     bool                            bIconic;
 

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

     return (vSwp.fl & SWP_MAXIMIZE);
 } // end of wxFrame::IsMaximized
 
     return (vSwp.fl & SWP_MAXIMIZE);
 } // end of wxFrame::IsMaximized
 


@@ -444,13 +461,18 @@ void wxFrame::SetIcon(
 {
     wxFrameBase::SetIcon(rIcon);
 
 {
     wxFrameBase::SetIcon(rIcon);
 

-    if (m_icon.Ok())
+    if ((m_icon.GetHICON()) != NULLHANDLE)

     {
     {

-        WinSendMsg( GetHwnd()
-                   ,WM_SETICON
-                   ,(MPARAM)((HICON)m_icon.GetHICON())
-                   ,NULL
-                  );
+        ::WinSendMsg( m_hFrame
+                     ,WM_SETICON
+                     ,(MPARAM)((HPOINTER)m_icon.GetHICON())
+                     ,NULL
+                    );
+        ::WinSendMsg( m_hFrame
+                     ,WM_UPDATEFRAME
+                     ,(MPARAM)FCF_ICON
+                     ,(MPARAM)0
+                    );

     }
 } // end of wxFrame::SetIcon
 
     }
 } // end of wxFrame::SetIcon
 


@@ -463,33 +485,58 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
 )
 {
     wxStatusBar*                    pStatusBar = NULL;
 )
 {
     wxStatusBar*                    pStatusBar = NULL;

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

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

-                                               );
+                                                 );
+
+    if( !pStatusBar )
+        return NULL;
+
+    ::WinSetParent( pStatusBar->GetHWND()
+                   ,m_hFrame
+                   ,FALSE
+                  );
+    ::WinSetOwner( pStatusBar->GetHWND()
+                  ,m_hFrame
+                 );
+    //
+    // to show statusbar
+    //
+    if(::WinIsWindowShowing(m_hFrame))
+        ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
+

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

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

     //
     // Native status bar positions itself
     //
     if (m_frameStatusBar)
     {
         int                         nWidth;
     //
     // Native status bar positions itself
     //
     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;

 
 

-        hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
-        ::WinQueryWindowRect(hWndClient, &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


@@ -499,11 +546,18 @@ 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
                                  );

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

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


@@ -521,44 +575,76 @@ void wxFrame::SetMenuBar(
   wxMenuBar*                        pMenuBar
 )
 {
   wxMenuBar*                        pMenuBar
 )
 {

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

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

-        return;
-    }
-
-    wxCHECK_RET(!pMenuBar->GetFrame(), wxT("this menubar is already attached"));

 
 

-    if (m_frameMenuBar)
-        delete m_frameMenuBar;
-
-    m_hMenu = pMenuBar->Create();
-    m_ulMenubarId = pMenuBar->GetMenubarId();
-    if (m_ulMenubarId != FID_MENU)
-    {
-        ::WinSetWindowUShort( m_hMenu
-                             ,QWS_ID
-                             ,(unsigned short)m_ulMenubarId
-                            );
+        //
+        // Actually remove the menu from the frame
+        //
+        m_hMenu = (WXHMENU)0;
+        InternalSetMenuBar();

     }
     }

+    else // set new non NULL menu bar
+    {
+        m_frameMenuBar = NULL;

 
 

-    if (!m_hMenu)
-        return;
-
-    InternalSetMenuBar();
-
-    m_frameMenuBar = pMenuBar;
-    pMenuBar->Attach(this);
+        //
+        // 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(this);
+    }

 } // end of wxFrame::SetMenuBar
 
 void wxFrame::InternalSetMenuBar()
 {
 } // end of wxFrame::SetMenuBar
 
 void wxFrame::InternalSetMenuBar()
 {

+    ERRORID                         vError;
+    wxString                        sError;
+    //
+    // Set the parent and owner of the menubar to be the frame
+    //
+    if (!::WinSetParent(m_hMenu, m_hFrame, FALSE))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }

 
 

-    ::WinPostMsg( GetHwnd()
-                 ,WM_UPDATEFRAME
-                 ,(MPARAM)FCF_MENU
-                 ,NULL
-                );
+    if (!::WinSetOwner(m_hMenu, m_hFrame))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }
+    ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

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


@@ -571,6 +657,7 @@ void wxFrame::OnSysColourChanged(
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 

+#if wxUSE_STATUSBAR

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


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

+#endif //wxUSE_STATUSBAR

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


@@ -585,6 +673,196 @@ void wxFrame::OnSysColourChanged(
     wxWindow::OnSysColourChanged(rEvent);
 } // end of wxFrame::OnSysColourChanged
 
     wxWindow::OnSysColourChanged(rEvent);
 } // end of wxFrame::OnSysColourChanged
 

+// Pass TRUE to show full screen, FALSE to restore.
+bool wxFrame::ShowFullScreen(
+  bool                              bShow
+, long                              lStyle
+)
+{
+    if (bShow)
+    {
+        if (IsFullScreen())
+            return FALSE;
+
+        m_bFsIsShowing = TRUE;
+        m_lFsStyle = lStyle;
+
+#if wxUSE_TOOLBAR
+           wxToolBar*                  pTheToolBar = GetToolBar();
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+           wxStatusBar*                pTheStatusBar = GetStatusBar();
+#endif //wxUSE_STATUSBAR
+
+        int                         nDummyWidth;
+
+#if wxUSE_TOOLBAR
+        if (pTheToolBar)
+            pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+        if (pTheStatusBar)
+            pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
+#endif //wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+        //
+        // Zap the toolbar, menubar, and statusbar
+        //
+        if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
+        {
+            pTheToolBar->SetSize(-1,0);
+            pTheToolBar->Show(FALSE);
+        }
+#endif //wxUSE_TOOLBAR
+
+        if (lStyle & wxFULLSCREEN_NOMENUBAR)
+        {
+            ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+            ::WinSetOwner(m_hMenu, m_hFrame);
+            ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+        }
+
+#if wxUSE_STATUSBAR
+        //
+        // Save the number of fields in the statusbar
+        //
+        if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar)
+        {
+            m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount();
+            SetStatusBar((wxStatusBar*) NULL);
+            delete pTheStatusBar;
+        }
+        else
+            m_nFsStatusBarFields = 0;
+#endif //wxUSE_STATUSBAR
+
+        //
+        // Zap the frame borders
+        //
+
+        //
+        // Save the 'normal' window style
+        //
+        m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE);
+
+        //
+        // Save the old position, width & height, maximize state
+        //
+        m_vFsOldSize = GetRect();
+        m_bFsIsMaximized = IsMaximized();
+
+        //
+        // Decide which window style flags to turn off
+        //
+        LONG                        lNewStyle = m_lFsOldWindowStyle;
+        LONG                        lOffFlags = 0;
+
+        if (lStyle & wxFULLSCREEN_NOBORDER)
+            lOffFlags |= FCF_BORDER;
+        if (lStyle & wxFULLSCREEN_NOCAPTION)
+            lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU);
+
+        lNewStyle &= (~lOffFlags);
+
+        //
+        // Change our window style to be compatible with full-screen mode
+        //
+        ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle);
+
+        //
+        // Resize to the size of the desktop
+        int                         nWidth;
+        int                         nHeight;
+
+        RECTL                       vRect;
+
+        ::WinQueryWindowRect(HWND_DESKTOP, &vRect);
+        nWidth = vRect.xRight - vRect.xLeft;
+        //
+        // Rmember OS/2 is backwards!
+        //
+        nHeight = vRect.yTop - vRect.yBottom;
+
+        SetSize( nWidth
+                ,nHeight
+               );
+
+        //
+        // Now flush the window style cache and actually go full-screen
+        //
+        ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                          ,HWND_TOP
+                          ,0
+                          ,0
+                          ,nWidth
+                          ,nHeight
+                          ,SWP_SIZE | SWP_SHOW
+                         );
+
+        wxSizeEvent                 vEvent( wxSize( nWidth
+                                                   ,nHeight
+                                                  )
+                                           ,GetId()
+                                          );
+
+        GetEventHandler()->ProcessEvent(vEvent);
+        return TRUE;
+    }
+    else
+    {
+        if (!IsFullScreen())
+            return FALSE;
+
+        m_bFsIsShowing = FALSE;
+
+#if wxUSE_TOOLBAR
+        wxToolBar*                  pTheToolBar = GetToolBar();
+
+        //
+        // Restore the toolbar, menubar, and statusbar
+        //
+        if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
+        {
+            pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
+            pTheToolBar->Show(TRUE);
+        }
+#endif //wxUSE_TOOLBAR
+
+#if wxUSE_STATUSBAR
+        if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
+        {
+            CreateStatusBar(m_nFsStatusBarFields);
+//          PositionStatusBar();
+        }
+#endif //wxUSE_STATUSBAR
+
+        if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
+        {
+            ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+            ::WinSetOwner(m_hMenu, m_hFrame);
+            ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+        }
+        Maximize(m_bFsIsMaximized);
+
+        ::WinSetWindowULong( m_hFrame
+                            ,QWL_STYLE
+                            ,(ULONG)m_lFsOldWindowStyle
+                           );
+        ::WinSetWindowPos( (HWND) GetParent()->GetHWND()
+                          ,HWND_TOP
+                          ,m_vFsOldSize.x
+                          ,m_vFsOldSize.y
+                          ,m_vFsOldSize.width
+                          ,m_vFsOldSize.height
+                          ,SWP_SIZE | SWP_SHOW
+                         );
+        return TRUE;
+    }
+} // end of wxFrame::ShowFullScreen
+

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


@@ -601,88 +879,179 @@ bool wxFrame::OS2Create(
 , long                              ulStyle
 )
 {
 , 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;
+    ULONG                           ulCreateFlags = 0L;
+    ULONG                           ulStyleFlags = 0L;
+    ULONG                           ulExtraFlags = 0L;
+    FRAMECDATA                      vFrameCtlData;
+    HWND                            hParent = NULLHANDLE;
+    HWND                            hTitlebar = NULLHANDLE;
+    HWND                            hHScroll = NULLHANDLE;
+    HWND                            hVScroll = NULLHANDLE;
+    HWND                            hFrame = NULLHANDLE;
+    HWND                            hClient = NULLHANDLE;
+    SWP                             vSwp[10];
+    RECTL                           vRect[10];
+    USHORT                          uCtlCount;
+    ERRORID                         vError;
+    wxString                        sError;

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

-    if ((ulStyle & wxCAPTION) == wxCAPTION)
-        ulPmFlags = FCF_TASKLIST;
+    if (pParent)
+        hParent = GetWinHwnd(pParent);

     else
     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;
+        hParent = HWND_DESKTOP;
+
+    if (ulStyle == wxDEFAULT_FRAME_STYLE)
+        ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU |
+                        FCF_MINMAX | FCF_TASKLIST;
+    else
+    {
+        if ((ulStyle & wxCAPTION) == wxCAPTION)
+            ulCreateFlags = FCF_TASKLIST;
+        else
+            ulCreateFlags = FCF_NOMOVEWITHOWNER;
+
+        if ((ulStyle & wxVSCROLL) == wxVSCROLL)
+            ulCreateFlags |= FCF_VERTSCROLL;
+        if ((ulStyle & wxHSCROLL) == wxHSCROLL)
+            ulCreateFlags |= FCF_HORZSCROLL;
+        if (ulStyle & wxMINIMIZE_BOX)
+            ulCreateFlags |= FCF_MINBUTTON;
+        if (ulStyle & wxMAXIMIZE_BOX)
+            ulCreateFlags |= FCF_MAXBUTTON;
+        if (ulStyle & wxTHICK_FRAME)
+            ulCreateFlags |= FCF_DLGBORDER;
+        if (ulStyle & wxSYSTEM_MENU)
+            ulCreateFlags |= FCF_SYSMENU;
+        if (ulStyle & wxCAPTION)
+            ulCreateFlags |= FCF_TASKLIST;
+        if (ulStyle & wxCLIP_CHILDREN)
+        {
+            // Invalid for frame windows under PM
+        }
+
+        if (ulStyle & wxTINY_CAPTION_VERT)
+            ulCreateFlags |= FCF_TASKLIST;
+        if (ulStyle & wxTINY_CAPTION_HORIZ)
+            ulCreateFlags |= FCF_TASKLIST;
+
+        if ((ulStyle & wxTHICK_FRAME) == 0)
+            ulCreateFlags |= FCF_BORDER;
+        if (ulStyle & wxFRAME_TOOL_WINDOW)
+            ulExtraFlags = kFrameToolWindow;
+
+        if (ulStyle & wxSTAY_ON_TOP)
+            ulCreateFlags |= FCF_SYSMODAL;
+    }

     if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
     if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))

-        ulPmFlags |= WS_MINIMIZED;
+        ulStyleFlags |= WS_MINIMIZED;

     if (ulStyle & wxMAXIMIZE)
     if (ulStyle & wxMAXIMIZE)

-        ulPmFlags |= WS_MAXIMIZED;
-    if (ulStyle & wxCAPTION)
-        ulPmFlags |= FCF_TASKLIST;
-    if (ulStyle & wxCLIP_CHILDREN)
+        ulStyleFlags |= WS_MAXIMIZED;
+
+    //
+    // Clear the visible flag, we always call show
+    //
+    ulStyleFlags &= (unsigned long)~WS_VISIBLE;
+    m_bIconized = FALSE;
+
+    //
+    // Set the frame control block
+    //
+    vFrameCtlData.cb            = sizeof(vFrameCtlData);
+    vFrameCtlData.flCreateFlags = ulCreateFlags;
+    vFrameCtlData.hmodResources = 0L;
+    vFrameCtlData.idResources   = 0;
+
+    //
+    // Create the frame window:  We break ranks with other ports now
+    // and instead of calling down into the base wxWindow class' OS2Create
+    // we do all our own stuff here.  We will set the needed pieces
+    // of wxWindow manually, here.
+    //
+
+     hFrame = ::WinCreateStdWindow( hParent
+                                   ,ulStyleFlags   // frame-window style
+                                   ,&ulCreateFlags // window style
+                                   ,(PSZ)zWclass   // class name
+                                   ,(PSZ)zTitle    // window title
+                                   ,0L             // default client style
+                                   ,NULLHANDLE     // resource in executable file
+                                   ,0              // resource id
+                                   ,&hClient       // receives client window handle
+                                  );
+    if (!hFrame)

     {
     {

-        // Invalid for frame windows under PM
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error creating frame. Error: %s\n", sError);
+        return FALSE;

     }
 
     //
     }
 
     //

-    // Keep this in wxFrame because it saves recoding this function
-    // in wxTinyFrame
+    // wxWindow class' m_hWnd set here and needed associations

     //
     //

-#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;
+    m_hFrame = hFrame;
+    m_hWnd   = hClient;
+    wxAssociateWinWithHandle(m_hWnd, this);
+    wxAssociateWinWithHandle(m_hFrame, this);
+
+    m_backgroundColour.Set(wxString("GREY"));

 
 

-    if (ulStyle & wxSTAY_ON_TOP)
-        ulPmFlags |= FCF_SYSMODAL;
+    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;
+    }

 
 

-    if (ulPmFlags & ulTempFlags)
-        ulPmFlags = FCF_STANDARD;

     //
     //

-    // Clear the visible flag, we always call show
+    // 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

     //
     //

-    ulPmFlags &= (unsigned long)~WS_VISIBLE;
-    m_bIconized = FALSE;
-    if ( !wxWindow::OS2Create( nId
-                              ,pParent
-                              ,zWclass
-                              ,pWxWin
-                              ,zTitle
-                              ,nX
-                              ,nY
-                              ,nWidth
-                              ,nHeight
-                              ,ulPmFlags
-                              ,NULL
-                              ,ulExtraFlags))
+    m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc);
+
+    //
+    // Now size everything.  If adding a menu the client will need to be resized.
+    //
+
+    if (!::WinSetWindowPos( m_hFrame
+                           ,HWND_TOP
+                           ,nX
+                           ,nY
+                           ,nWidth
+                           ,nHeight
+                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
+                          ))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error sizing frame. Error: %s\n", sError);
+        return FALSE;
+    }
+    //
+    // We may have to be smarter here when variable sized toolbars are added!
+    //
+    if (!::WinSetWindowPos( m_hWnd
+                           ,HWND_TOP
+                           ,nX // + 20
+                           ,nY // + 20
+                           ,nWidth // - 60
+                           ,nHeight // - 60
+                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
+                          ))

     {
     {

+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error sizing client. Error: %s\n", sError);

         return FALSE;
     }
     return TRUE;
         return FALSE;
     }
     return TRUE;


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

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

     {
     {

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

 
 

-        // restore focus
-        wxWindow*                   pChild = pNode->GetData();
+        wxWindow*                           pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
+                                            : NULL;
+        if (!pParent)
+        {
+            pParent = this;
+        }

 
 

-        if (!pChild->IsTopLevel()
+        wxSetFocusToChild( pParent
+                          ,&m_pWinLastFocused
+                         );
+    }
+    else // deactivating
+    {
+        //
+        // Remember the last focused child if it is our child
+        //
+        m_pWinLastFocused = FindFocus();
+
+        for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+             pNode;
+             pNode = pNode->GetNext())
+        {
+            // FIXME all this is totally bogus - we need to do the same as wxPanel,
+            //       but how to do it without duplicating the code?
+
+            // restore focus
+            wxWindow*                   pChild = pNode->GetData();
+
+            if (!pChild->IsTopLevel()

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

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

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

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

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

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

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


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

+#if wxUSE_TOOLBAR

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


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

+#endif //wxUSE_TOOLBAR

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


@@ -781,8 +1176,7 @@ void wxFrame::PositionToolBar()
     HWND                            hWndClient;
     RECTL                           vRect;
 
     HWND                            hWndClient;
     RECTL                           vRect;
 

-    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
-    ::WinQueryWindowRect(hWndClient, &vRect);
+    ::WinQueryWindowRect(GetHwnd(), &vRect);

 
 #if wxUSE_STATUSBAR
     if (GetStatusBar())
 
 #if wxUSE_STATUSBAR
     if (GetStatusBar())


@@ -866,8 +1260,6 @@ bool wxFrame::OS2TranslateMessage(
   WXMSG*                            pMsg
 )
 {
   WXMSG*                            pMsg
 )
 {

-    if (wxWindow::OS2TranslateMessage(pMsg))
-        return TRUE;

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


@@ -876,8 +1268,12 @@ 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(this, pMsg);
+    return rAcceleratorTable.Translate(GetHWND(), pMsg);
+#else
+    return FALSE;
+#endif //wxUSE_ACCEL

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


@@ -887,7 +1283,7 @@ bool wxFrame::HandlePaint()
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

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

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


@@ -897,7 +1293,7 @@ bool wxFrame::HandlePaint()
             HPOINTER                hIcon;
 
             if (m_icon.Ok())
             HPOINTER                hIcon;
 
             if (m_icon.Ok())

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

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


@@ -918,8 +1314,7 @@ bool wxFrame::HandlePaint()
                 HWND                            hWndClient;
                 RECTL                           vRect3;
 
                 HWND                            hWndClient;
                 RECTL                           vRect3;
 

-                hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
-                ::WinQueryWindowRect(hWndClient, &vRect3);
+                ::WinQueryWindowRect(GetHwnd(), &vRect3);

 
                 static const int    nIconWidth = 32;
                 static const int    nIconHeight = 32;
 
                 static const int    nIconWidth = 32;
                 static const int    nIconHeight = 32;


@@ -933,7 +1328,7 @@ bool wxFrame::HandlePaint()
         }
         else
         {
         }
         else
         {

-            return wxWindow::HandlePaint();
+            return(wxWindow::HandlePaint());

         }
     }
     else
         }
     }
     else


@@ -1004,7 +1399,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
                                                   )


@@ -1039,7 +1437,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)
         {


@@ -1066,36 +1464,157 @@ bool wxFrame::HandleMenuSelect(
 , WXHMENU                           hMenu
 )
 {
 , 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 wxFrame::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
-
-// ---------------------------------------------------------------------------
-// the window proc for wxFrame
-// ---------------------------------------------------------------------------
+    return rc;
+} // end of wxFrameWndProc

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


@@ -1116,7 +1635,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;


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

+

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


@@ -1151,11 +1687,23 @@ MRESULT wxFrame::OS2WindowProc(
                                               ,wFlags
                                               ,hMenu
                                              );
                                               ,wFlags
                                               ,hMenu
                                              );

+                mRc = (MRESULT)TRUE;

             }
             break;
 
             }
             break;
 

-        case WM_PAINT:
-            bProcessed = HandlePaint();
+        case WM_SIZE:
+            {
+                SHORT               nScxold = SHORT1FROMMP(wParam); // Old horizontal size.
+                SHORT               nScyold = SHORT2FROMMP(wParam); // Old vertical size.
+                SHORT               nScxnew = SHORT1FROMMP(lParam); // New horizontal size.
+                SHORT               nScynew = SHORT2FROMMP(lParam); // New vertical size.
+
+                lParam = MRFROM2SHORT( nScxnew - 20
+                                      ,nScynew - 30
+                                     );
+            }
+            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);
+            mRc = (MRESULT)FALSE;

             break;
 
         case CM_QUERYDRAGIMAGE:
             break;
 
         case CM_QUERYDRAGIMAGE:


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

-                    hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), 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 )


@@ -1181,6 +1725,65 @@ MRESULT wxFrame::OS2WindowProc(
                                       ,wParam
                                       ,lParam
                                      );
                                       ,wParam
                                       ,lParam
                                      );

-    return (MRESULT)0;
+    return (MRESULT)mRc;

 } // wxFrame::OS2WindowProc
 
 } // wxFrame::OS2WindowProc
 

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