X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f86190702bb433f139dc2c335e2c551755def81f..661698e54f2bc599dc1a961ffbae08ccdd6b9b97:/include/wx/osx/core/private.h diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h index c93a02c7ea..fb1d230c32 100644 --- a/include/wx/osx/core/private.h +++ b/include/wx/osx/core/private.h @@ -122,7 +122,9 @@ WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRe WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data ); WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf ); -CGColorSpaceRef WXDLLIMPEXP_CORE wxMacGetGenericRGBColorSpace(void); +WXDLLIMPEXP_CORE CGColorSpaceRef wxMacGetGenericRGBColorSpace(void); + +WXDLLIMPEXP_CORE double wxOSXGetMainScreenContentScaleFactor(); class wxWindowMac; // to @@ -259,7 +261,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 float GetContentScaleFactor() const + virtual double GetContentScaleFactor() const { return 1.0; } @@ -874,8 +876,6 @@ public : virtual void WindowToScreen( int *x, int *y ) = 0; - virtual double GetMagnificationFactor() const { return 1.0; } - virtual bool IsActive() = 0; wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }