wxListCtrl::InsertItem() returned wrong index.

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 6041cc2b5a77b17f90af33f3eccedaf54dad709e..1b431f44435a3340619ff273972b30c2b589b2a2 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -66,9 +66,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
 // ----------------------------------------------------------------------------
 
 #if wxUSE_NATIVE_STATUSBAR
 // ----------------------------------------------------------------------------
 
 #if wxUSE_NATIVE_STATUSBAR

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

 #else
 #else

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

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


@@ -80,7 +80,7 @@ void wxFrame::Init()
     m_bIconized = FALSE;
 
 #if wxUSE_TOOLTIPS
     m_bIconized = FALSE;
 
 #if wxUSE_TOOLTIPS

-    m_hHwndToolTip = 0;
+    m_hWndToolTip = 0;

 #endif
     // Data to save/restore when calling ShowFullScreen
     m_lFsStyle           = 0L;
 #endif
     // Data to save/restore when calling ShowFullScreen
     m_lFsStyle           = 0L;


@@ -90,6 +90,20 @@ 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;
+
+    //
+    // 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(


@@ -98,7 +112,7 @@ bool wxFrame::Create(
 , const wxString&                   rsTitle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize
 , const wxString&                   rsTitle
 , const wxPoint&                    rPos
 , const wxSize&                     rSize

-, long                              lStyle
+, long                              lulStyle

 , const wxString&                   rsName
 )
 {
 , const wxString&                   rsName
 )
 {


@@ -108,7 +122,7 @@ bool wxFrame::Create(
     int                             nHeight = rSize.y;
 
     SetName(rsName);
     int                             nHeight = rSize.y;
 
     SetName(rsName);

-    m_windowStyle    = lStyle;
+    m_windowStyle    = lulStyle;

     m_frameMenuBar   = NULL;
     m_frameToolBar   = NULL;
     m_frameStatusBar = NULL;
     m_frameMenuBar   = NULL;
     m_frameToolBar   = NULL;
     m_frameStatusBar = NULL;


@@ -125,12 +139,6 @@ 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 style.
-    //

     if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
         pParent = NULL;
 
     if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0)
         pParent = NULL;
 


@@ -146,7 +154,7 @@ bool wxFrame::Create(
               ,nY
               ,nWidth
               ,nHeight
               ,nY
               ,nWidth
               ,nHeight

-              ,lStyle
+              ,lulStyle

              );
 
     wxModelessWindows.Append(this);
              );
 
     wxModelessWindows.Append(this);


@@ -156,6 +164,7 @@ bool wxFrame::Create(
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
     m_isBeingDeleted = TRUE;

+

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


@@ -166,7 +175,7 @@ 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);


@@ -204,23 +213,21 @@ void wxFrame::DoGetClientSize(
 ) const
 {
     //
 ) const
 {
     //

-    // OS/2 PM's coordinates go from bottom-left not 
+    // OS/2 PM's coordinates go from bottom-left not

     // top-left thus the += instead of the -=
     //
     RECTL                           vRect;
     // top-left thus the += instead of the -=
     //
     RECTL                           vRect;

-    HWND                            hWndClient;

 
     //
     // PM has no GetClientRect that inherantly knows about the client window
     // We have to explicitly go fetch it!
     //
 
     //
     // 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 ( GetStatusBar() )
     {
 
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() )
     {

-        int                         nStatusX
+        int                         nStatusX;

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


@@ -231,9 +238,9 @@ void wxFrame::DoGetClientSize(
 #endif // wxUSE_STATUSBAR
 
     wxPoint                         vPoint(GetClientAreaOrigin());
 #endif // wxUSE_STATUSBAR
 
     wxPoint                         vPoint(GetClientAreaOrigin());

-  
-    vRect.bottom += pt.y;
-    vRect.right -= pt.x;
+
+    vRect.yBottom += vPoint.y;
+    vRect.xRight -= vPoint.x;

 
     if (pX)
         *pX = vRect.xRight;
 
     if (pX)
         *pX = vRect.xRight;


@@ -241,7 +248,7 @@ void wxFrame::DoGetClientSize(
         *pY = vRect.yBottom;
 } // end of wxFrame::DoGetClientSize
 
         *pY = vRect.yBottom;
 } // end of wxFrame::DoGetClientSize
 

-//    
+//

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


@@ -251,14 +258,12 @@ 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(GetHwnd(), &vRect);

 
 

-    ::WinQueryWindowRect(hWnd, &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)


@@ -288,7 +293,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 +320,7 @@ void wxFrame::DoGetSize(
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

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


@@ -326,9 +331,9 @@ void wxFrame::DoGetPosition(
 ) const
 {
     RECTL                           vRect;
 ) const
 {
     RECTL                           vRect;

-    POINT                           vPoint;
+    POINTL                          vPoint;

 
 

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

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


@@ -345,31 +350,28 @@ void wxFrame::DoGetPosition(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(
 // ----------------------------------------------------------------------------
 
 void wxFrame::DoShowWindow(

-  int                               nShowCmd
+  int                               bShowCmd

 )
 {
 )
 {

-    ::WinShowWindow(GetHwnd(), nShowCmd);
-    m_bIconized = nShowCmd == SWP_MINIMIZE;
+    ::WinShowWindow(GetHWND(), (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(show ? SWP_SHOW : SW_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(GetHWND(), &vSwp);
+        m_bIconized = vSwp.fl & SWP_MINIMIZE;
+        ::WinEnableWindow(GetHWND(), TRUE);

         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);
     }
         vEvent.SetEventObject(this);
         GetEventHandler()->ProcessEvent(vEvent);
     }


@@ -382,15 +384,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,10 +422,9 @@ void wxFrame::Restore()
 bool wxFrame::IsIconized() const
 {
     SWP                             vSwp;
 bool wxFrame::IsIconized() const
 {
     SWP                             vSwp;

-    bool                            bIconic;

 
 

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

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


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

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

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


@@ -444,53 +448,103 @@ void wxFrame::SetIcon(
 {
     wxFrameBase::SetIcon(rIcon);
 
 {
     wxFrameBase::SetIcon(rIcon);
 

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

     {
     {

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

     }
 } // end of wxFrame::SetIcon
 
 #if wxUSE_STATUSBAR
 wxStatusBar* wxFrame::OnCreateStatusBar(
   int                               nNumber
     }
 } // end of wxFrame::SetIcon
 
 #if wxUSE_STATUSBAR
 wxStatusBar* wxFrame::OnCreateStatusBar(
   int                               nNumber

-, long                              lStyle
+, long                              lulStyle

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

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

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

-                                                ,lStyle
+                                                ,lulStyle

                                                 ,vId
                                                 ,rName
                                                );
                                                 ,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, GetHWND(), FALSE))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for statusbar. Error: %s\n", sError);
+        return NULL;
+    }
+
+    //
+    // Also we need to reset it positioning to enable the SHOW attribute
+    //
+    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;
+    }

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

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

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

-        int                         nWidth
+        int                         nWidth;

         int                         nHeight;
         int                         nHeight;

-        int                         nStatbarWidth
+        int                         nStatbarWidth;

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

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

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

-        nHeight = vRect.xTop - vRect.xBottom;
-        
+        nHeight = vRect.yTop - vRect.yBottom;
+

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


@@ -504,6 +558,27 @@ void wxFrame::PositionStatusBar()
                                   ,nWidth
                                   ,nStatbarHeight
                                  );
                                   ,nWidth
                                   ,nStatbarHeight
                                  );

+        if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp))
+        {
+            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);
+            return;
+        }

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


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

-  wxMenuBar*                        pMenuBbar
+  wxMenuBar*                        pMenuBar

 )
 {
 )
 {

+    ERRORID                         vError;
+    wxString                        sError;
+    HWND                            hClient = NULLHANDLE;
+    HWND                            hFrame = NULLHANDLE;
+    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 = pMenuBbar->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();
+        //
+        // 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);
+    }

 
 

-    m_frameMenuBar = menu_bar;
-    menu_bar->Attach(this);
+    //
+    // Now resize the client to fit the new frame
+    //
+    WinQueryWindowPos(GetHWND(), &vSwp);
+    hTitlebar = WinWindowFromID(GetHWND(), FID_TITLEBAR);
+    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
+    hHScroll = WinWindowFromID(GetHWND(), FID_HORZSCROLL);
+    WinQueryWindowPos(hHScroll, &vSwpHScroll);
+    hVScroll = WinWindowFromID(GetHWND(), FID_VERTSCROLL);
+    WinQueryWindowPos(hVScroll, &vSwpVScroll);
+    hMenuBar = WinWindowFromID(GetHWND(), 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()
 {
 } // end of wxFrame::SetMenuBar
 
 void wxFrame::InternalSetMenuBar()
 {

-        
-    ::WinPostMsg( GetHwnd()
-                 ,WM_UPDATEFRAME
-                 ,FCF_MENU
-                 ,NULL
-                );
+    ERRORID                         vError;
+    wxString                        sError;
+    //
+    // Set the parent and owner of the menubar to be the frame
+    //
+    if (!::WinSetParent(m_hMenu, GetHWND(), FALSE))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }
+
+    if (!::WinSetOwner(m_hMenu, GetHWND()))
+    {
+        vError = ::WinGetLastError(vHabmain);
+        sError = wxPMErrorToStr(vError);
+        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+    }
+    WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

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

-// Responds to colour changes, and passes event on to children.
-void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
+//
+// Responds to colour changes, and passes event on to children
+//
+void wxFrame::OnSysColourChanged(
+  wxSysColourChangedEvent&          rEvent
+)

 {
 {

-// TODO:
-/*

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

-    if ( m_frameStatusBar )
+    if (m_frameStatusBar)

     {
     {

-        wxSysColourChangedEvent event2;
-        event2.SetEventObject( m_frameStatusBar );
-        m_frameStatusBar->GetEventHandler()->ProcessEvent(event2);
+        wxSysColourChangedEvent     vEvent2;
+
+        vEvent2.SetEventObject(m_frameStatusBar);
+        m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2);

     }
 
     }
 

+    //

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

-    wxWindow::OnSysColourChanged(event);
-*/
-}
+    //
+    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;

 
 

-/*
- * Frame window
- *
- */
+           wxToolBar*                  pTheToolBar = GetToolBar();
+           wxStatusBar*                pTheStatusBar = GetStatusBar();

 
 

-bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title,
-                   int x, int y, int width, int height, long style)
+        int                         nDummyWidth;
+
+        if (pTheToolBar)
+            pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+        if (pTheStatusBar)
+            pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);
+
+        //
+        // Zap the toolbar, menubar, and statusbar
+        //
+        if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar)
+        {
+            pTheToolBar->SetSize(-1,0);
+            pTheToolBar->Show(FALSE);
+        }
+
+        if (lStyle & wxFULLSCREEN_NOMENUBAR)
+        {
+            ::WinSetParent(m_hMenu, GetHWND(), FALSE);
+            ::WinSetOwner(m_hMenu, GetHWND());
+            ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+        }
+
+        //
+        // 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;
+
+        //
+        // Zap the frame borders
+        //
+
+        //
+        // Save the 'normal' window style
+        //
+        m_lFsOldWindowStyle = ::WinQueryWindowULong((HWND)GetHWND(), 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)GetHWND(), 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;
+
+        wxToolBar*                  pTheToolBar = GetToolBar();
+
+        //
+        // Restore the toolbar, menubar, and statusbar
+        //
+        if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR))
+        {
+            pTheToolBar->SetSize(-1, m_nFsToolBarHeight);
+            pTheToolBar->Show(TRUE);
+        }
+
+        if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0))
+        {
+            CreateStatusBar(m_nFsStatusBarFields);
+            PositionStatusBar();
+        }
+
+        if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0))
+        {
+            ::WinSetParent(m_hMenu, GetHWND(), FALSE);
+            ::WinSetOwner(m_hMenu, GetHWND());
+            ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+        }
+        Maximize(m_bFsIsMaximized);
+
+        ::WinSetWindowULong( (HWND)GetHWND()
+                            ,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
+//
+bool wxFrame::OS2Create(
+  int                               nId
+, wxWindow*                         pParent
+, const wxChar*                     zWclass
+, wxWindow*                         pWxWin
+, const wxChar*                     zTitle
+, int                               nX
+, int                               nY
+, int                               nWidth
+, int                               nHeight
+, long                              ulStyle
+)

 {
 {

-  m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);
-
-  // If child windows aren't properly drawn initially, WS_CLIPCHILDREN
-  // could be the culprit. But without it, you can get a lot of flicker.
-
-// TODO:
-/*
-  DWORD msflags = 0;
-  if ((style & wxCAPTION) == wxCAPTION)
-    msflags = WS_OVERLAPPED;
-  else
-    msflags = WS_POPUP;
-
-  if (style & wxMINIMIZE_BOX)
-    msflags |= WS_MINIMIZEBOX;
-  if (style & wxMAXIMIZE_BOX)
-    msflags |= WS_MAXIMIZEBOX;
-  if (style & wxTHICK_FRAME)
-    msflags |= WS_THICKFRAME;
-  if (style & wxSYSTEM_MENU)
-    msflags |= WS_SYSMENU;
-  if ((style & wxMINIMIZE) || (style & wxICONIZE))
-    msflags |= WS_MINIMIZE;
-  if (style & wxMAXIMIZE)
-    msflags |= WS_MAXIMIZE;
-  if (style & wxCAPTION)
-    msflags |= WS_CAPTION;
-  if (style & wxCLIP_CHILDREN)
-    msflags |= WS_CLIPCHILDREN;
-
-  // Keep this in wxFrame because it saves recoding this function
-  // in wxTinyFrame
-#if wxUSE_ITSY_BITSY
-  if (style & wxTINY_CAPTION_VERT)
-    msflags |= IBS_VERTCAPTION;
-  if (style & wxTINY_CAPTION_HORIZ)
-    msflags |= IBS_HORZCAPTION;
-#else
-  if (style & wxTINY_CAPTION_VERT)
-    msflags |= WS_CAPTION;
-  if (style & wxTINY_CAPTION_HORIZ)
-    msflags |= WS_CAPTION;
-#endif
-  if ((style & wxTHICK_FRAME) == 0)
-    msflags |= WS_BORDER;
+    ULONG                           ulCreateFlags = 0L;
+    ULONG                           ulStyleFlags = 0L;
+    ULONG                           ulExtraFlags = 0L;
+    FRAMECDATA                      vFrameCtlData;
+    HWND                            hParent = NULLHANDLE;
+    HWND                            hClient = NULLHANDLE;
+    HWND                            hFrame = NULLHANDLE;
+    HWND                            hTitlebar = NULLHANDLE;
+    HWND                            hHScroll = NULLHANDLE;
+    HWND                            hVScroll = NULLHANDLE;
+    SWP                             vSwp[10];
+    RECTL                           vRect[10];
+    USHORT                          uCtlCount;
+
+    m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON);

 
 

-  WXDWORD extendedStyle = MakeExtendedStyle(style);
+    if (pParent)
+        hParent = GetWinHwnd(pParent);
+    else
+        hParent = HWND_DESKTOP;

 
 

-#if !defined(__WIN16__) && !defined(__SC__)
-  if (style & wxFRAME_TOOL_WINDOW)
-    extendedStyle |= WS_EX_TOOLWINDOW;
-#endif
+    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 (style & wxSTAY_ON_TOP)
-    extendedStyle |= WS_EX_TOPMOST;
+        if (ulStyle & wxTINY_CAPTION_VERT)
+            ulCreateFlags |= FCF_TASKLIST;
+        if (ulStyle & wxTINY_CAPTION_HORIZ)
+            ulCreateFlags |= FCF_TASKLIST;

 
 

-  m_iconized = FALSE;
-  if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height,
-         msflags, NULL, extendedStyle) )
-         return FALSE;
+        if ((ulStyle & wxTHICK_FRAME) == 0)
+            ulCreateFlags |= FCF_BORDER;
+        if (ulStyle & wxFRAME_TOOL_WINDOW)
+            ulExtraFlags = kFrameToolWindow;

 
 

-  // Seems to be necessary if we use WS_POPUP
-  // style instead of WS_OVERLAPPED
-  if (width > -1 && height > -1)
-    ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height));
-*/
-  return TRUE;
-}
+        if (ulStyle & wxSTAY_ON_TOP)
+            ulCreateFlags |= FCF_SYSMODAL;
+    }
+    if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE))
+        ulStyleFlags |= WS_MINIMIZED;
+    if (ulStyle & wxMAXIMIZE)
+        ulStyleFlags |= WS_MAXIMIZED;
+
+    //
+    // Clear the visible flag, we always call show
+    //
+    ulStyleFlags &= (unsigned long)~WS_VISIBLE;
+    m_bIconized = FALSE;

 
 

+    //
+    // Set the frame control block
+    //
+    vFrameCtlData.cb            = sizeof(vFrameCtlData);
+    vFrameCtlData.flCreateFlags = ulCreateFlags;
+    vFrameCtlData.hmodResources = 0L;
+    vFrameCtlData.idResources   = 0;
+
+    //
+    // Create the frame window
+    //
+
+    if (!wxWindow::OS2Create( hParent
+                             ,WC_FRAME
+                             ,(PSZ)zTitle
+                             ,0
+                             ,0, 0, 0, 0
+                             ,NULLHANDLE
+                             ,HWND_TOP
+                             ,(ULONG)nId
+                             ,(PVOID)&vFrameCtlData
+                             ,NULL
+                            ))
+    {
+        return FALSE;
+    }
+
+    //
+    // Now size everything.  If adding a menu the client will need to be resized.
+    //
+
+    if (!::WinSetWindowPos( GetHWND()
+                           ,HWND_TOP
+                           ,nX
+                           ,nY
+                           ,nWidth
+                           ,nHeight
+                           ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
+                          ))
+        return FALSE;
+
+    uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
+    for (int i = 0; i < uCtlCount; i++)
+    {
+        if (vSwp[i].hwnd == GetHWND())
+            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));
+    }
+    return TRUE;
+} // end of wxFrame::OS2Create
+
+//

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

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

 {
 {

-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
+    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
     {
         // 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 *child = node->GetData();
+        wxWindow*                   pChild = pNode->GetData();

 
 

-        if ( !child->IsTopLevel()
+        if (!pChild->IsTopLevel()

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

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

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

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

 #endif // wxUSE_STATUSBAR
            )
         {
 #endif // wxUSE_STATUSBAR
            )
         {

-            child->SetFocus();
+            pChild->SetFocus();

             return;
         }
     }
             return;
         }
     }

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

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


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

-    wxPoint pt(0, 0);
+    wxPoint                         vPoint(0, 0);
+

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

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

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

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

         }
         else
         {
         }
         else
         {

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

         }
     }
         }
     }

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

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


@@ -745,74 +1105,99 @@ void wxFrame::DoClientToScreen(int *x, int *y) const
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR
 

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

 {
 {

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

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

-

     return m_frameToolBar;
     return m_frameToolBar;

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

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

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

 
 #if wxUSE_STATUSBAR
 
 #if wxUSE_STATUSBAR

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

     {
     {

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

     }
 #endif // wxUSE_STATUSBAR
 
     if ( GetToolBar() )
     {
     }
 #endif // wxUSE_STATUSBAR
 
     if ( GetToolBar() )
     {

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

 
 

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

         {
         {

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

         }
         else
         {
         }
         else
         {

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

         }
 
         }
 

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

     }
     }

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

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

+//

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

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

 {
 {

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

     {
     {

-        wxWindow *win = node->GetData();
+        wxWindow*                   pWin = pNode->GetData();

 
 

-        if ( win->IsKindOf(CLASSINFO(wxFrame)) )
+        if (pWin->IsKindOf(CLASSINFO(wxFrame)) )

         {
         {

-            ((wxFrame *)win)->Iconize(bIconize);
+            ((wxFrame *)pWin)->Iconize(bIconize);

         }
     }
         }
     }

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

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


@@ -821,68 +1206,82 @@ void wxFrame::IconizeChildFrames(bool bIconize)
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // preprocessing
 // ---------------------------------------------------------------------------

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

 {
 {

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

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

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

         return FALSE;
 
         return FALSE;
 

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

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

-

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

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

     {
     {

-        if ( m_iconized )
+        if (m_bIconized)

         {
         {

-            HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
-                                      : (HICON)m_defaultIcon;
+            //
+            // Icons in PM are the same as "pointers"
+            //
+            HPOINTER                hIcon;

 
 

+            if (m_icon.Ok())
+                hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L);
+            else
+                hIcon = (HPOINTER)m_hDefaultIcon;
+
+            //

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

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

 
 

+            //

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

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

 
 

-            if ( hIcon )
+            if (hIcon)

             {
             {

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

 
 

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

 
 

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

 
 

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

             }
             }

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

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

+/*          DosBeep(500,500);
+            HPS                             hPS;
+            RECTL                           vRect;
+
+            hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
+            WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
+            WinEndPaint(hPS);*/
+

             return wxWindow::HandlePaint();
         }
     }
             return wxWindow::HandlePaint();
         }
     }


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

-*/

     return FALSE;
     return FALSE;

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

 
 

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

 {
 {

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

 
 

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

     {
     {

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

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

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

                 break;
 
                 break;
 

+            //

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

+            //

             IconizeChildFrames(FALSE);
 
             IconizeChildFrames(FALSE);
 

+            //

             // fall through
             // fall through

+            //

 
 

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

             break;
 
             break;
 

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

             IconizeChildFrames(TRUE);
             IconizeChildFrames(TRUE);

-
-            m_iconized = TRUE;
+            m_bIconized = TRUE;

             break;
     }
 
             break;
     }
 

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

     {
     {

+        //

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

+        //

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

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

 
 

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

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

+        wxSizeEvent                 vEvent( wxSize( nX
+                                                   ,nY
+                                                  )
+                                           ,m_windowId
+                                          );

 
 

-        wxSizeEvent event(wxSize(x, y), m_windowId);
-        event.SetEventObject( this );
-        processed = GetEventHandler()->ProcessEvent(event);
+        vEvent.SetEventObject(this);
+        bProcessed = GetEventHandler()->ProcessEvent(vEvent);

     }
     }

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

 
 

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

 {
 {

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

     {
     {

+        //

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

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

     }
 
     }
 

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

     {
     {

-        if ( wxCurrentPopupMenu )
+        if (wxCurrentPopupMenu)

         {
         {

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

             wxCurrentPopupMenu = NULL;
 
             wxCurrentPopupMenu = NULL;
 

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

         }
 
         }
 

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

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

-*/

     return FALSE;
     return FALSE;

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

 
 

-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
+bool wxFrame::HandleMenuSelect(
+  WXWORD                            nItem
+, WXWORD                            nFlags
+, WXHMENU                           hMenu
+)

 {
 {

-    int item;
-    if ( flags == 0xFFFF && hMenu == 0 )
+//    int                             nMenuItem;
+
+/*  This is wrong section according to IBM's documentation
+    if (nFlags == 0xFFFF && hMenu == 0)

     {
     {

-        // menu was removed from screen
-        item = -1;
+        //
+        // Menu was removed from screen
+        //
+        nMenuItem = -1;

     }
     }

-// TODO:
-/*
-    else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
+    else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR))

     {
     {

-        item = nItem;
+        nMenuItem = nItem;

     }
     else
     {
     }
     else
     {

-        // don't give hints for separators (doesn't make sense) nor for the
+        //
+        // Don't give hints for separators (doesn't make sense) nor for the

         // items opening popup menus (they don't have them anyhow)
         // items opening popup menus (they don't have them anyhow)

+        //

         return FALSE;
     }
 */
         return FALSE;
     }
 */

-    wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item);
-    event.SetEventObject( this );

 
 

-    return GetEventHandler()->ProcessEvent(event);
-}
+    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

 
 // ---------------------------------------------------------------------------
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // the window proc for wxFrame
 // ---------------------------------------------------------------------------
 

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

 {
 {

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

 
 

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

     {
         case WM_CLOSE:
     {
         case WM_CLOSE:

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

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

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

             break;
 
         case WM_COMMAND:
             {
             break;
 
         case WM_COMMAND:
             {

-                WORD id, cmd;
-                WXHWND hwnd;
-                UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam,
-                              &id, &hwnd, &cmd);
-
-                processed = HandleCommand(id, cmd, (WXHWND)hwnd);
+                WORD                wId;
+                WORD                wCmd;
+                WXHWND              hWnd;
+
+                UnpackCommand( (WXWPARAM)wParam
+                              ,(WXLPARAM)lParam
+                              ,&wId
+                              ,&hWnd
+                              ,&wCmd
+                             );
+                bProcessed = HandleCommand( wId
+                                           ,wCmd
+                                           ,(WXHWND)hWnd
+                                          );

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

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

             }
             break;
 
         case WM_PAINT:
             }
             break;
 
         case WM_PAINT:

-            processed = HandlePaint();
+            bProcessed = HandlePaint();

             break;
 
             break;
 

-        case WM_QUERYDRAGICON:
+        case WM_ERASEBACKGROUND:
+            //
+            // Return TRUE to request PM to paint the window background
+            // in SYSCLR_WINDOW.
+            //
+            bProcessed = TRUE;
+            mRc = (MRESULT)(TRUE);
+            break;
+
+        case CM_QUERYDRAGIMAGE:

             {
             {

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

             }
             break;
 
         case WM_SIZE:
             }
             break;
 
         case WM_SIZE:

-            processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
+            bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam);

             break;
     }
 
             break;
     }
 

-    if ( !processed )
-        rc = wxWindow::MSWWindowProc(message, wParam, lParam);
-
-    return rc;
-*/
-    return (MRESULT)0;
-}
+    if (!bProcessed )
+        mRc = wxWindow::OS2WindowProc( uMessage
+                                      ,wParam
+                                      ,lParam
+                                     );
+    return (MRESULT)mRc;
+} // wxFrame::OS2WindowProc