Committing in .

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

diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp
index 0643f20c5bd8202de70e729fff0191030653b0c6..31ce6652e5000e9061d8c61a8cce78d2df33ca01 100644 (file)
--- a/src/os2/frame.cpp
+++ b/src/os2/frame.cpp
@@ -90,6 +90,18 @@ void wxFrame::Init()
     m_nFsToolBarHeight   = 0;
     m_bFsIsMaximized     = FALSE;
     m_bFsIsShowing       = FALSE;
     m_nFsToolBarHeight   = 0;
     m_bFsIsMaximized     = FALSE;
     m_bFsIsShowing       = FALSE;

+
+    //
+    // 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(


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

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

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


@@ -202,14 +214,12 @@ void wxFrame::DoGetClientSize(
     // 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() )


@@ -245,14 +255,12 @@ void wxFrame::DoSetClientSize(
 )
 {
     HWND                            hWnd = GetHwnd();
 )
 {
     HWND                            hWnd = GetHwnd();

-    HWND                            hWndClient;

     RECTL                           vRect;
     RECTL                           vRect2;
 
     RECTL                           vRect;
     RECTL                           vRect2;
 

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

 
 

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

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


@@ -284,7 +292,7 @@ void wxFrame::DoSetClientSize(
     vPointl.x = vRect2.xLeft;
     vPoint.y  = vRect2.yTop;
 
     vPointl.x = vRect2.xLeft;
     vPoint.y  = vRect2.yTop;
 

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

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


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

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

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


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

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

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


@@ -342,40 +350,23 @@ void wxFrame::DoShowWindow(
   int                               bShowCmd
 )
 {
   int                               bShowCmd
 )
 {

-    HWND                            hClient;
-    HWND                            hTitlebar = NULLHANDLE;
-    HWND                            hHScroll = NULLHANDLE;
-    HWND                            hVScroll = NULLHANDLE;
-    HWND                            hMenuBar = NULLHANDLE;
+    HWND                            hClient = NULLHANDLE;

     SWP                             vSwp;
     SWP                             vSwp;

-    SWP                             vSwpTitlebar;
-    SWP                             vSwpVScroll;
-    SWP                             vSwpHScroll;
-    SWP                             vSwpMenu;

 
     //
 
     //

-    // Send anything to initialize the frame
+    // Reset the window position

     //
     //

-    WinQueryWindowPos(GetHwnd(), &vSwp);
-    hClient = WinWindowFromID(GetHwnd(), FID_CLIENT);
-    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( hClient
+    WinQueryWindowPos(m_hFrame, &vSwp);
+    WinSetWindowPos( GetHwnd()

                     ,HWND_TOP
                     ,HWND_TOP

-                    ,SV_CXSIZEBORDER
-                    ,(SV_CYSIZEBORDER - 1) + vSwpHScroll.cy
-                    ,vSwp.cx - ((SV_CXSIZEBORDER * 2) + vSwpVScroll.cx)
-                    ,vSwp.cy - ((SV_CYSIZEBORDER * 2) + 1 + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy)
-                    ,SWP_SIZE | SWP_MOVE
+                    ,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);

-    ::WinShowWindow(hClient, (BOOL)bShowCmd);

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


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

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

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

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

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


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

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

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


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

-        ::WinSendMsg( GetHwnd()
+        ::WinSendMsg( m_hFrame

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

-        ::WinSendMsg( GetHwnd()
+        ::WinSendMsg( m_hFrame

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


@@ -517,8 +508,7 @@ void wxFrame::PositionStatusBar()
         HWND                        hWndClient;
         RECTL                       vRect;
 
         HWND                        hWndClient;
         RECTL                       vRect;
 

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

         nWidth = vRect.xRight - vRect.xLeft;
         nHeight = vRect.yTop - vRect.yBottom;
 
         nWidth = vRect.xRight - vRect.xLeft;
         nHeight = vRect.yTop - vRect.yBottom;
 


@@ -552,6 +542,20 @@ void wxFrame::SetMenuBar(
   wxMenuBar*                        pMenuBar
 )
 {
   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();


@@ -578,15 +582,52 @@ void wxFrame::SetMenuBar(
             return;
     }
 
             return;
     }
 

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

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

+
+    //
+    // Now resize the client to fit the new frame
+    //
+    WinQueryWindowPos(m_hFrame, &vSwp);
+    hTitlebar = WinWindowFromID(m_hFrame, FID_TITLEBAR);
+    WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
+    hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL);
+    WinQueryWindowPos(hHScroll, &vSwpHScroll);
+    hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL);
+    WinQueryWindowPos(hVScroll, &vSwpVScroll);
+    hMenuBar = WinWindowFromID(m_hFrame, FID_MENU);
+    WinQueryWindowPos(hMenuBar, &vSwpMenu);
+    WinSetWindowPos( GetHwnd()
+                    ,HWND_TOP
+                    ,SV_CXSIZEBORDER/2
+                    ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2
+                    ,vSwp.cx - ((SV_CXSIZEBORDER + 1) + vSwpVScroll.cx)
+                    ,vSwp.cy - ((SV_CYSIZEBORDER + 1) + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy/2)
+                    ,SWP_SIZE | SWP_MOVE
+                   );

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

-    WinSendMsg((HWND)GetHwnd(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+    WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);

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


@@ -759,25 +800,15 @@ bool wxFrame::OS2Create(
     FRAMECDATA                      vFrameCtlData;
     HWND                            hParent = NULLHANDLE;
     HWND                            hClient = NULLHANDLE;
     FRAMECDATA                      vFrameCtlData;
     HWND                            hParent = NULLHANDLE;
     HWND                            hClient = NULLHANDLE;

+    HWND                            hFrame = NULLHANDLE;

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

-    HWND                            hMenuBar = NULLHANDLE;
-    HWND                            hMenu1 = NULLHANDLE;
-    HWND                            hMenu2 = NULLHANDLE;
-    HWND                            hFrame = NULLHANDLE;
-    SWP                             vSwp;
-    SWP                             vSwpTitlebar;
-    SWP                             vSwpVScroll;
-    SWP                             vSwpHScroll;
-    SWP                             vSwpMenu;
-    RGB2                            vRgb;
+    SWP                             vSwp[10];
+    RECTL                           vRect[10];
+    USHORT                          uCtlCount;

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

-    memset(&vSwp, '\0', sizeof(SWP));
-    memset(&vSwpTitlebar, '\0', sizeof(SWP));
-    memset(&vSwpVScroll, '\0', sizeof(SWP));
-    memset(&vSwpHScroll, '\0', sizeof(SWP));

 
     if (pParent)
         hParent = GetWinHwnd(pParent);
 
     if (pParent)
         hParent = GetWinHwnd(pParent);


@@ -844,55 +875,43 @@ bool wxFrame::OS2Create(
     //
     // Create the frame window
     //
     //
     // Create the frame window
     //

-    if (!wxWindow::OS2Create( hParent
-                             ,WC_FRAME
-                             ,zTitle
-                             ,ulStyleFlags
-                             ,(long)nX
-                             ,(long)nY
-                             ,(long)nWidth
-                             ,(long)nHeight
+    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

                              ,NULLHANDLE
                              ,HWND_TOP
                              ,NULLHANDLE
                              ,HWND_TOP

-                             ,(long)nId
-                             ,(void*)&vFrameCtlData
+                             ,(unsigned long)FID_CLIENT
+                             ,NULL

                              ,NULL
                             ))
     {
         return FALSE;
     }
 
                              ,NULL
                             ))
     {
         return FALSE;
     }
 

-    //
-    // Create the client window.  We must call the API from here rather than
-    // the static base class create because we need a separate handle
-    //
-    if ((hClient = ::WinCreateWindow( hFrame   // Frame is parent
-                                     ,wxFrameClassName
-                                     ,NULL        // Window title
-                                     ,0           // No styles
-                                     ,0, 0, 0, 0  // Window position
-                                     ,NULLHANDLE  // Owner
-                                     ,HWND_TOP    // Sibling
-                                     ,FID_CLIENT  // standard client ID
-                                     ,NULL        // Creation data
-                                     ,NULL        // Window Pres Params
-                                     )) == 0L)
-    {
-        return FALSE;
-    }
-    //
-    // Send anything to initialize the frame
-    //
-    ::WinSendMsg( hFrame
-                 ,WM_UPDATEFRAME
-                 ,(MPARAM)FCF_TASKLIST
-                 ,(MPARAM)0
-                );
-

     //
     // 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( hFrame
+    if (!::WinSetWindowPos( m_hFrame

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


@@ -902,47 +921,34 @@ bool wxFrame::OS2Create(
                           ))
         return FALSE;
 
                           ))
         return FALSE;
 

-    WinQueryWindowPos(hFrame, &vSwp);
+    uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
+    for (int i = 0; i < uCtlCount; i++)
+    {
+        if (vSwp[i].hwnd == m_hFrame)
+            memcpy(&m_vSwp, &vSwp[i], sizeof(SWP));
+        else if (vSwp[i].hwnd == m_hVScroll)
+            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
+        else if (vSwp[i].hwnd == m_hHScroll)
+            memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP));
+        else if (vSwp[i].hwnd == m_hTitleBar)
+            memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP));
+    }

 
     //
 
     //

-    // Set the client window's background, otherwise it is transparent!
+    // Now set the size of the client

     //
     //

-    wxColour                        vColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
-
-    vRgb.bRed   = (BYTE)vColour.Red();
-    vRgb.bGreen = (BYTE)vColour.Green();
-    vRgb.bBlue  = (BYTE)vColour.Blue();
-    WinSetPresParam( hClient
-                    ,PP_BACKGROUNDCOLOR
-                    ,(ULONG)sizeof(RGB2)
-                    ,(PVOID)&vRgb
+    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

                    );
                    );

-    if (ulCreateFlags & FCF_TITLEBAR)
-    {
-        hTitlebar = WinWindowFromID(hFrame, FID_TITLEBAR);
-        WinQueryWindowPos(hTitlebar, &vSwpTitlebar);
-    }
-    if (ulCreateFlags & FCF_HORZSCROLL)
-    {
-        hHScroll = WinWindowFromID(hFrame, FID_HORZSCROLL);
-        WinQueryWindowPos(hHScroll, &vSwpHScroll);
-    }
-    if (ulCreateFlags & FCF_VERTSCROLL)
-    {
-        hVScroll = WinWindowFromID(hFrame, FID_VERTSCROLL);
-        WinQueryWindowPos(hVScroll, &vSwpVScroll);
-    }
-    if (!::WinSetWindowPos( hClient
-                           ,HWND_TOP
-                           ,SV_CXSIZEBORDER
-                           ,(SV_CYSIZEBORDER - 1) + vSwpHScroll.cy
-                           ,vSwp.cx - ((SV_CXSIZEBORDER * 2) + vSwpVScroll.cx)
-                           ,vSwp.cy - ((SV_CYSIZEBORDER * 2) + 1 + vSwpTitlebar.cy + vSwpHScroll.cy)
-                           ,SWP_SIZE | SWP_MOVE
-                          ))
-        return FALSE;
-    WinQueryWindowPos(hClient, &vSwp);
-    ::WinShowWindow(hClient, TRUE);
+
+    //
+    // Set the client window's background, otherwise it is transparent!
+    //

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


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

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

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


@@ -1145,7 +1150,7 @@ bool wxFrame::HandlePaint()
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

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

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


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

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

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


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

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

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


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

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

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


@@ -1416,12 +1420,21 @@ MRESULT wxFrame::OS2WindowProc(
             bProcessed = HandlePaint();
             break;
 
             bProcessed = HandlePaint();
             break;
 

+        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:
             {
                 HPOINTER                hIcon;
 
                 if (m_icon.Ok())
         case CM_QUERYDRAGIMAGE:
             {
                 HPOINTER                hIcon;
 
                 if (m_icon.Ok())

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

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