Visualage fixes for Stefan's socket implementations, some scrolling fixes and dir...

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 3a91b2ccaba4ee9eee0ad29213f300024f34711f..11a6da140e97fc263a63dc80d6458afad498e0e5 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -379,7 +379,7 @@ wxWindow *wxWindowBase::FindFocus()
     HWND hWnd = ::GetFocus();
     if ( hWnd )
     {
     HWND hWnd = ::GetFocus();
     if ( hWnd )
     {

-        return wxFindWinFromHandle((WXHWND) hWnd);
+        return wxGetWindowFromHWND((WXHWND)hWnd);

     }
 
     return NULL;
     }
 
     return NULL;


@@ -396,7 +396,7 @@ bool wxWindow::Enable(bool enable)
 
     // VZ: no, this is a bad idea: imagine that you have a dialog with some
     //     disabled controls and disable it - you really wouldn't like the
 
     // VZ: no, this is a bad idea: imagine that you have a dialog with some
     //     disabled controls and disable it - you really wouldn't like the

-    //     disabled controls eb reenabled too when you reenable the dialog!
+    //     disabled controls be reenabled too when you reenable the dialog!

 #if 0
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )
 #if 0
     wxWindowList::Node *node = GetChildren().GetFirst();
     while ( node )


@@ -2201,55 +2201,61 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 rc.result = TRUE;
             }
             break;
                 rc.result = TRUE;
             }
             break;

+

 #ifdef __WIN32__
         case WM_HELP:
 #ifdef __WIN32__
         case WM_HELP:

-        {
-            HELPINFO* info = (HELPINFO*) lParam;
-            // Don't yet process menu help events, just windows
-            if (info->iContextType == HELPINFO_WINDOW)

             {
             {

-                wxWindow* subjectOfHelp = this;
-                bool eventProcessed = FALSE;
-                while (subjectOfHelp && !eventProcessed)
+                HELPINFO* info = (HELPINFO*) lParam;
+                // Don't yet process menu help events, just windows
+                if (info->iContextType == HELPINFO_WINDOW)

                 {
                 {

-                    wxHelpEvent helpEvent(wxEVT_HELP, subjectOfHelp->GetId(), wxPoint(info->MousePos.x, info->MousePos.y) ) ; // info->iCtrlId);
-                    helpEvent.SetEventObject(this);
-                    eventProcessed = GetEventHandler()->ProcessEvent(helpEvent);
+                    wxWindow* subjectOfHelp = this;
+                    bool eventProcessed = FALSE;
+                    while (subjectOfHelp && !eventProcessed)
+                    {
+                        wxHelpEvent helpEvent(wxEVT_HELP,
+                                              subjectOfHelp->GetId(),
+                                              wxPoint(info->MousePos.x,
+                                              info->MousePos.y) );
+                        helpEvent.SetEventObject(this);
+                        eventProcessed =
+                            GetEventHandler()->ProcessEvent(helpEvent);
+
+                        // Go up the window hierarchy until the event is
+                        // handled (or not)
+                        subjectOfHelp = subjectOfHelp->GetParent();
+                    }

 
 

-                    // Go up the window hierarchy until the event is handled (or not)
-                    subjectOfHelp = subjectOfHelp->GetParent();
+                    processed = eventProcessed;

                 }
                 }

-                processed = eventProcessed;
-            }
-            else if (info->iContextType == HELPINFO_MENUITEM)
-            {
-                wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId) ;
-                helpEvent.SetEventObject(this);
-                processed = GetEventHandler()->ProcessEvent(helpEvent);
+                else if (info->iContextType == HELPINFO_MENUITEM)
+                {
+                    wxHelpEvent helpEvent(wxEVT_HELP, info->iCtrlId);
+                    helpEvent.SetEventObject(this);
+                    processed = GetEventHandler()->ProcessEvent(helpEvent);

 
 

+                }
+                //else: processed is already FALSE

             }
             }

-            else processed = FALSE;

             break;
             break;

-        }
+

         case WM_CONTEXTMENU:
         case WM_CONTEXTMENU:

-        {
-            HWND hWnd = (HWND) wParam;
-            
-            // we don't convert from screen to client coordinates as
-            // the event may be handled by a parent window
-            wxPoint p(LOWORD(lParam), HIWORD(lParam));
-            
-            wxContextMenuEvent contextEvent(wxEVT_CONTEXT_MENU, GetId(), p);
-            GetEventHandler()->ProcessEvent(contextEvent);
-            
-            // set processed to true even if the event is not handled because if we don't
-            // windows will propogate the WM_CONTEXTMENU up the parent window chain, which
-            // we have already done ourselves.
-            processed = true;
-            
+            {
+                // we don't convert from screen to client coordinates as
+                // the event may be handled by a parent window
+                wxPoint pt(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
+
+                wxContextMenuEvent evtCtx(wxEVT_CONTEXT_MENU, GetId(), pt);
+                GetEventHandler()->ProcessEvent(evtCtx);
+
+                // set processed to true even if the event is not handled
+                // because if we don't windows will propogate the
+                // WM_CONTEXTMENU up the parent window chain, which we have
+                // already done ourselves.
+                processed = true;
+            }

             break;
             break;

-        }
-#endif
+#endif // __WIN32__

     }
 
     if ( !processed )
     }
 
     if ( !processed )


@@ -3373,7 +3379,7 @@ bool wxWindow::HandleMouseMove(int x, int y, WXUINT flags)
     if ( (m_lastMouseEvent == wxEVT_RIGHT_DOWN ||
           m_lastMouseEvent == wxEVT_LEFT_DOWN ||
           m_lastMouseEvent == wxEVT_MIDDLE_DOWN) &&
     if ( (m_lastMouseEvent == wxEVT_RIGHT_DOWN ||
           m_lastMouseEvent == wxEVT_LEFT_DOWN ||
           m_lastMouseEvent == wxEVT_MIDDLE_DOWN) &&

-         (m_lastMouseX == event.m_x && m_lastMouseY == event.m_y) )
+         (m_lastMouseX == x && m_lastMouseY == y) )

     {
         m_lastMouseEvent = wxEVT_MOTION;
 
     {
         m_lastMouseEvent = wxEVT_MOTION;
 


@@ -3939,24 +3945,37 @@ extern wxWindow *wxGetWindowFromHWND(WXHWND hWnd)
         win = wxFindWinFromHandle((WXHWND)hwnd);
         if ( !win )
         {
         win = wxFindWinFromHandle((WXHWND)hwnd);
         if ( !win )
         {

-            // the radiobox pointer is stored in GWL_USERDATA only under Win32
+            // all these hacks only work under Win32 anyhow

 #ifdef __WIN32__
 #ifdef __WIN32__

+
+#if wxUSE_RADIOBOX

             // native radiobuttons return DLGC_RADIOBUTTON here and for any
             // wxWindow class which overrides WM_GETDLGCODE processing to
             // do it as well, win would be already non NULL
             // native radiobuttons return DLGC_RADIOBUTTON here and for any
             // wxWindow class which overrides WM_GETDLGCODE processing to
             // do it as well, win would be already non NULL

-            if ( ::SendMessage((HWND)hwnd, WM_GETDLGCODE,
-                               0, 0) & DLGC_RADIOBUTTON )
+            if ( ::SendMessage(hwnd, WM_GETDLGCODE, 0, 0) & DLGC_RADIOBUTTON )

             {
                 win = (wxWindow *)::GetWindowLong(hwnd, GWL_USERDATA);
             }
             {
                 win = (wxWindow *)::GetWindowLong(hwnd, GWL_USERDATA);
             }

-            else
+            //else: it's a wxRadioButton, not a radiobutton from wxRadioBox
+#endif // wxUSE_RADIOBOX
+
+            // spin control text buddy window should be mapped to spin ctrl
+            // itself so try it too
+#if wxUSE_SPINCTRL
+            if ( !win )
+            {
+                win = wxSpinCtrl::GetSpinForTextCtrl((WXHWND)hwnd);
+            }
+#endif // wxUSE_SPINCTRL
+

 #endif // Win32
 #endif // Win32

+
+            if ( !win )

             {
                 // hwnd is not a wxWindow, try its parent next below
                 hwnd = ::GetParent(hwnd);
             }
         }
             {
                 // hwnd is not a wxWindow, try its parent next below
                 hwnd = ::GetParent(hwnd);
             }
         }

-        //else: it's a wxRadioButton, not a radiobutton from wxRadioBox

     }
 
     while ( hwnd && !win )
     }
 
     while ( hwnd && !win )


@@ -3993,8 +4012,9 @@ void wxSetKeyboardHook(bool doIt)
     else
     {
         UnhookWindowsHookEx(wxTheKeyboardHook);
     else
     {
         UnhookWindowsHookEx(wxTheKeyboardHook);

-               // avoids warning about statement with no effect (FreeProcInstance
-               // doesn't do anything under Win32)
+
+        // avoids warning about statement with no effect (FreeProcInstance
+        // doesn't do anything under Win32)

 #if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(__NT__) && !defined(__GNUWIN32__)
         FreeProcInstance(wxTheKeyboardHookProc);
 #endif
 #if !defined(WIN32) && !defined(_WIN32) && !defined(__WIN32__) && !defined(__NT__) && !defined(__GNUWIN32__)
         FreeProcInstance(wxTheKeyboardHookProc);
 #endif