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

Remove Carbon-specific code from wxScreenDC implementation

Browse Source 
Carbon is not supported any more and defining m_overlayWindow, which was
only used by Carbon code, resulted in "unused private variable" warning
from clang.
This commit is contained in:
Vadim Zeitlin
2019-10-27 01:44:29 +02:00
parent 85b5337160
commit d38d8f4f9c
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,6 @@ public:
virtual ~wxScreenDCImpl(); virtual ~wxScreenDCImpl();
virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE; virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const wxOVERRIDE;
private:
void* m_overlayWindow;
private: private:
wxDECLARE_CLASS(wxScreenDCImpl); wxDECLARE_CLASS(wxScreenDCImpl);

20
src/osx/carbon/dcscreen.cpp
View File

@@ -26,37 +26,17 @@ wxIMPLEMENT_ABSTRACT_CLASS(wxScreenDCImpl, wxWindowDCImpl);
wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) : wxScreenDCImpl::wxScreenDCImpl( wxDC *owner ) :
wxWindowDCImpl( owner ) wxWindowDCImpl( owner )
{ {
#if wxOSX_USE_COCOA_OR_CARBON
CGRect cgbounds ; CGRect cgbounds ;
cgbounds = CGDisplayBounds(CGMainDisplayID()); cgbounds = CGDisplayBounds(CGMainDisplayID());
m_width = (wxCoord)cgbounds.size.width; m_width = (wxCoord)cgbounds.size.width;
m_height = (wxCoord)cgbounds.size.height; m_height = (wxCoord)cgbounds.size.height;
#else
wxDisplaySize( &m_width, &m_height );
#endif
#if wxOSX_USE_COCOA_OR_IPHONE
SetGraphicsContext( wxGraphicsContext::Create() ); SetGraphicsContext( wxGraphicsContext::Create() );
#else
Rect bounds;
bounds.top = (short)cgbounds.origin.y;
bounds.left = (short)cgbounds.origin.x;
bounds.bottom = bounds.top + (short)cgbounds.size.height;
bounds.right = bounds.left + (short)cgbounds.size.width;
WindowAttributes overlayAttributes = kWindowIgnoreClicksAttribute;
CreateNewWindow( kOverlayWindowClass, overlayAttributes, &bounds, (WindowRef*) &m_overlayWindow );
ShowWindow((WindowRef)m_overlayWindow);
SetGraphicsContext( wxGraphicsContext::CreateFromNativeWindow( m_overlayWindow ) );
#endif
m_ok = true ; m_ok = true ;
} }
wxScreenDCImpl::~wxScreenDCImpl() wxScreenDCImpl::~wxScreenDCImpl()
{ {
wxDELETE(m_graphicContext); wxDELETE(m_graphicContext);
#if wxOSX_USE_COCOA_OR_IPHONE
#else
DisposeWindow((WindowRef) m_overlayWindow );
#endif
} }
#if wxOSX_USE_IPHONE #if wxOSX_USE_IPHONE