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:
@@ -56,6 +56,11 @@
|
||||
# define wxUSE_CLIPBOARD 0
|
||||
#endif /* wxUSE_CLIPBOARD */
|
||||
|
||||
#if wxUSE_DISPLAY
|
||||
# undef wxUSE_DISPLAY
|
||||
# define wxUSE_DISPLAY 0
|
||||
#endif /* wxUSE_DISPLAY */
|
||||
|
||||
#if wxUSE_SOCKETS
|
||||
# undef wxUSE_SOCKETS
|
||||
# define wxUSE_SOCKETS 0
|
||||
|
@@ -1,40 +0,0 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: wx/mgl/display.h
|
||||
// Purpose: wxDisplay class customization for WXMGL
|
||||
// Author: Wlodzimierz ABX Skiba
|
||||
// Modified by:
|
||||
// Created: 05/03/2006
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) Wlodzimierz Skiba
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef _WX_MGL_DISPLAY_H_
|
||||
#define _WX_MGL_DISPLAY_H_
|
||||
|
||||
class WXDLLEXPORT wxDisplay : public wxDisplayBase
|
||||
{
|
||||
public:
|
||||
|
||||
// create the display object for the given physical display
|
||||
wxDisplay(size_t index = 0);
|
||||
|
||||
virtual ~wxDisplay();
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual bool IsOk() const;
|
||||
virtual wxRect GetGeometry() const;
|
||||
virtual wxString GetName() const;
|
||||
|
||||
virtual wxArrayVideoModes GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const;
|
||||
virtual wxVideoMode GetCurrentMode() const;
|
||||
virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode);
|
||||
|
||||
virtual bool IsPrimary() const;
|
||||
|
||||
private:
|
||||
|
||||
DECLARE_NO_COPY_CLASS(wxDisplay)
|
||||
};
|
||||
|
||||
#endif // _WX_MGL_DISPLAY_H_
|
Reference in New Issue
Block a user