Fix CYGWIN socket compilo

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 791e888a4da081b25d3cf1cdad6527bcde73bdf8..d5cb4af9fbb9639048a0dd9fab9bb84f3740298f 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -128,8 +128,6 @@ QMSG                      s_currentMsg;
 wxMenu*                   wxCurrentPopupMenu = NULL;
 #endif // wxUSE_MENUS_NATIVE
 
 wxMenu*                   wxCurrentPopupMenu = NULL;
 #endif // wxUSE_MENUS_NATIVE
 

-wxList*                   wxWinHandleList = NULL;
-

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------


@@ -218,17 +216,17 @@ wxWindow* wxWindowOS2::FindItem(
     }
 #endif // wxUSE_CONTROLS
 
     }
 #endif // wxUSE_CONTROLS
 

-    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator  current = GetChildren().GetFirst();

 
 

-    while (pCurrent)
+    while (current)

     {
     {

-        wxWindow*                   pChildWin = pCurrent->GetData();
+        wxWindow*                   pChildWin = current->GetData();

         wxWindow*                   pWnd = pChildWin->FindItem(lId);
 
         if (pWnd)
             return pWnd;
 
         wxWindow*                   pWnd = pChildWin->FindItem(lId);
 
         if (pWnd)
             return pWnd;
 

-        pCurrent = pCurrent->GetNext();
+        current = current->GetNext();

     }
     return(NULL);
 } // end of wxWindowOS2::FindItem
     }
     return(NULL);
 } // end of wxWindowOS2::FindItem


@@ -241,11 +239,11 @@ wxWindow* wxWindowOS2::FindItemByHWND(
 , bool                              bControlOnly
 ) const
 {
 , bool                              bControlOnly
 ) const
 {

-    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator current = GetChildren().GetFirst();

 
 

-    while (pCurrent)
+    while (current)

     {
     {

-        wxWindow*                   pParent = pCurrent->GetData();
+        wxWindow*                   pParent = current->GetData();

 
         //
         // Do a recursive search.
 
         //
         // Do a recursive search.


@@ -261,7 +259,7 @@ wxWindow* wxWindowOS2::FindItemByHWND(
 #endif // wxUSE_CONTROLS
             )
         {
 #endif // wxUSE_CONTROLS
             )
         {

-            wxWindow*               pItem = pCurrent->GetData();
+            wxWindow*               pItem = current->GetData();

 
             if (pItem->GetHWND() == hWnd)
                 return(pItem);
 
             if (pItem->GetHWND() == hWnd)
                 return(pItem);


@@ -271,7 +269,7 @@ wxWindow* wxWindowOS2::FindItemByHWND(
                     return(pItem);
             }
         }
                     return(pItem);
             }
         }

-        pCurrent = pCurrent->GetNext();
+        current = current->GetNext();

     }
     return(NULL);
 } // end of wxWindowOS2::FindItemByHWND
     }
     return(NULL);
 } // end of wxWindowOS2::FindItemByHWND


@@ -475,7 +473,7 @@ void wxWindowOS2::SetFocusFromKbd()
     wxWindowBase::SetFocusFromKbd();
 } // end of wxWindowOS2::SetFocus
 
     wxWindowBase::SetFocusFromKbd();
 } // end of wxWindowOS2::SetFocus
 

-wxWindow* wxWindowBase::FindFocus()
+wxWindow* wxWindowBase::DoFindFocus()

 {
     HWND                            hWnd = ::WinQueryFocus(HWND_DESKTOP);
 
 {
     HWND                            hWnd = ::WinQueryFocus(HWND_DESKTOP);
 


@@ -484,7 +482,7 @@ wxWindow* wxWindowBase::FindFocus()
         return wxFindWinFromHandle((WXHWND)hWnd);
     }
     return NULL;
         return wxFindWinFromHandle((WXHWND)hWnd);
     }
     return NULL;

-} // wxWindowBase::FindFocus
+} // wxWindowBase::DoFindFocus

 
 bool wxWindowOS2::Enable(
   bool                              bEnable
 
 bool wxWindowOS2::Enable(
   bool                              bEnable


@@ -506,11 +504,11 @@ bool wxWindowOS2::Enable(
     if (IsTopLevel())
         return TRUE;
 
     if (IsTopLevel())
         return TRUE;
 

-    wxWindowList::Node*             pNode = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator     node = GetChildren().GetFirst();

 
 

-    while (pNode)
+    while (node)

     {
     {

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

 
         if (bEnable)
         {
 
         if (bEnable)
         {


@@ -540,7 +538,7 @@ bool wxWindowOS2::Enable(
                 m_pChildrenDisabled->Append(pChild);
             }
         }
                 m_pChildrenDisabled->Append(pChild);
             }
         }

-        pNode = pNode->GetNext();
+        node = node->GetNext();

     }
     if (bEnable && m_pChildrenDisabled)
     {
     }
     if (bEnable && m_pChildrenDisabled)
     {


@@ -938,16 +936,14 @@ void wxWindowOS2::ScrollWindow(
 {
     RECTL                           vRect;
 
 {
     RECTL                           vRect;
 

+    ::WinQueryWindowRect(GetHwnd(), &vRect);
+    int                             height = vRect.yTop;

     if (pRect)
     {
         vRect.xLeft   = pRect->x;
     if (pRect)
     {
         vRect.xLeft   = pRect->x;

-        vRect.yTop    = pRect->y + pRect->height;
+        vRect.yTop    = height - pRect->y;

         vRect.xRight  = pRect->x + pRect->width;
         vRect.xRight  = pRect->x + pRect->width;

-        vRect.yBottom = pRect->y;
-    }
-    else
-    {
-        ::WinQueryWindowRect(GetHwnd(), &vRect);
+        vRect.yBottom = vRect.yTop - pRect->height;

     }
     nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows.
     ::WinScrollWindow( GetHwnd()
     }
     nDy *= -1; // flip the sign of Dy as OS/2 is opposite Windows.
     ::WinScrollWindow( GetHwnd()


@@ -955,11 +951,10 @@ void wxWindowOS2::ScrollWindow(
                       ,(LONG)nDy
                       ,&vRect
                       ,&vRect
                       ,(LONG)nDy
                       ,&vRect
                       ,&vRect

-                      ,NULLHANDLE
+                      ,NULL

                       ,NULL
                       ,SW_SCROLLCHILDREN | SW_INVALIDATERGN
                      );
                       ,NULL
                       ,SW_SCROLLCHILDREN | SW_INVALIDATERGN
                      );

-    Refresh();

 } // end of wxWindowOS2::ScrollWindow
 
 // ---------------------------------------------------------------------------
 } // end of wxWindowOS2::ScrollWindow
 
 // ---------------------------------------------------------------------------


@@ -1220,11 +1215,14 @@ void wxWindowOS2::Refresh(
         if (pRect)
         {
             RECTL                   vOs2Rect;
         if (pRect)
         {
             RECTL                   vOs2Rect;

+            int                     height;

 
 

+            ::WinQueryWindowRect(GetHwnd(), &vOs2Rect);
+           height = vOs2Rect.yTop;

             vOs2Rect.xLeft   = pRect->x;
             vOs2Rect.xLeft   = pRect->x;

-            vOs2Rect.yBottom = pRect->y;
+            vOs2Rect.yTop    = height - pRect->y;

             vOs2Rect.xRight  = pRect->x + pRect->width;
             vOs2Rect.xRight  = pRect->x + pRect->width;

-            vOs2Rect.yTop    = pRect->y + pRect->height;
+            vOs2Rect.yBottom = vOs2Rect.yTop - pRect->height;

 
             ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
         }
 
             ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
         }


@@ -1472,6 +1470,16 @@ void wxWindowOS2::DoMoveWindow(
     RECTL                           vRect;
     wxWindow*                       pParent = GetParent();
 
     RECTL                           vRect;
     wxWindow*                       pParent = GetParent();
 

+    /* Due to OS/2's inverted coordinate system, changing the height
+       of a window requires repositioning all it's children, e.g. if
+       you want a child of height 100 to be at the top left corner of
+       the parent you need to position the lower left corner of the
+       child at (0, (height of parent - 100)), so, obviously, if the
+       height of the parent changes, the child needs to be repositioned. */
+    int                         nHeightDelta;
+    GetSize(0, &nHeightDelta);
+    nHeightDelta = nHeight - nHeightDelta;
+

     if (pParent && !IsKindOf(CLASSINFO(wxDialog)))
     {
         int                         nOS2Height = GetOS2ParentHeight(pParent);
     if (pParent && !IsKindOf(CLASSINFO(wxDialog)))
     {
         int                         nOS2Height = GetOS2ParentHeight(pParent);


@@ -1620,6 +1628,14 @@ void wxWindowOS2::DoMoveWindow(
         MoveChildren(nYDiff);
         ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
     }
         MoveChildren(nYDiff);
         ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
     }

+#if 0
+    // FIXME: By my logic, the next line should be needed as it moves child
+    //        windows when resizing the parent (see comment at beginning of
+    //       function). However, this seems to cause lots of problems. At
+    //        least, e.g. the grid sample almost works with this line
+    //        commented out but crashes badly with it. 
+    MoveChildren(nHeightDelta);
+#endif

 } // end of wxWindowOS2::DoMoveWindow
 
 //
 } // end of wxWindowOS2::DoMoveWindow
 
 //


@@ -1777,11 +1793,6 @@ void wxWindowOS2::DoSetClientSize(
     GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxWindowOS2::DoSetClientSize
 
     GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxWindowOS2::DoSetClientSize
 

-wxPoint wxWindowOS2::GetClientAreaOrigin() const
-{
-    return wxPoint(0, 0);
-} // end of wxWindowOS2::GetClientAreaOrigin
-

 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // text metrics
 // ---------------------------------------------------------------------------


@@ -1951,11 +1962,16 @@ bool wxWindowOS2::DoPopupMenu(
     HWND                            hWndParent = GetHwnd();
     HWND                            hMenu = GetHmenuOf(pMenu);
     bool                            bIsWaiting = TRUE;
     HWND                            hWndParent = GetHwnd();
     HWND                            hMenu = GetHmenuOf(pMenu);
     bool                            bIsWaiting = TRUE;

+    int                             nHeight;
+
+    // Protect against recursion
+    if (wxCurrentPopupMenu)
+        return false;

 
     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();
 
     pMenu->SetInvokingWindow(this);
     pMenu->UpdateUI();

-    
-    if ( x == -1 && y == -1 )
+
+    if ( nX == -1 && nY == -1 )

     {
         wxPoint mouse = wxGetMousePosition();
         nX = mouse.x; nY = mouse.y;
     {
         wxPoint mouse = wxGetMousePosition();
         nX = mouse.x; nY = mouse.y;


@@ -1965,6 +1981,8 @@ bool wxWindowOS2::DoPopupMenu(
         DoClientToScreen( &nX
                          ,&nY
                         );
         DoClientToScreen( &nX
                          ,&nY
                         );

+        DoGetSize(0,&nHeight);
+        nY = nHeight - nY;

     }
     wxCurrentPopupMenu = pMenu;
 
     }
     wxCurrentPopupMenu = pMenu;
 


@@ -1981,13 +1999,12 @@ bool wxWindowOS2::DoPopupMenu(
     {
         QMSG                            vMsg;
 
     {
         QMSG                            vMsg;
 

-        if (vMsg.msg == WM_MENUEND || vMsg.msg == WM_COMMAND)
-        {
+        ::WinGetMsg(vHabmain,&vMsg, (HWND)0, 0, 0);
+        if (vMsg.msg == WM_COMMAND)

             bIsWaiting = FALSE;
             bIsWaiting = FALSE;

-        }

         ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);
         ::WinDispatchMsg(vHabmain, (PQMSG)&vMsg);

-

     }
     }

+

     wxCurrentPopupMenu = NULL;
     pMenu->SetInvokingWindow(NULL);
     return TRUE;
     wxCurrentPopupMenu = NULL;
     pMenu->SetInvokingWindow(NULL);
     return TRUE;


@@ -2958,6 +2975,20 @@ MRESULT wxWindowOS2::OS2WindowProc(
                 mResult = (MRESULT)TRUE;
             }
             break;
                 mResult = (MRESULT)TRUE;
             }
             break;

+
+#if wxUSE_MENUS_NATIVE
+         case WM_MENUEND:
+            if (wxCurrentPopupMenu)
+            {
+                if (GetHmenuOf(wxCurrentPopupMenu) == (HWND)lParam)
+                {
+                    // Break out of msg loop in DoPopupMenu
+                    ::WinPostMsg((HWND)lParam,WM_COMMAND,wParam,0);
+                }
+            }
+            break;
+#endif // wxUSE_MENUS_NATIVE
+

     }
     if (!bProcessed)
     {
     }
     if (!bProcessed)
     {


@@ -2975,15 +3006,17 @@ MRESULT wxWindowOS2::OS2WindowProc(
     return mResult;
 } // end of wxWindowOS2::OS2WindowProc
 
     return mResult;
 } // end of wxWindowOS2::OS2WindowProc
 

+// ----------------------------------------------------------------------------
+// wxWindow <-> HWND map
+// ----------------------------------------------------------------------------
+
+wxWinHashTable *wxWinHandleHash = NULL;
+

 wxWindow* wxFindWinFromHandle(
   WXHWND                            hWnd
 )
 {
 wxWindow* wxFindWinFromHandle(
   WXHWND                            hWnd
 )
 {

-    wxNode*                         pNode = wxWinHandleList->Find((long)hWnd);
-
-    if (!pNode)
-        return NULL;
-    return (wxWindow *)pNode->GetData();
+    return (wxWindow *)wxWinHandleHash->Get((long)hWnd);

 } // end of wxFindWinFromHandle
 
 void wxAssociateWinWithHandle(
 } // end of wxFindWinFromHandle
 
 void wxAssociateWinWithHandle(


@@ -3011,9 +3044,9 @@ void wxAssociateWinWithHandle(
     }
     else if (!pOldWin)
     {
     }
     else if (!pOldWin)
     {

-        wxWinHandleList->Append( (long)hWnd
-                                ,pWin
-                               );
+        wxWinHandleHash->Put( (long)hWnd
+                             ,(wxWindow *)pWin
+                            );

     }
 } // end of wxAssociateWinWithHandle
 
     }
 } // end of wxAssociateWinWithHandle
 


@@ -3021,7 +3054,7 @@ void wxRemoveHandleAssociation(
   wxWindowOS2*                      pWin
 )
 {
   wxWindowOS2*                      pWin
 )
 {

-    wxWinHandleList->DeleteObject(pWin);
+    wxWinHandleHash->Delete((long)pWin->GetHWND());

 } // end of wxRemoveHandleAssociation
 
 //
 } // end of wxRemoveHandleAssociation
 
 //


@@ -3327,7 +3360,7 @@ bool wxWindowOS2::HandleShow(
 {
     wxShowEvent                     vEvent(GetId(), bShow);
 
 {
     wxShowEvent                     vEvent(GetId(), bShow);
 

-    vEvent.m_eventObject = this;
+    vEvent.SetEventObject(this);

     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxWindowOS2::HandleShow
 
     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxWindowOS2::HandleShow
 


@@ -3337,7 +3370,7 @@ bool wxWindowOS2::HandleInitDialog(
 {
     wxInitDialogEvent               vEvent(GetId());
 
 {
     wxInitDialogEvent               vEvent(GetId());
 

-    vEvent.m_eventObject = this;
+    vEvent.SetEventObject(this);

     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxWindowOS2::HandleInitDialog
 
     return GetEventHandler()->ProcessEvent(vEvent);
 } // end of wxWindowOS2::HandleInitDialog
 


@@ -3629,23 +3662,23 @@ void wxWindowOS2::OnSysColourChanged(
   wxSysColourChangedEvent&          rEvent
 )
 {
   wxSysColourChangedEvent&          rEvent
 )
 {

-    wxWindowListNode*               pNode = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

 
 

-    while (pNode)
+    while (node)

     {
         //
         // Only propagate to non-top-level windows
         //
     {
         //
         // Only propagate to non-top-level windows
         //

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

 
         if (pWin->GetParent())
         {
             wxSysColourChangedEvent vEvent;
 
 
         if (pWin->GetParent())
         {
             wxSysColourChangedEvent vEvent;
 

-            rEvent.m_eventObject = pWin;
+            rEvent.SetEventObject(pWin);

             pWin->GetEventHandler()->ProcessEvent(vEvent);
         }
             pWin->GetEventHandler()->ProcessEvent(vEvent);
         }

-        pNode = pNode->GetNext();
+        node = node->GetNext();

     }
 } // end of wxWindowOS2::OnSysColourChanged
 
     }
 } // end of wxWindowOS2::OnSysColourChanged
 


@@ -3686,6 +3719,51 @@ bool wxWindowOS2::HandlePaint()
          return FALSE;
     }
 
          return FALSE;
     }
 

+    // Get all the rectangles from the region, convert the individual
+    // rectangles to "the other" coordinate system and reassemble a
+    // region from the rectangles, to be feed into m_updateRegion.
+    //
+    // FIXME: This is a bad hack since OS/2 API specifies that rectangles
+    //         passed into GpiSetRegion must not have Bottom > Top,
+    //          however, at first sight, it _seems_ to work nonetheless.
+    //
+    RGNRECT                     vRgnData;
+    PRECTL                      pUpdateRects = NULL;
+    vRgnData.ulDirection = RECTDIR_LFRT_TOPBOT;
+    if (::GpiQueryRegionRects( hPS          // Pres space
+                              ,hRgn         // Handle of region to query
+                              ,NULL         // Return all RECTs
+                              ,&vRgnData    // Will contain number or RECTs in region
+                              ,NULL         // NULL to return number of RECTs
+                             ))
+    {
+        pUpdateRects = new RECTL[vRgnData.crcReturned];
+        vRgnData.crc = vRgnData.crcReturned;
+        vRgnData.ircStart = 1;
+        if (::GpiQueryRegionRects( hPS      // Pres space of source
+                                  ,hRgn     // Handle of source region
+                                  ,NULL     // Return all RECTs
+                                  ,&vRgnData // Operations set to return rects
+                                  ,pUpdateRects // Will contain the actual RECTS
+                                 ))
+        {
+            int                     height;
+            RECT                    vRect;
+            ::WinQueryWindowRect(GetHwnd(), &vRect);
+            height = vRect.yTop;
+
+            for(size_t i = 0; i < vRgnData.crc; i++)
+            {
+                int                 rectHeight;
+                rectHeight = pUpdateRects[i].yTop - pUpdateRects[i].yBottom;
+                pUpdateRects[i].yTop = height - pUpdateRects[i].yTop;
+                pUpdateRects[i].yBottom = pUpdateRects[i].yTop + rectHeight;
+            }
+            ::GpiSetRegion(hPS, hRgn, vRgnData.crc, pUpdateRects);
+            delete [] pUpdateRects;
+        }
+    }
+

     m_updateRegion = wxRegion(hRgn, hPS);
 
     vEvent.SetEventObject(this);
     m_updateRegion = wxRegion(hRgn, hPS);
 
     vEvent.SetEventObject(this);


@@ -3981,7 +4059,7 @@ void wxWindowOS2::InitMouseEvent(
     rEvent.m_rightDown   = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) &
                            0x8000) != 0;
     rEvent.SetTimestamp(s_currentMsg.time);
     rEvent.m_rightDown   = (::WinGetKeyState(HWND_DESKTOP, VK_BUTTON2) &
                            0x8000) != 0;
     rEvent.SetTimestamp(s_currentMsg.time);

-    rEvent.m_eventObject = this;
+    rEvent.SetEventObject(this);

     rEvent.SetId(GetId());
 
 #if wxUSE_MOUSEEVENT_HACK
     rEvent.SetId(GetId());
 
 #if wxUSE_MOUSEEVENT_HACK


@@ -4002,7 +4080,7 @@ bool wxWindowOS2::HandleMouseEvent(
 
     //
     // The mouse events take consecutive IDs from WM_MOUSEFIRST to
 
     //
     // The mouse events take consecutive IDs from WM_MOUSEFIRST to

-    // WM_MOUSELAST, so it's enough to substract WM_MOUSEMOVE == WM_MOUSEFIRST
+    // WM_MOUSELAST, so it's enough to subtract WM_MOUSEMOVE == WM_MOUSEFIRST

     // from the message id and take the value in the table to get wxWin event
     // id
     //
     // from the message id and take the value in the table to get wxWin event
     // id
     //


@@ -4020,26 +4098,30 @@ bool wxWindowOS2::HandleMouseEvent(
         wxEVT_MIDDLE_DCLICK
     };
 
         wxEVT_MIDDLE_DCLICK
     };
 

-    wxMouseEvent                    vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]);
-
-    InitMouseEvent( vEvent
-                   ,nX
-                   ,nY
-                   ,uFlags
-                  );
-
-    bProcessed = GetEventHandler()->ProcessEvent(vEvent);
-    if (!bProcessed)
+    // Bounds check
+    if ((uMsg >= WM_MOUSEMOVE) && (uMsg <= WM_BUTTON3DBLCLK))

     {
     {

-        HPOINTER                    hCursor = (HPOINTER)GetCursor().GetHCURSOR();
+        wxMouseEvent               vEvent(eventsMouse[uMsg - WM_MOUSEMOVE]);
+
+        InitMouseEvent( vEvent
+                       ,nX
+                       ,nY
+                       ,uFlags
+                       );

 
 

-        if (hCursor != NULLHANDLE)
+        bProcessed = GetEventHandler()->ProcessEvent(vEvent);
+        if (!bProcessed)

         {
         {

-            ::WinSetPointer(HWND_DESKTOP, hCursor);
-            bProcessed = TRUE;
+            HPOINTER               hCursor = (HPOINTER)GetCursor().GetHCURSOR();
+
+            if (hCursor != NULLHANDLE)
+            {
+                ::WinSetPointer(HWND_DESKTOP, hCursor);
+                bProcessed = TRUE;
+            }

         }
     }
         }
     }

-    return GetEventHandler()->ProcessEvent(vEvent);
+    return bProcessed;

 } // end of wxWindowOS2::HandleMouseEvent
 
 bool wxWindowOS2::HandleMouseMove(
 } // end of wxWindowOS2::HandleMouseEvent
 
 bool wxWindowOS2::HandleMouseMove(


@@ -4094,7 +4176,7 @@ wxKeyEvent wxWindowOS2::CreateKeyEvent(
     vEvent.m_controlDown = IsCtrlDown();
     vEvent.m_altDown     = (HIWORD(lParam) & KC_ALT) == KC_ALT;
 
     vEvent.m_controlDown = IsCtrlDown();
     vEvent.m_altDown     = (HIWORD(lParam) & KC_ALT) == KC_ALT;
 

-    vEvent.m_eventObject = (wxWindow *)this; // const_cast
+    vEvent.SetEventObject((wxWindow *)this); // const_cast

     vEvent.m_keyCode     = nId;
     vEvent.m_rawCode = (wxUint32)wParam;
     vEvent.m_rawFlags = (wxUint32)lParam;
     vEvent.m_keyCode     = nId;
     vEvent.m_rawCode = (wxUint32)wParam;
     vEvent.m_rawFlags = (wxUint32)lParam;


@@ -4283,32 +4365,32 @@ bool wxWindowOS2::OS2OnScroll(
 
     vEvent.SetPosition(wPos);
     vEvent.SetOrientation(nOrientation);
 
     vEvent.SetPosition(wPos);
     vEvent.SetOrientation(nOrientation);

-    vEvent.m_eventObject = this;
+    vEvent.SetEventObject(this);

 
     switch (wParam)
     {
         case SB_LINEUP:
 
     switch (wParam)
     {
         case SB_LINEUP:

-            vEvent.m_eventType = wxEVT_SCROLLWIN_LINEUP;
+            vEvent.SetEventType(wxEVT_SCROLLWIN_LINEUP);

             break;
 
         case SB_LINEDOWN:
             break;
 
         case SB_LINEDOWN:

-            vEvent.m_eventType = wxEVT_SCROLLWIN_LINEDOWN;
+            vEvent.SetEventType(wxEVT_SCROLLWIN_LINEDOWN);

             break;
 
         case SB_PAGEUP:
             break;
 
         case SB_PAGEUP:

-            vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEUP;
+            vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEUP);

             break;
 
         case SB_PAGEDOWN:
             break;
 
         case SB_PAGEDOWN:

-            vEvent.m_eventType = wxEVT_SCROLLWIN_PAGEDOWN;
+            vEvent.SetEventType(wxEVT_SCROLLWIN_PAGEDOWN);

             break;
 
         case SB_SLIDERPOSITION:
             break;
 
         case SB_SLIDERPOSITION:

-            vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBRELEASE;
+            vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBRELEASE);

             break;
 
         case SB_SLIDERTRACK:
             break;
 
         case SB_SLIDERTRACK:

-            vEvent.m_eventType = wxEVT_SCROLLWIN_THUMBTRACK;
+            vEvent.SetEventType(wxEVT_SCROLLWIN_THUMBTRACK);

             break;
 
         default:
             break;
 
         default:


@@ -4332,15 +4414,19 @@ void wxWindowOS2::MoveChildren(
     {
         SWP                         vSwp;
 
     {
         SWP                         vSwp;
 

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

         {
         {

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

 
             ::WinQueryWindowPos( GetHwndOf(pWin)
                                 ,&vSwp
                                );
 
             ::WinQueryWindowPos( GetHwndOf(pWin)
                                 ,&vSwp
                                );

+            // Actually, only move children that already are placed on the
+            // frame, not ones which are still at wxDefaultCoord.
+            if (vSwp.y == wxDefaultCoord)
+                continue;

             if (pWin->IsKindOf(CLASSINFO(wxControl)))
             {
                 wxControl*          pCtrl;
             if (pWin->IsKindOf(CLASSINFO(wxControl)))
             {
                 wxControl*          pCtrl;


@@ -5231,7 +5317,7 @@ wxWindowOS2* FindWindowForMouseEvent(
 
         if (pWinUnderMouse)
         {
 
         if (pWinUnderMouse)
         {

-            wxWindowList::Node*     pCurrent = pWinUnderMouse->GetChildren().GetFirst();
+            wxWindowList::compatibility_iterator current = pWinUnderMouse->GetChildren().GetFirst();

             wxWindow*               pGrandChild = NULL;
             RECTL                   vRect;
             POINTL                  vPoint2;
             wxWindow*               pGrandChild = NULL;
             RECTL                   vRect;
             POINTL                  vPoint2;


@@ -5240,9 +5326,9 @@ wxWindowOS2* FindWindowForMouseEvent(
             //
             // Find a child window mouse might be under
             //
             //
             // Find a child window mouse might be under
             //

-            while (pCurrent)
+            while (current)

             {
             {

-                wxWindow*                   pChild = pCurrent->GetData();
+                wxWindow*                   pChild = current->GetData();

 
                 vPoint2.x = vPoint.x;
                 vPoint2.y = vPoint.y;
 
                 vPoint2.x = vPoint.x;
                 vPoint2.y = vPoint.y;


@@ -5253,11 +5339,11 @@ wxWindowOS2* FindWindowForMouseEvent(
                     if (pChild->IsTopLevel())
                     {
                         POINTL                  vPoint3;
                     if (pChild->IsTopLevel())
                     {
                         POINTL                  vPoint3;

-                        wxWindowList::Node*     pCurrent2 =pChild->GetChildren().GetFirst();
+                        wxWindowList::compatibility_iterator current2 =pChild->GetChildren().GetFirst();

 
 

-                        while (pCurrent2)
+                        while (current2)

                         {
                         {

-                            wxWindow*           pGrandChild = pCurrent2->GetData();
+                            wxWindow*           pGrandChild = current2->GetData();

 
                             vPoint3.x = vPoint2.x;
                             vPoint3.y = vPoint2.y;
 
                             vPoint3.x = vPoint2.x;
                             vPoint3.y = vPoint2.y;


@@ -5273,7 +5359,7 @@ wxWindowOS2* FindWindowForMouseEvent(
                                 pWinUnderMouse = pGrandChild;
                                 break;
                             }
                                 pWinUnderMouse = pGrandChild;
                                 break;
                             }

-                            pCurrent2 = pCurrent2->GetNext();
+                            current2 = current2->GetNext();

                         }
                         if (pGrandChild)
                             break;
                         }
                         if (pGrandChild)
                             break;


@@ -5285,7 +5371,7 @@ wxWindowOS2* FindWindowForMouseEvent(
                     if (rcVisible && rcEnabled)
                         break;
                 }
                     if (rcVisible && rcEnabled)
                         break;
                 }

-                pCurrent = pCurrent->GetNext();
+                current = current->GetNext();

             }
         }
     }
             }
         }
     }