merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
--- a/src/os2/metafile.cpp
+++ b/src/os2/metafile.cpp
@@ -269,8 +269,8 @@ void wxMetafileDC::SetMapMode(int mode)
      break;
    }
  }
-  m_windowExtX = 100;
-  m_windowExtY = 100;
+  m_nWindowExtX = 100;
+  m_nWindowExtY = 100;
 }

 #ifdef __WIN32__