Implemented missing pure virt functions (stub functions for now).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/mac/display.h b/include/wx/mac/display.h
index b06a7d71734b100080bb38dc68df5175e8b472a9..060c9c7ef4cac3bf61fa50bc83d56f026f101cf9 100644 (file)
--- 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 );
 
 public:
     wxDisplay ( size_t index = 0 );
 

+    ~wxDisplay();
+

     virtual wxRect GetGeometry() const;
     virtual int GetDepth() const;
     virtual wxString GetName() const;
 
     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;
 
 
 private:
     wxDisplayMacPriv* m_priv;
 

-    DECLARE_NO_COPY_CLASS(wxDisplay);
+    DECLARE_NO_COPY_CLASS(wxDisplay)

 };
 
 #endif // _WX_MAC_DISPLAY_H_
 };
 
 #endif // _WX_MAC_DISPLAY_H_

diff --git a/src/mac/carbon/display.cpp b/src/mac/carbon/display.cpp
index 3502ac55f53159d95850fbf5541859bf85c89f22..d3b03d203c4b0c6cb2b2e46de8771d1a217dc0d2 100644 (file)
--- 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...
 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()
 }
 
 wxDisplay::~wxDisplay()

diff --git a/src/mac/display.cpp b/src/mac/display.cpp
index 3502ac55f53159d95850fbf5541859bf85c89f22..d3b03d203c4b0c6cb2b2e46de8771d1a217dc0d2 100644 (file)
--- 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...
 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()
 }
 
 wxDisplay::~wxDisplay()