git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38145
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
class wxDisplayImplMacOSX : public wxDisplayImpl
{
public:
class wxDisplayImplMacOSX : public wxDisplayImpl
{
public:
- wxDisplayImplMacOSX(CGDirectDisplayID id_) : m_id(id_) { }
+ wxDisplayImplMacOSX(size_t n, CGDirectDisplayID id_)
+ : wxDisplayImpl(n),
+ m_id(id_)
+ {
+ }
virtual wxRect GetGeometry() const;
virtual wxString GetName() const { return wxString(); }
virtual wxRect GetGeometry() const;
virtual wxString GetName() const { return wxString(); }
class wxDisplayFactoryMacOSX : public wxDisplayFactory
{
public:
class wxDisplayFactoryMacOSX : public wxDisplayFactory
{
public:
- wxDisplayFactoryMacOSX();
+ wxDisplayFactoryMacOSX() { }
virtual wxDisplayImpl *CreateDisplay(size_t n);
virtual size_t GetCount();
virtual wxDisplayImpl *CreateDisplay(size_t n);
virtual size_t GetCount();
wxASSERT( err == CGDisplayNoErr );
wxASSERT( n < theCount );
wxASSERT( err == CGDisplayNoErr );
wxASSERT( n < theCount );
- wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(theIDs[n]);
+ wxDisplayImplMacOSX *display = new wxDisplayImplMacOSX(n, theIDs[n]);
/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
{
/* static */ wxDisplayFactory *wxDisplay::CreateFactory()
{
- return new wxDisplayFactoryMac;
+ return new wxDisplayFactoryMacOSX;
}
#endif // wxUSE_DISPLAY
}
#endif // wxUSE_DISPLAY