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/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -375,8 +375,6 @@ class WXDLLEXPORT wxDC: public wxObject
    
    bool         m_needComputeScaleX,m_needComputeScaleY;         // not yet used
    
-    float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
-    
    long         m_clipX1,m_clipY1,m_clipX2,m_clipY2;
    long         m_minX,m_maxX,m_minY,m_maxY;