wxCriticalSection changes undone - should work now

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 3709ab01494d3417284170922401c19403e0f165..404ae402a7a6e9200f0c5546996e79d8213b47b8 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -59,6 +59,8 @@
 
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/private.h"
 

+#include "wx/textctrl.h"
+

 #include <string.h>
 
 #ifndef __GNUWIN32__
 #include <string.h>
 
 #ifndef __GNUWIN32__


@@ -234,6 +236,7 @@ void wxWindow::Init()
     m_isWindow = TRUE;
 
     // Generic
     m_isWindow = TRUE;
 
     // Generic

+//    m_windowCursor = * wxSTANDARD_CURSOR;

     m_windowId = 0;
     m_isShown = TRUE;
     m_windowStyle = 0;
     m_windowId = 0;
     m_isShown = TRUE;
     m_windowStyle = 0;


@@ -938,7 +941,7 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
     #define DIMENSION_TYPE int
 #endif
 
     #define DIMENSION_TYPE int
 #endif
 

-// Main Windows 3 window proc
+// Main Windows window proc

 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     wxASSERT( m_lastMsg == message &&
 long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
     wxASSERT( m_lastMsg == message &&


@@ -1176,6 +1179,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             return MSWOnSysCommand(wParam, lParam);
             break;
         }
             return MSWOnSysCommand(wParam, lParam);
             break;
         }

+

     case WM_COMMAND:
         {
 #ifdef __WIN32__
     case WM_COMMAND:
         {
 #ifdef __WIN32__


@@ -1227,9 +1231,7 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             return MSWOnMeasureItem((int)wParam, (WXMEASUREITEMSTRUCT *)lParam);
             break;
         }
             return MSWOnMeasureItem((int)wParam, (WXMEASUREITEMSTRUCT *)lParam);
             break;
         }

-

     case WM_KEYDOWN:
     case WM_KEYDOWN:

-    {

         // If this has been processed by an event handler,
         // return 0 now (we've handled it).
         if (MSWOnKeyDown((WORD) wParam, lParam))
         // If this has been processed by an event handler,
         // return 0 now (we've handled it).
         if (MSWOnKeyDown((WORD) wParam, lParam))


@@ -1255,24 +1257,46 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             case VK_RIGHT:
             case VK_DOWN:
             case VK_UP:
             case VK_RIGHT:
             case VK_DOWN:
             case VK_UP:

-            {

                 return Default();
                 return Default();

+
+#ifdef VK_APPS
+            // special case of VK_APPS: treat it the same as right mouse click
+            // because both usually pop up a context menu
+            case VK_APPS:
+                {
+
+#ifndef GET_X_LPARAM
+#define GET_X_LPARAM(lp)                        ((int)(short)LOWORD(lp))
+#define GET_Y_LPARAM(lp)                        ((int)(short)HIWORD(lp))
+#endif
+
+                    // construct the key mask
+                    WPARAM fwKeys = MK_RBUTTON;
+                    if ( (::GetKeyState(VK_CONTROL) & 0x100) != 0 )
+                        fwKeys |= MK_CONTROL;
+                    if ( (::GetKeyState(VK_SHIFT) & 0x100) != 0 )
+                        fwKeys |= MK_SHIFT;
+
+                    // simulate right mouse button click
+                    DWORD dwPos = ::GetMessagePos();
+                    int x = GET_X_LPARAM(dwPos),
+                        y = GET_Y_LPARAM(dwPos);
+
+                    ScreenToClient(&x, &y);
+                    MSWOnRButtonDown(x, y, fwKeys);
+                }

                 break;
                 break;

-            }
+#endif // VK_APPS
+

             default:
                 if (!MSWOnChar((WORD)wParam, lParam))
                 {
                     return Default();
                 }
             default:
                 if (!MSWOnChar((WORD)wParam, lParam))
                 {
                     return Default();
                 }

-/*
-                if ( ::GetKeyState(VK_CONTROL) & 0x100 )
-                    return Default();
-*/

                 break;
         }
 
         break;
                 break;
         }
 
         break;

-    }

     case WM_KEYUP:
     {
         if (!MSWOnKeyUp((WORD) wParam, lParam))
     case WM_KEYUP:
     {
         if (!MSWOnKeyUp((WORD) wParam, lParam))


@@ -1285,7 +1309,6 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 return Default();
             break;
         }
                 return Default();
             break;
         }

-

     case WM_HSCROLL:
         {
 #ifdef __WIN32__
     case WM_HSCROLL:
         {
 #ifdef __WIN32__


@@ -1463,7 +1486,6 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 return 1L;
             break;
         }
                 return 1L;
             break;
         }

-

     case WM_GETMINMAXINFO:
         {
             MINMAXINFO *info = (MINMAXINFO *)lParam;
     case WM_GETMINMAXINFO:
         {
             MINMAXINFO *info = (MINMAXINFO *)lParam;


@@ -1478,47 +1500,63 @@ long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             return MSWDefWindowProc(message, wParam, lParam );
             break;
         }
             return MSWDefWindowProc(message, wParam, lParam );
             break;
         }

-

     case WM_GETDLGCODE:
     case WM_GETDLGCODE:

-        return MSWGetDlgCode();
-
+        {
+            return MSWGetDlgCode();
+        }

     case WM_SETCURSOR:
         {
     case WM_SETCURSOR:
         {

-            // don't set cursor when the mouse is not in the client part
-            short nHitTest = LOWORD(lParam);
-            if ( nHitTest == HTCLIENT || nHitTest == HTERROR )
+            // don't set cursor for other windows, only for this one: this
+            // prevents children of this window from gettign the same cursor
+            // as the parent has (don't forget that this message is propagated
+            // by default up the window parent-child hierarchy)
+            if ( (HWND)wParam == hWnd )

             {
             {

-                HCURSOR hcursor = 0;
-                if ( wxIsBusy() )
+                // don't set cursor when the mouse is not in the client part
+                short nHitTest = LOWORD(lParam);
+                if ( nHitTest == HTCLIENT || nHitTest == HTERROR )

                 {
                 {

-                    extern HCURSOR gs_wxBusyCursor; // from msw\utils.cpp
+                    HCURSOR hcursor = 0;
+                    if ( wxIsBusy() )
+                    {
+                        // from msw\utils.cpp
+                        extern HCURSOR gs_wxBusyCursor;

 
 

-                    hcursor = gs_wxBusyCursor;
-                }
-                else if ( m_windowCursor.Ok() )
-                {
-                    hcursor = (HCURSOR)m_windowCursor.GetHCURSOR();
-                }
-                else
-                {
-                    extern wxCursor *g_globalCursor; // from msw\data.cpp
+                        hcursor = gs_wxBusyCursor;
+                    }
+                    else
+                    {
+                        wxCursor *cursor = NULL;

 
 

-                    if ( g_globalCursor && g_globalCursor->Ok() )
-                        hcursor = (HCURSOR)g_globalCursor->GetHCURSOR();
-                }
+                        if ( m_windowCursor.Ok() )
+                        {
+                            cursor = &m_windowCursor;
+                        }
+                        else
+                        {
+                            // from msw\data.cpp
+                            extern wxCursor *g_globalCursor;

 
 

-                if ( hcursor )
-                {
-                    ::SetCursor(hcursor);
+                            if ( g_globalCursor && g_globalCursor->Ok() )
+                                cursor = g_globalCursor;
+                        }

 
 

-                    // returning TRUE stops the DefWindowProc() from further
-                    // processing this message - exactly what we need because
-                    // we've just set the cursor
-                    return TRUE;
+                        if ( cursor )
+                            hcursor = (HCURSOR)cursor->GetHCURSOR();
+                    }
+
+                    if ( hcursor )
+                    {
+                        ::SetCursor(hcursor);
+
+                        // returning TRUE stops the DefWindowProc() from
+                        // further processing this message - exactly what we
+                        // need because we've just set the cursor.
+                        return TRUE;
+                    }

                 }
             }
         }
                 }
             }
         }

-

         return MSWDefWindowProc(message, wParam, lParam );
 
     default:
         return MSWDefWindowProc(message, wParam, lParam );
 
     default:


@@ -2114,6 +2152,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
         if ( ::IsDialogMessage((HWND)GetHWND(), msg) )
             return TRUE;
     }
         if ( ::IsDialogMessage((HWND)GetHWND(), msg) )
             return TRUE;
     }

+

 #if wxUSE_TOOLTIPS
     if ( m_tooltip )
     {
 #if wxUSE_TOOLTIPS
     if ( m_tooltip )
     {


@@ -2124,6 +2163,19 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg)
     }
 #endif // wxUSE_TOOLTIPS
 
     }
 #endif // wxUSE_TOOLTIPS
 

+/* This code manages to disable character input completely. Nice one!
+ * Probably because the dialog is requesting all char input. Or,
+ * it gets called by non-dialog windows.
+
+    // In case we don't have wxTAB_TRAVERSAL style on.
+    // If we don't call this, we may never process Enter correctly.
+    if ( m_hWnd != 0 && (GetWindowStyleFlag() & wxTAB_TRAVERSAL) == 0 )
+    {
+        MSG *msg = (MSG *)pMsg;
+        if ( ::IsDialogMessage((HWND)GetHWND(), msg) )
+            return TRUE;
+    }
+*/

     return FALSE;
 }
 
     return FALSE;
 }