clarified the parameters of MB2WC and WC2MB a little in the docs/headers

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index bffabad51620ff9d5f89a5a05dfa71e0a6105f57..5c826bf7bca6513ce6b2cd504774404f8c77251e 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -984,7 +984,7 @@ void wxWindowMSW::SubclassWin(WXHWND hWnd)
     {
         // don't bother restoring it neither: this also makes it easy to
         // implement IsOfStandardClass() method which returns true for the
     {
         // don't bother restoring it neither: this also makes it easy to
         // implement IsOfStandardClass() method which returns true for the

-        // standard controls and false for the wxWindows own windows as it can
+        // standard controls and false for the wxWidgets own windows as it can

         // simply check m_oldWndProc
         m_oldWndProc = NULL;
     }
         // simply check m_oldWndProc
         m_oldWndProc = NULL;
     }


@@ -1116,7 +1116,7 @@ void wxWindowMSW::SetWindowStyleFlag(long flags)
 
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {
 
 WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
 {

-    // translate common wxWindows styles to Windows ones
+    // translate common wxWidgets styles to Windows ones

 
     // most of windows are child ones, those which are not (such as
     // wxTopLevelWindow) should remove WS_CHILD in their MSWGetStyle()
 
     // most of windows are child ones, those which are not (such as
     // wxTopLevelWindow) should remove WS_CHILD in their MSWGetStyle()


@@ -1737,6 +1737,12 @@ bool wxWindowMSW::DoPopupMenu(wxMenu *menu, int x, int y)
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 
     menu->SetInvokingWindow(this);
     menu->UpdateUI();
 

+    if ( x == -1 && y == -1 )
+    {
+        wxPoint mouse = ScreenToClient(wxGetMousePosition());
+        x = mouse.x; y = mouse.y;
+    }
+

     HWND hWnd = GetHwnd();
     HMENU hMenu = GetHmenuOf(menu);
     POINT point;
     HWND hWnd = GetHwnd();
     HMENU hMenu = GetHmenuOf(menu);
     POINT point;


@@ -1905,8 +1911,8 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                                 return true;
                             }
                             else // no default button
                                 return true;
                             }
                             else // no default button

-                            {

 #endif // wxUSE_BUTTON
 #endif // wxUSE_BUTTON

+                            {

                                 // this is a quick and dirty test for a text
                                 // control
                                 if ( !(lDlgCode & DLGC_HASSETSEL) )
                                 // this is a quick and dirty test for a text
                                 // control
                                 if ( !(lDlgCode & DLGC_HASSETSEL) )


@@ -2142,7 +2148,7 @@ void wxWindowMSW::UnpackMenuSelect(WXWPARAM wParam, WXLPARAM lParam,
 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// Main wxWindows window proc and the window proc for wxWindow
+// Main wxWidgets window proc and the window proc for wxWindow

 // ---------------------------------------------------------------------------
 
 // Hook for new window just as it's being created, when the window isn't yet
 // ---------------------------------------------------------------------------
 
 // Hook for new window just as it's being created, when the window isn't yet


@@ -2346,9 +2352,11 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
 #ifndef __WXWINCE__
         case WM_PRINT:
             {
 #ifndef __WXWINCE__
         case WM_PRINT:
             {

+#if wxUSE_LISTCTRL

                 // Don't call the wx handlers in this case
                 if ( wxIsKindOf(this, wxListCtrl) )
                     break;
                 // Don't call the wx handlers in this case
                 if ( wxIsKindOf(this, wxListCtrl) )
                     break;

+#endif

 
                 if ( lParam & PRF_ERASEBKGND )
                     HandleEraseBkgnd((WXHDC)(HDC)wParam);
 
                 if ( lParam & PRF_ERASEBKGND )
                     HandleEraseBkgnd((WXHDC)(HDC)wParam);


@@ -3026,7 +3034,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
     /*
       NB: there used to be some code here which set the initial size of the
           window to the client size of the parent if no explicit size was
     /*
       NB: there used to be some code here which set the initial size of the
           window to the client size of the parent if no explicit size was

-          specified. This was wrong because wxWindows programs often assume
+          specified. This was wrong because wxWidgets programs often assume

           that they get a WM_SIZE (EVT_SIZE) upon creation, however this broke
           it. To see why, you should understand that Windows sends WM_SIZE from
           inside ::CreateWindow() anyhow. However, ::CreateWindow() is called
           that they get a WM_SIZE (EVT_SIZE) upon creation, however this broke
           it. To see why, you should understand that Windows sends WM_SIZE from
           inside ::CreateWindow() anyhow. However, ::CreateWindow() is called


@@ -3035,7 +3043,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
           event goes to some base class OnSize() instead). So the WM_SIZE we
           rely on is the one sent when the parent frame resizes its children
           but here is the problem: if the child already has just the right
           event goes to some base class OnSize() instead). So the WM_SIZE we
           rely on is the one sent when the parent frame resizes its children
           but here is the problem: if the child already has just the right

-          size, nothing will happen as both wxWindows and Windows check for
+          size, nothing will happen as both wxWidgets and Windows check for

           this and ignore any attempts to change the window size to the size it
           already has - so no WM_SIZE would be sent.
      */
           this and ignore any attempts to change the window size to the size it
           already has - so no WM_SIZE would be sent.
      */


@@ -3045,7 +3053,7 @@ bool wxWindowMSW::MSWGetCreateWindowCoords(const wxPoint& pos,
     //
     //  1. it results in huge frames on modern screens (1000*800 is not
     //     uncommon on my 1280*1024 screen) which is way too big for a half
     //
     //  1. it results in huge frames on modern screens (1000*800 is not
     //     uncommon on my 1280*1024 screen) which is way too big for a half

-    //     empty frame of most of wxWindows samples for example)
+    //     empty frame of most of wxWidgets samples for example)

     //
     //  2. it is buggy for frames with wxFRAME_TOOL_WINDOW style for which
     //     the default is for whatever reason 8*8 which breaks client <->
     //
     //  2. it is buggy for frames with wxFRAME_TOOL_WINDOW style for which
     //     the default is for whatever reason 8*8 which breaks client <->


@@ -5023,8 +5031,10 @@ int wxCharCodeWXToMSW(int id, bool *isVirtual)
     case WXK_CLEAR:     keySym = VK_CLEAR; break;
     case WXK_SHIFT:     keySym = VK_SHIFT; break;
     case WXK_CONTROL:   keySym = VK_CONTROL; break;
     case WXK_CLEAR:     keySym = VK_CLEAR; break;
     case WXK_SHIFT:     keySym = VK_SHIFT; break;
     case WXK_CONTROL:   keySym = VK_CONTROL; break;

+    case WXK_ALT:       keySym = VK_MENU; break;

     case WXK_MENU :     keySym = VK_MENU; break;
     case WXK_PAUSE:     keySym = VK_PAUSE; break;
     case WXK_MENU :     keySym = VK_MENU; break;
     case WXK_PAUSE:     keySym = VK_PAUSE; break;

+    case WXK_CAPITAL:   keySym = VK_CAPITAL; break;

     case WXK_PRIOR:     keySym = VK_PRIOR; break;
     case WXK_NEXT :     keySym = VK_NEXT; break;
     case WXK_END:       keySym = VK_END; break;
     case WXK_PRIOR:     keySym = VK_PRIOR; break;
     case WXK_NEXT :     keySym = VK_NEXT; break;
     case WXK_END:       keySym = VK_END; break;


@@ -5094,12 +5104,24 @@ bool wxGetKeyState(wxKeyCode key)
 {
     bool bVirtual;
     int vkey = wxCharCodeWXToMSW(key, &bVirtual);
 {
     bool bVirtual;
     int vkey = wxCharCodeWXToMSW(key, &bVirtual);

-    
-    //there aren't WXK_ macros for non-virtual key codes
-    if (bVirtual == false)
-        return false;
+    SHORT state;

 
 

-    return GetKeyState(vkey) < 0;
+    switch (key)
+    {
+    case WXK_NUMLOCK:
+    case WXK_CAPITAL:
+    case WXK_SCROLL:
+        // get the toggle state of the special key
+        state = GetKeyState(vkey);
+        break;
+        
+    default:
+        // Get the current state of the physical key
+        state = GetAsyncKeyState(vkey);
+        break;
+    }
+    // if the most significant bit is set then the key is down
+    return ( state & 0x0001 ) != 0;

 }
 
 wxWindow *wxGetActiveWindow()
 }
 
 wxWindow *wxGetActiveWindow()


@@ -5780,6 +5802,8 @@ bool wxWindowMSW::UnregisterHotKey(int hotkeyId)
     return true;
 }
 
     return true;
 }
 

+#if wxUSE_ACCEL
+

 bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 {
     int hotkeyId = wParam;
 bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
 {
     int hotkeyId = wParam;


@@ -5796,6 +5820,8 @@ bool wxWindowMSW::HandleHotKey(WXWPARAM wParam, WXLPARAM lParam)
     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 

+#endif // wxUSE_ACCEL
+

 #endif // wxUSE_HOTKEY
 
 // Not tested under WinCE
 #endif // wxUSE_HOTKEY
 
 // Not tested under WinCE