Applied patch for non-Latin keyboards.

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 14726230ab95e4a0493829cab87d66fc29f00897..d032c864b75408ddb315af74c11817f2f8921845 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -360,6 +360,7 @@ bool wxWindow::Create(
         {
             nTempy = pParent->GetSize().y + (vPos.y + rSize.y);
             pParent->SetSize(0, 0, pParent->GetSize().x, nTempy);
+            nTempy = pParent->GetSize().y - (vPos.y + rSize.y);
         }
 #endif
         vPos.y = nTempy;
@@ -728,7 +729,7 @@ void wxWindow::SetScrollbar(
     int                             nPageSize = nThumbVisible;
     SBCDATA                         vInfo;
     HWND                            hWnd = GetHwnd();
-    ULONG                           ulStyle = WS_VISIBLE;
+    ULONG                           ulStyle = WS_VISIBLE | WS_SYNCPAINT;
     RECTL                           vRect;
 
     ::WinQueryWindowRect(hWnd, &vRect);
@@ -752,7 +753,7 @@ void wxWindow::SetScrollbar(
             // registered as child windows of the window in order that child
             // windows may be scrolled without scrolling the scrollbars themselves!
             //
-            m_hWndScrollBarHorz = ::WinCreateWindow( HWND_DESKTOP
+            m_hWndScrollBarHorz = ::WinCreateWindow( hWnd
                                                     ,WC_SCROLLBAR
                                                     ,(PSZ)NULL
                                                     ,ulStyle
@@ -802,14 +803,14 @@ void wxWindow::SetScrollbar(
         ulStyle |= SBS_VERT;
         if (m_hWndScrollBarVert == 0L)
         {
-            m_hWndScrollBarVert = ::WinCreateWindow( HWND_DESKTOP
+            m_hWndScrollBarVert = ::WinCreateWindow( hWnd
                                                     ,WC_SCROLLBAR
                                                     ,(PSZ)NULL
                                                     ,ulStyle
                                                     ,vRect.xRight - 20
-                                                    ,vRect.yBottom
+                                                    ,vRect.yBottom + 20
                                                     ,20
-                                                    ,vRect.yTop - vRect.yBottom
+                                                    ,vRect.yTop - (vRect.yBottom + 20)
                                                     ,hWnd
                                                     ,HWND_TOP
                                                     ,FID_VERTSCROLL
@@ -837,9 +838,9 @@ void wxWindow::SetScrollbar(
                 ::WinSetWindowPos( m_hWndScrollBarVert
                                   ,HWND_TOP
                                   ,vRect.xRight - 20
-                                  ,vRect.yBottom
+                                  ,vRect.yBottom + 20
                                   ,20
-                                  ,vRect.yTop - vRect.yBottom
+                                  ,vRect.yTop - (vRect.yBottom + 20)
                                   ,SWP_ACTIVATE | SWP_MOVE | SWP_SIZE | SWP_SHOW
                                  );
             }
@@ -867,7 +868,15 @@ void wxWindow::ScrollWindow(
         vRect2.xRight  = pRect->x + pRect->width;
         vRect2.yBottom = pRect->y;
     }
+    else
+    {
+        ::WinQueryWindowRect(GetHwnd(), &vRect2);
+        ::WinQueryWindowRect(m_hWndScrollBarHorz, &vRect);
+        vRect2.yBottom += vRect.yTop - vRect.yBottom;
+        ::WinQueryWindowRect(m_hWndScrollBarVert, &vRect);
+        vRect2.xRight -= vRect.xRight - vRect.xLeft;
 
+    }
     if (pRect)
         ::WinScrollWindow( GetHwnd()
                           ,(LONG)nDx
@@ -876,7 +885,7 @@ void wxWindow::ScrollWindow(
                           ,NULL
                           ,NULLHANDLE
                           ,NULL
-                          ,SW_SCROLLCHILDREN | SW_INVALIDATERGN
+                          ,SW_INVALIDATERGN
                          );
     else
         ::WinScrollWindow( GetHwnd()
@@ -886,8 +895,29 @@ void wxWindow::ScrollWindow(
                           ,NULL
                           ,NULLHANDLE
                           ,NULL
-                          ,SW_SCROLLCHILDREN | SW_INVALIDATERGN
+                          ,SW_INVALIDATERGN
+                         );
+
+    //
+    // Move the children
+    wxWindowList::Node*             pCurrent = GetChildren().GetFirst();
+    SWP                             vSwp;
+
+    while (pCurrent)
+    {
+        wxWindow*                   pChildWin = pCurrent->GetData();
+
+        ::WinQueryWindowPos(pChildWin->GetHWND(), &vSwp);
+        ::WinSetWindowPos( pChildWin->GetHWND()
+                          ,HWND_TOP
+                          ,vSwp.x + nDx
+                          ,vSwp.y + nDy
+                          ,0
+                          ,0
+                          , SWP_MOVE | SWP_SHOW
                          );
+        pCurrent = pCurrent->GetNext();
+    }
 } // end of wxWindow::ScrollWindow
 
 // ---------------------------------------------------------------------------
@@ -1277,7 +1307,10 @@ void wxWindow::DoGetClientSize(
     HWND                            hWndClient;
     RECTL                           vRect;
 
-    hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    if (IsKindOf(CLASSINFO(wxFrame)))
+        hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
+    else
+        hWndClient = NULLHANDLE;
     if( hWndClient == NULLHANDLE)
        ::WinQueryWindowRect(GetHwnd(), &vRect);
     else