using common GetContentScaleFactor throughout part 1

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index d5008ee052b2a841719da3745507346be299acdc..118bad21ac81b433f641c283c229fbffe046dec4 100644 (file)
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -147,6 +147,8 @@ public :
     virtual bool        IsFlipped() const { return m_isFlipped; }
 #endif
 
     virtual bool        IsFlipped() const { return m_isFlipped; }
 #endif
 

+    virtual double      GetContentScaleFactor() const;
+    

     // cocoa thunk connected calls
 
     virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);
     // cocoa thunk connected calls
 
     virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);


@@ -247,8 +249,6 @@ public :
 
     virtual void WindowToScreen( int *x, int *y );
 
 
     virtual void WindowToScreen( int *x, int *y );
 

-    virtual double GetMagnificationFactor() const;
-

     virtual bool IsActive();
 
     virtual void SetModified(bool modified);
     virtual bool IsActive();
 
     virtual void SetModified(bool modified);

diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index c93a02c7eaf3cb39895c4977db5e675b6e55bd47..9c4660a7656ba630d265f86addbc011764a18c53 100644 (file)
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -259,7 +259,7 @@ public :
     virtual void        GetPosition( int &x, int &y ) const = 0;
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;
     virtual void        GetPosition( int &x, int &y ) const = 0;
     virtual void        GetSize( int &width, int &height ) const = 0;
     virtual void        SetControlSize( wxWindowVariant variant ) = 0;

-    virtual float       GetContentScaleFactor() const 
+    virtual double      GetContentScaleFactor() const

     {
         return 1.0;
     }
     {
         return 1.0;
     }


@@ -874,8 +874,6 @@ public :
 
     virtual void WindowToScreen( int *x, int *y ) = 0;
     
 
     virtual void WindowToScreen( int *x, int *y ) = 0;
     

-    virtual double GetMagnificationFactor() const { return 1.0; }
-

     virtual bool IsActive() = 0;
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
     virtual bool IsActive() = 0;
 
     wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }

diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index ff78c42c36919675c37e280ae9595b88c692490c..070637b234678951b70c8824054c9397d83c365c 100644 (file)
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -61,7 +61,7 @@ public :
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;
     virtual void        SetControlSize( wxWindowVariant variant );
     virtual void        GetPosition( int &x, int &y ) const;
     virtual void        GetSize( int &width, int &height ) const;
     virtual void        SetControlSize( wxWindowVariant variant );

-    virtual float       GetContentScaleFactor() const ;
+    virtual double      GetContentScaleFactor() const ;

     
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;
     
     virtual void        SetNeedsDisplay( const wxRect* where = NULL );
     virtual bool        GetNeedsDisplay() const;

diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 273cf5ddc02c18d565ef13eacbf35c171c03a376..827dc9f3405df7a99c24373970024cae869da32f 100644 (file)
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -66,8 +66,6 @@ public:
 
     virtual wxPoint GetClientAreaOrigin() const;
     
 
     virtual wxPoint GetClientAreaOrigin() const;
     

-    virtual double GetMagnificationFactor() const;
-

     // implement base class pure virtuals
 
     virtual bool SetTransparent(wxByte alpha);
     // implement base class pure virtuals
 
     virtual bool SetTransparent(wxByte alpha);

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 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 );
 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; }
     
 
     bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
     

-    float               GetContentScaleFactor() const ;
+    double              GetContentScaleFactor() const ;

     
     // internal response to size events
     virtual void MacOnInternalSize() {}
     
     // internal response to size events
     virtual void MacOnInternalSize() {}

diff --git a/include/wx/window.h b/include/wx/window.h
index 8376fb773152dbf24470ccbddad5de7a45c241d7..52c7a4c466bacd097afd74c1044deffc79efad59 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -521,9 +521,9 @@ public:
         return wxSize( wxMax( client.x, best.x ), wxMax( client.y, best.y ) );
     }
 
         return wxSize( wxMax( client.x, best.x ), wxMax( client.y, best.y ) );
     }
 

-    // returns the magnification of the backing store of this window
+    // returns the magnification of the content of this window

     // eg 2.0 for a window on a retina screen
     // eg 2.0 for a window on a retina screen

-    virtual double GetMagnificationFactor() const
+    virtual double GetContentScaleFactor() const

     { return 1.0; }
     
     // return the size of the left/right and top/bottom borders in x and y
     { return 1.0; }
     
     // return the size of the left/right and top/bottom borders in x and y