Build fixes.

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 6c57b9aa91ddcf612968e21c2285c628f2ba7b89..0db6e081e7fd00ee22571df606fda815580d9997 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


@@ -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)
     {


@@ -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,7 @@ void wxWindowOS2::DoMoveWindow(
         MoveChildren(nYDiff);
         ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
     }
         MoveChildren(nYDiff);
         ::WinQueryWindowPos(GetHwnd(), &m_vWinSwp);
     }

+    MoveChildren(nHeightDelta);

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


@@ -1951,10 +1960,15 @@ 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 ( nX == -1 && nY == -1 )
     {
         wxPoint mouse = wxGetMousePosition();
     if ( nX == -1 && nY == -1 )
     {
         wxPoint mouse = wxGetMousePosition();


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

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

     }
     wxCurrentPopupMenu = pMenu;
 
     }
     wxCurrentPopupMenu = pMenu;
 


@@ -1981,13 +1997,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 +2973,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 +3004,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 +3042,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 +3052,7 @@ void wxRemoveHandleAssociation(
   wxWindowOS2*                      pWin
 )
 {
   wxWindowOS2*                      pWin
 )
 {

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

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


@@ -3629,14 +3660,14 @@ 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())
         {
 
         if (pWin->GetParent())
         {


@@ -3645,7 +3676,7 @@ void wxWindowOS2::OnSysColourChanged(
             rEvent.m_eventObject = pWin;
             pWin->GetEventHandler()->ProcessEvent(vEvent);
         }
             rEvent.m_eventObject = pWin;
             pWin->GetEventHandler()->ProcessEvent(vEvent);
         }

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

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


@@ -4047,7 +4078,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
     //


@@ -4065,26 +4096,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]);

 
 

-        if (hCursor != NULLHANDLE)
+        InitMouseEvent( vEvent
+                       ,nX
+                       ,nY
+                       ,uFlags
+                       );
+
+        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(


@@ -4377,11 +4412,11 @@ 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


@@ -5276,7 +5311,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;


@@ -5285,9 +5320,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;


@@ -5298,11 +5333,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;


@@ -5318,7 +5353,7 @@ wxWindowOS2* FindWindowForMouseEvent(
                                 pWinUnderMouse = pGrandChild;
                                 break;
                             }
                                 pWinUnderMouse = pGrandChild;
                                 break;
                             }

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

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


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

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

             }
         }
     }
             }
         }
     }