reset m_selectionOld when the selection is programatically changed

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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index ce28f74fa4b9a0e3b7e6fb3dd77bec452f2ac8a9..d3745d4db5de6d660736e3c99e8aff804b0ef30f 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4049,9 +4049,14 @@ wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow * WXUNUSED(child))
     return m_hasBgCol ? GetBackgroundColour() : wxNullColour;
 }
 
-WXHBRUSH wxWindow::MSWGetBgBrush(WXHDC hDC)
+WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)
 {
-    for ( wxWindow *win = this; win; win = win->GetParent() )
+    return parent->MSWGetBgBrushForChild(hDC, (wxWindow *)this);
+}
+
+WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC)
+{
+    for ( wxWindow *win = (wxWindow *)this; win; win = win->GetParent() )
     {
         // background is not inherited beyond the containing TLW
         if ( win->IsTopLevel() )
@@ -4966,8 +4971,10 @@ int wxCharCodeMSWToWX(int keySym, WXLPARAM lParam)
         case VK_NUMLOCK:    id = WXK_NUMLOCK; break;
         case VK_SCROLL:     id = WXK_SCROLL; break;
 
+        // the mapping for these keys may be incorrect on non-US keyboards so
+        // maybe we shouldn't map them to ASCII values at all
         case VK_OEM_1:      id = ';'; break;
-        case VK_OEM_PLUS:   id = '='; break;
+        case VK_OEM_PLUS:   id = '+'; break;
         case VK_OEM_COMMA:  id = ','; break;
         case VK_OEM_MINUS:  id = '-'; break;
         case VK_OEM_PERIOD: id = '.'; break;
@@ -5082,7 +5089,7 @@ bool wxGetKeyState(wxKeyCode key)
     bool bVirtual;
 
 //High order with GetAsyncKeyState only available on WIN32
-#ifdef __WIN32__    
+#ifdef __WIN32__
     //If the requested key is a LED key, return
     //true if the led is pressed
     if (key == WXK_NUMLOCK ||
@@ -5090,12 +5097,12 @@ bool wxGetKeyState(wxKeyCode key)
         key == WXK_SCROLL)
     {
 #endif
-        //low order bit means LED is highlighted, 
+        //low order bit means LED is highlighted,
         //high order means key is down
         //Here, for compat with other ports we want both
         return GetKeyState( wxCharCodeWXToMSW(key, &bVirtual) ) != 0;
 
-#ifdef __WIN32__    
+#ifdef __WIN32__
     }
     else
     {