Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / osx / window.h

diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 69f910a574486844987ddb964e6debdb7cedd734..3af0c97038d3e9b288accd9edeb86553b8ac39a5 100644 (file)
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -98,8 +98,6 @@ public:
     virtual int GetCharHeight() const;
     virtual int GetCharWidth() const;
     
-    virtual double GetMagnificationFactor() const;
-
 public:
     virtual void SetScrollbar( int orient, int pos, int thumbVisible,
                                int range, bool refresh = true );
@@ -294,7 +292,7 @@ public:
 
     bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
     
-    float               GetContentScaleFactor() const ;
+    double              GetContentScaleFactor() const ;
     
     // internal response to size events
     virtual void MacOnInternalSize() {}