Corrected typo

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index f3faceb427628e10d4d7e47c1b518561030b8081..1b431f44435a3340619ff273972b30c2b589b2a2 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -90,6 +90,8 @@ 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
 
     //
     // Initialize SWP's


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

+

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


@@ -172,7 +175,7 @@ wxFrame::~wxFrame()
 
         if (wxTheApp->GetExitOnFrameDelete())
         {
 
         if (wxTheApp->GetExitOnFrameDelete())
         {

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

         }
     }
     wxModelessWindows.DeleteObject(this);
         }
     }
     wxModelessWindows.DeleteObject(this);


@@ -260,7 +263,7 @@ void wxFrame::DoSetClientSize(
 
     ::WinQueryWindowRect(GetHwnd(), &vRect);
 
 
     ::WinQueryWindowRect(GetHwnd(), &vRect);
 

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

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


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

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

 
 

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

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


@@ -317,7 +320,7 @@ void wxFrame::DoGetSize(
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

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


@@ -330,7 +333,7 @@ void wxFrame::DoGetPosition(
     RECTL                           vRect;
     POINTL                          vPoint;
 
     RECTL                           vRect;
     POINTL                          vPoint;
 

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

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


@@ -350,23 +353,8 @@ void wxFrame::DoShowWindow(
   int                               bShowCmd
 )
 {
   int                               bShowCmd
 )
 {

-    HWND                            hClient = NULLHANDLE;
-    SWP                             vSwp;
-
-    //
-    // Reset the window position
-    //
-    WinQueryWindowPos(m_hFrame, &vSwp);
-    WinSetWindowPos( GetHwnd()
-                    ,HWND_TOP
-                    ,vSwp.x
-                    ,vSwp.y
-                    ,vSwp.cx
-                    ,vSwp.cy
-                    ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE
-                   );
-    ::WinShowWindow(m_hFrame, (BOOL)bShowCmd);
-    ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
+    ::WinShowWindow(GetHWND(), (BOOL)bShowCmd);
+    m_bIconized = bShowCmd == SWP_MINIMIZE;

 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(
 } // end of wxFrame::DoShowWindow
 
 bool wxFrame::Show(


@@ -381,9 +369,9 @@ bool wxFrame::Show(
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 
     {
         wxActivateEvent             vEvent(wxEVT_ACTIVATE, TRUE, m_windowId);
 

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

         m_bIconized = vSwp.fl & SWP_MINIMIZE;
         m_bIconized = vSwp.fl & SWP_MINIMIZE;

-        ::WinEnableWindow(m_hFrame, TRUE);
+        ::WinEnableWindow(GetHWND(), TRUE);

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


@@ -434,7 +422,6 @@ void wxFrame::Restore()
 bool wxFrame::IsIconized() const
 {
     SWP                             vSwp;
 bool wxFrame::IsIconized() const
 {
     SWP                             vSwp;

-    bool                            bIconic;

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


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

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

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


@@ -463,12 +450,12 @@ void wxFrame::SetIcon(
 
     if ((m_icon.GetHICON()) != NULLHANDLE)
     {
 
     if ((m_icon.GetHICON()) != NULLHANDLE)
     {

-        ::WinSendMsg( m_hFrame
+        ::WinSendMsg( GetHWND()

                      ,WM_SETICON
                      ,(MPARAM)((HPOINTER)m_icon.GetHICON())
                      ,NULL
                     );
                      ,WM_SETICON
                      ,(MPARAM)((HPOINTER)m_icon.GetHICON())
                      ,NULL
                     );

-        ::WinSendMsg( m_hFrame
+        ::WinSendMsg( GetHWND()

                      ,WM_UPDATEFRAME
                      ,(MPARAM)FCF_ICON
                      ,(MPARAM)0
                      ,WM_UPDATEFRAME
                      ,(MPARAM)FCF_ICON
                      ,(MPARAM)0


@@ -501,7 +488,7 @@ wxStatusBar* wxFrame::OnCreateStatusBar(
     // so we have to set the parent to actually be the Frame.
     //
     hWnd = pStatusBar->GetHWND();
     // so we have to set the parent to actually be the Frame.
     //
     hWnd = pStatusBar->GetHWND();

-    if (!::WinSetParent(hWnd, m_hFrame, FALSE))
+    if (!::WinSetParent(hWnd, GetHWND(), FALSE))

     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);
     {
         vError = ::WinGetLastError(vHabmain);
         sError = wxPMErrorToStr(vError);


@@ -626,61 +613,50 @@ void wxFrame::SetMenuBar(
     if (!pMenuBar)
     {
         DetachMenuBar();
     if (!pMenuBar)
     {
         DetachMenuBar();

-        return;
-    }
-
-    m_frameMenuBar = NULL;

 
 

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

     }
     }

-
-    //
-    // Set the parent and owner of the menubar to be the frame
-    //
-    if (!::WinSetParent(m_hMenu, m_hFrame, FALSE))
+    else // set new non NULL menu bar

     {
     {

-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
-    }
+        m_frameMenuBar = NULL;

 
 

-    if (!::WinSetOwner(m_hMenu, m_hFrame))
-    {
-        vError = ::WinGetLastError(vHabmain);
-        sError = wxPMErrorToStr(vError);
-        wxLogError("Error setting parent for submenu. Error: %s\n", sError);
+        //
+        // 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);

     }
     }

-    InternalSetMenuBar();
-
-    m_frameMenuBar = pMenuBar;
-    pMenuBar->Attach(this);

 
     //
     // Now resize the client to fit the new frame
     //
 
     //
     // Now resize the client to fit the new frame
     //

-    WinQueryWindowPos(m_hFrame, &vSwp);
-    hTitlebar = WinWindowFromID(m_hFrame, FID_TITLEBAR);
+    WinQueryWindowPos(GetHWND(), &vSwp);
+    hTitlebar = WinWindowFromID(GetHWND(), FID_TITLEBAR);

     WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
     WinQueryWindowPos(hTitlebar, &vSwpTitlebar);

-    hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL);
+    hHScroll = WinWindowFromID(GetHWND(), FID_HORZSCROLL);

     WinQueryWindowPos(hHScroll, &vSwpHScroll);
     WinQueryWindowPos(hHScroll, &vSwpHScroll);

-    hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL);
+    hVScroll = WinWindowFromID(GetHWND(), FID_VERTSCROLL);

     WinQueryWindowPos(hVScroll, &vSwpVScroll);
     WinQueryWindowPos(hVScroll, &vSwpVScroll);

-    hMenuBar = WinWindowFromID(m_hFrame, FID_MENU);
+    hMenuBar = WinWindowFromID(GetHWND(), FID_MENU);

     WinQueryWindowPos(hMenuBar, &vSwpMenu);
     WinSetWindowPos( GetHwnd()
                     ,HWND_TOP
     WinQueryWindowPos(hMenuBar, &vSwpMenu);
     WinSetWindowPos( GetHwnd()
                     ,HWND_TOP


@@ -694,7 +670,25 @@ void wxFrame::SetMenuBar(
 
 void wxFrame::InternalSetMenuBar()
 {
 
 void wxFrame::InternalSetMenuBar()
 {

-    WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+    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
 
 //


@@ -727,86 +721,122 @@ bool wxFrame::ShowFullScreen(
 , long                              lStyle
 )
 {
 , long                              lStyle
 )
 {

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

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

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

 
 

-            wxToolBar *theToolBar = GetToolBar();
-            wxStatusBar *theStatusBar = GetStatusBar();
+           wxToolBar*                  pTheToolBar = GetToolBar();
+           wxStatusBar*                pTheStatusBar = GetStatusBar();

 
 

-        int dummyWidth;
+        int                         nDummyWidth;

 
 

-        if (theToolBar)
-            theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight);
-        if (theStatusBar)
-            theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight);
+        if (pTheToolBar)
+            pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight);
+        if (pTheStatusBar)
+            pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight);

 
 

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

         {
         {

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

         }
 
         }
 

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

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

         {
         {

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

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

-                delete theStatusBar;
+            delete pTheStatusBar;

         }
         else
         }
         else

-            m_fsStatusBarFields = 0;
+            m_nFsStatusBarFields = 0;

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-        // change our window style to be compatible with full-screen mode
-        SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
+        //
+        // Change our window style to be compatible with full-screen mode
+        //
+        ::WinSetWindowULong((HWND)GetHWND(), QWL_STYLE, (ULONG)lNewStyle);

 
 

-        // resize to the size of the desktop
-        int width, height;
+        //
+        // Resize to the size of the desktop
+        int                         nWidth;
+        int                         nHeight;

 
 

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

 
 

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

 
 

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

 
 

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

 
 

+        GetEventHandler()->ProcessEvent(vEvent);

         return TRUE;
     }
     else
         return TRUE;
     }
     else


@@ -814,35 +844,47 @@ bool wxFrame::ShowFullScreen(
         if (!IsFullScreen())
             return FALSE;
 
         if (!IsFullScreen())
             return FALSE;
 

-        m_fsIsShowing = FALSE;
+        m_bFsIsShowing = FALSE;

 
 

-        wxToolBar *theToolBar = GetToolBar();
+        wxToolBar*                  pTheToolBar = GetToolBar();

 
 

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

         {
         {

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

         }
 
         }
 

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

         {
         {

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

             PositionStatusBar();
         }
 
             PositionStatusBar();
         }
 

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

-*/
-    return TRUE;

 } // end of wxFrame::ShowFullScreen
 
 //
 } // end of wxFrame::ShowFullScreen
 
 //


@@ -946,33 +988,16 @@ bool wxFrame::OS2Create(
     //
     // Create the frame window
     //
     //
     // Create the frame window
     //

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

 
 

-    if (!wxWindow::OS2Create( m_hFrame
-                             ,wxFrameClassName
-                             ,NULL
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
-                             ,0L
+    if (!wxWindow::OS2Create( hParent
+                             ,WC_FRAME
+                             ,(PSZ)zTitle
+                             ,0
+                             ,0, 0, 0, 0

                              ,NULLHANDLE
                              ,HWND_TOP
                              ,NULLHANDLE
                              ,HWND_TOP

-                             ,(unsigned long)FID_CLIENT
-                             ,NULL
+                             ,(ULONG)nId
+                             ,(PVOID)&vFrameCtlData

                              ,NULL
                             ))
     {
                              ,NULL
                             ))
     {


@@ -982,7 +1007,8 @@ bool wxFrame::OS2Create(
     //
     // Now size everything.  If adding a menu the client will need to be resized.
     //
     //
     // Now size everything.  If adding a menu the client will need to be resized.
     //

-    if (!::WinSetWindowPos( m_hFrame
+
+    if (!::WinSetWindowPos( GetHWND()

                            ,HWND_TOP
                            ,nX
                            ,nY
                            ,HWND_TOP
                            ,nX
                            ,nY


@@ -992,10 +1018,10 @@ bool wxFrame::OS2Create(
                           ))
         return FALSE;
 
                           ))
         return FALSE;
 

-    uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
+    uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));

     for (int i = 0; i < uCtlCount; i++)
     {
     for (int i = 0; i < uCtlCount; i++)
     {

-        if (vSwp[i].hwnd == m_hFrame)
+        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));
             memcpy(&m_vSwp, &vSwp[i], sizeof(SWP));
         else if (vSwp[i].hwnd == m_hVScroll)
             memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));


@@ -1004,22 +1030,6 @@ bool wxFrame::OS2Create(
         else if (vSwp[i].hwnd == m_hTitleBar)
             memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
     }
         else if (vSwp[i].hwnd == m_hTitleBar)
             memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
     }

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

     return TRUE;
 } // end of wxFrame::OS2Create
 
     return TRUE;
 } // end of wxFrame::OS2Create
 


@@ -1209,7 +1219,7 @@ bool wxFrame::OS2TranslateMessage(
         return FALSE;
 
     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();
         return FALSE;
 
     const wxAcceleratorTable&       rAcceleratorTable = pMenuBar->GetAccelTable();

-    return rAcceleratorTable.Translate(m_hFrame, pMsg);
+    return rAcceleratorTable.Translate(GetHWND(), pMsg);

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


@@ -1219,7 +1229,7 @@ bool wxFrame::HandlePaint()
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

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

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


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

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

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


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

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

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


@@ -1264,12 +1274,13 @@ bool wxFrame::HandlePaint()
         }
         else
         {
         }
         else
         {

+/*          DosBeep(500,500);

             HPS                             hPS;
             RECTL                           vRect;
 
             hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
             WinFillRect(hPS, &vRect, SYSCLR_WINDOW);
             HPS                             hPS;
             RECTL                           vRect;
 
             hPS = WinBeginPaint(GetHwnd(), 0L, &vRect);
             WinFillRect(hPS, &vRect, SYSCLR_WINDOW);

-            WinEndPaint(hPS);
+            WinEndPaint(hPS);*/

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


@@ -1404,8 +1415,9 @@ bool wxFrame::HandleMenuSelect(
 , WXHMENU                           hMenu
 )
 {
 , WXHMENU                           hMenu
 )
 {

-    int                             nMenuItem;
+//    int                             nMenuItem;

 
 

+/*  This is wrong section according to IBM's documentation

     if (nFlags == 0xFFFF && hMenu == 0)
     {
         //
     if (nFlags == 0xFFFF && hMenu == 0)
     {
         //


@@ -1425,10 +1437,24 @@ bool wxFrame::HandleMenuSelect(
         //
         return FALSE;
     }
         //
         return FALSE;
     }

-    wxMenuEvent                     vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem);
+*/

 
 

-    vEvent.SetEventObject(this);
-    return GetEventHandler()->ProcessEvent(vEvent);
+    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
 
 // ---------------------------------------------------------------------------
 } // end of wxFrame::HandleMenuSelect
 
 // ---------------------------------------------------------------------------


@@ -1489,6 +1515,7 @@ MRESULT wxFrame::OS2WindowProc(
                                               ,wFlags
                                               ,hMenu
                                              );
                                               ,wFlags
                                               ,hMenu
                                              );

+                mRc = (MRESULT)TRUE;

             }
             break;
 
             }
             break;
 


@@ -1510,7 +1537,7 @@ MRESULT wxFrame::OS2WindowProc(
                 HPOINTER                hIcon;
 
                 if (m_icon.Ok())
                 HPOINTER                hIcon;
 
                 if (m_icon.Ok())

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

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


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

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

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