Fixed the code to actually work.

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

diff --git a/src/os2/window.cpp b/src/os2/window.cpp
index 71d6eca0f9bcbd4951700884e45e1f9957477252..5117bf5670b22c36be6099cba47a8633304b32e2 100644 (file)
--- a/src/os2/window.cpp
+++ b/src/os2/window.cpp
@@ -294,17 +294,11 @@ bool wxWindowOS2::OS2Command(
 
 void wxWindowOS2::Init()
 {
 
 void wxWindowOS2::Init()
 {

-    //
-    // Generic
-    //
-    InitBase();
-

     //
     // PM specific
     //
     m_bWinCaptured = FALSE;
 
     //
     // PM specific
     //
     m_bWinCaptured = FALSE;
 

-    m_isBeingDeleted        = FALSE;

     m_fnOldWndProc          = NULL;
     m_bUseCtl3D             = FALSE;
     m_bMouseInWindow        = FALSE;
     m_fnOldWndProc          = NULL;
     m_bUseCtl3D             = FALSE;
     m_bMouseInWindow        = FALSE;


@@ -1235,9 +1229,9 @@ void wxWindowOS2::Refresh(
             RECTL                   vOs2Rect;
 
             vOs2Rect.xLeft   = pRect->x;
             RECTL                   vOs2Rect;
 
             vOs2Rect.xLeft   = pRect->x;

-            vOs2Rect.yTop    = pRect->y;
+            vOs2Rect.yBottom = pRect->y;

             vOs2Rect.xRight  = pRect->x + pRect->width;
             vOs2Rect.xRight  = pRect->x + pRect->width;

-            vOs2Rect.yBottom = pRect->y + pRect->height;
+            vOs2Rect.yTop    = pRect->y + pRect->height;

 
             ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
         }
 
             ::WinInvalidateRect(hWnd, &vOs2Rect, bEraseBack);
         }


@@ -1849,7 +1843,7 @@ void wxWindowOS2::GetTextExtent(
     int                             i;
     int                             l;
     FONTMETRICS                     vFM; // metrics structure
     int                             i;
     int                             l;
     FONTMETRICS                     vFM; // metrics structure

-    BOOL                            bRc;
+    BOOL                            bRc = FALSE;

     char*                           pStr;
     ERRORID                         vErrorCode; // last error id code
     HPS                             hPS;
     char*                           pStr;
     ERRORID                         vErrorCode; // last error id code
     HPS                             hPS;


@@ -3188,7 +3182,7 @@ bool wxWindowOS2::OS2Create(
     // which is the same but without CS_[HV]REDRAW class styles so using it
     // ensures that the window is not fully repainted on each resize
     //
     // which is the same but without CS_[HV]REDRAW class styles so using it
     // ensures that the window is not fully repainted on each resize
     //

-    if (!HasStyle(wxFULL_REPAINT_ON_RESIZE))
+    if (!HasFlag(wxFULL_REPAINT_ON_RESIZE))

     {
         sClassName += wxT("NR");
     }
     {
         sClassName += wxT("NR");
     }