wxDisplay cleanup/rewrite:
- wxDisplay is now a concrete class and uses a pImpl-based design - got rid of four duplicate but subtly different versions of trivial single display-only wxDisplay implementation (but 2 versions of Mac Classic and Mac CoreGraphics implementations each still remain...) - assorted code simplifications and memory leaks fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,46 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: display.h
|
||||
// Purpose: wxDisplay class customization for Mac
|
||||
// Author: Brian Victor/Royce Mitchel for non OSX / Ryan Norton for OS X
|
||||
// Modified by:
|
||||
// Created: 06/21/02
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_MAC_DISPLAY_H_
|
||||
#define _WX_MAC_DISPLAY_H_
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/display.h"
|
||||
|
||||
class wxDisplayMacPriv;
|
||||
class wxRect;
|
||||
class wxString;
|
||||
|
||||
class WXDLLEXPORT wxDisplay : public wxDisplayBase
|
||||
{
|
||||
public:
|
||||
wxDisplay ( size_t index = 0 );
|
||||
|
||||
~wxDisplay();
|
||||
|
||||
virtual wxRect GetGeometry() const;
|
||||
virtual int GetDepth() const;
|
||||
virtual wxString GetName() const;
|
||||
|
||||
virtual wxArrayVideoModes
|
||||
GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const;
|
||||
|
||||
virtual wxVideoMode GetCurrentMode() const;
|
||||
|
||||
virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
|
||||
|
||||
private:
|
||||
wxDisplayMacPriv* m_priv;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxDisplay)
|
||||
};
|
||||
|
||||
#endif // _WX_MAC_DISPLAY_H_
|
@@ -1,46 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: display.h
|
||||
// Purpose: wxDisplay class customization for Mac
|
||||
// Author: Brian Victor
|
||||
// Modified by: Royce Mitchell III
|
||||
// Created: 06/21/02
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_MAC_DISPLAY_H_
|
||||
#define _WX_MAC_DISPLAY_H_
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/display.h"
|
||||
|
||||
class wxDisplayMacPriv;
|
||||
class wxRect;
|
||||
class wxString;
|
||||
|
||||
class WXDLLEXPORT wxDisplay : public wxDisplayBase
|
||||
{
|
||||
public:
|
||||
wxDisplay ( size_t index = 0 );
|
||||
|
||||
~wxDisplay();
|
||||
|
||||
virtual wxRect GetGeometry() const;
|
||||
virtual int GetDepth() const;
|
||||
virtual wxString GetName() const;
|
||||
|
||||
virtual wxArrayVideoModes
|
||||
GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const;
|
||||
|
||||
virtual wxVideoMode GetCurrentMode() const;
|
||||
|
||||
virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
|
||||
|
||||
private:
|
||||
wxDisplayMacPriv* m_priv;
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxDisplay)
|
||||
};
|
||||
|
||||
#endif // _WX_MAC_DISPLAY_H_
|
@@ -1,5 +0,0 @@
|
||||
#ifdef __WXMAC_CLASSIC__
|
||||
#include "wx/mac/classic/display.h"
|
||||
#else
|
||||
#include "wx/mac/carbon/display.h"
|
||||
#endif
|
Reference in New Issue
Block a user