Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

using common GetContentScaleFactor throughout part 1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2013-06-19 20:28:01 +00:00
parent ac732982f8
commit f082dcd598
6 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/osx/cocoa/private.h
View File

@@ -147,6 +147,8 @@ public :
virtual bool IsFlipped() const { return m_isFlipped; } virtual bool IsFlipped() const { return m_isFlipped; }
#endif #endif
virtual double GetContentScaleFactor() const;
// cocoa thunk connected calls // cocoa thunk connected calls
virtual unsigned int draggingEntered(void* sender, WXWidget slf, void* _cmd); 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 bool IsActive();
virtual void SetModified(bool modified); virtual void SetModified(bool modified);

4
include/wx/osx/core/private.h
View File

@@ -259,7 +259,7 @@ public :
virtual void GetPosition( int &x, int &y ) const = 0; virtual void GetPosition( int &x, int &y ) const = 0;
virtual void GetSize( int &width, int &height ) const = 0; virtual void GetSize( int &width, int &height ) const = 0;
virtual void SetControlSize( wxWindowVariant variant ) = 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; virtual bool IsActive() = 0;
wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; } wxNonOwnedWindow* GetWXPeer() { return m_wxPeer; }

2
include/wx/osx/iphone/private.h
View File

@@ -61,7 +61,7 @@ public :
virtual void GetPosition( int &x, int &y ) const; virtual void GetPosition( int &x, int &y ) const;
virtual void GetSize( int &width, int &height ) const; virtual void GetSize( int &width, int &height ) const;
virtual void SetControlSize( wxWindowVariant variant ); virtual void SetControlSize( wxWindowVariant variant );
virtual float GetContentScaleFactor() const ; virtual double GetContentScaleFactor() const ;
virtual void SetNeedsDisplay( const wxRect* where = NULL ); virtual void SetNeedsDisplay( const wxRect* where = NULL );
virtual bool GetNeedsDisplay() const; virtual bool GetNeedsDisplay() const;

2
include/wx/osx/nonownedwnd.h
View File

@@ -66,8 +66,6 @@ public:
virtual wxPoint GetClientAreaOrigin() const; virtual wxPoint GetClientAreaOrigin() const;
virtual double GetMagnificationFactor() const;
// implement base class pure virtuals // implement base class pure virtuals
virtual bool SetTransparent(wxByte alpha); virtual bool SetTransparent(wxByte alpha);

4
include/wx/osx/window.h
View File

@@ -98,8 +98,6 @@ public:
virtual int GetCharHeight() const; virtual int GetCharHeight() const;
virtual int GetCharWidth() const; virtual int GetCharWidth() const;
virtual double GetMagnificationFactor() const;
public: public:
virtual void SetScrollbar( int orient, int pos, int thumbVisible, virtual void SetScrollbar( int orient, int pos, int thumbVisible,
int range, bool refresh = true ); 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 // internal response to size events
virtual void MacOnInternalSize() {} virtual void MacOnInternalSize() {}

4
include/wx/window.h
View File

@@ -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 1.0; }
// return the size of the left/right and top/bottom borders in x and y // return the size of the left/right and top/bottom borders in x and y