diff --git a/include/wx/mac/display.h b/include/wx/mac/display.h index b06a7d7173..060c9c7ef4 100644 --- a/include/wx/mac/display.h +++ b/include/wx/mac/display.h @@ -24,17 +24,23 @@ 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; - ~wxDisplay(); + virtual wxVideoMode GetCurrentMode() const; + + virtual bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode); private: wxDisplayMacPriv* m_priv; - DECLARE_NO_COPY_CLASS(wxDisplay); + DECLARE_NO_COPY_CLASS(wxDisplay) }; #endif // _WX_MAC_DISPLAY_H_ diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp index 3502ac55f5..d3b03d203c 100644 --- a/src/mac/carbon/display.cpp +++ b/src/mac/carbon/display.cpp @@ -120,7 +120,26 @@ int wxDisplay::GetDepth() const wxString wxDisplay::GetName() const { // Macs don't name their displays... - return wxT(""); + return wxEmptyString; +} + + wxArrayVideoModes + wxDisplay::GetModes(const wxVideoMode& mode) const +{ + // Not implemented + return wxArrayVideoModes(); +} + +wxVideoMode wxDisplay::GetCurrentMode() const +{ + // Not implemented + return wxVideoMode(); +} + +bool wxDisplay::ChangeMode(const wxVideoMode& mode) +{ + // Not implemented + return false; } wxDisplay::~wxDisplay() diff --git a/src/mac/display.cpp b/src/mac/display.cpp index 3502ac55f5..d3b03d203c 100644 --- a/src/mac/display.cpp +++ b/src/mac/display.cpp @@ -120,7 +120,26 @@ int wxDisplay::GetDepth() const wxString wxDisplay::GetName() const { // Macs don't name their displays... - return wxT(""); + return wxEmptyString; +} + + wxArrayVideoModes + wxDisplay::GetModes(const wxVideoMode& mode) const +{ + // Not implemented + return wxArrayVideoModes(); +} + +wxVideoMode wxDisplay::GetCurrentMode() const +{ + // Not implemented + return wxVideoMode(); +} + +bool wxDisplay::ChangeMode(const wxVideoMode& mode) +{ + // Not implemented + return false; } wxDisplay::~wxDisplay()