diff --git a/include/wx/private/display.h b/include/wx/private/display.h index d1346fc4eb..9f0dce0ad2 100644 --- a/include/wx/private/display.h +++ b/include/wx/private/display.h @@ -79,7 +79,7 @@ public: virtual wxRect GetClientArea() const { return GetGeometry(); } // return the name (may be empty) - virtual wxString GetName() const = 0; + virtual wxString GetName() const { return wxString(); } // return the index of this display unsigned GetIndex() const { return m_index; } @@ -125,8 +125,6 @@ class WXDLLEXPORT wxDisplayImplSingle : public wxDisplayImpl public: wxDisplayImplSingle() : wxDisplayImpl(0) { } - virtual wxString GetName() const wxOVERRIDE { return wxString(); } - #if wxUSE_DISPLAY // no video modes support for us, provide just the stubs virtual wxArrayVideoModes diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp index eb68667724..dda71d6dcf 100644 --- a/src/gtk/display.cpp +++ b/src/gtk/display.cpp @@ -96,7 +96,6 @@ public: virtual wxRect GetClientArea() const wxOVERRIDE; #if wxUSE_DISPLAY - virtual wxString GetName() const wxOVERRIDE; virtual bool IsPrimary() const wxOVERRIDE; virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; @@ -206,11 +205,6 @@ wxRect wxDisplayImplGTK::GetClientArea() const } #if wxUSE_DISPLAY -wxString wxDisplayImplGTK::GetName() const -{ - return wxString(); -} - bool wxDisplayImplGTK::IsPrimary() const { #ifdef __WXGTK4__ diff --git a/src/osx/core/display.cpp b/src/osx/core/display.cpp index fedbfb7d10..3f35ccc1e4 100644 --- a/src/osx/core/display.cpp +++ b/src/osx/core/display.cpp @@ -73,7 +73,6 @@ public: virtual wxRect GetGeometry() const wxOVERRIDE; virtual wxRect GetClientArea() const wxOVERRIDE; - virtual wxString GetName() const wxOVERRIDE { return wxString(); } virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; diff --git a/src/qt/display.cpp b/src/qt/display.cpp index abf339321c..52b6af8373 100644 --- a/src/qt/display.cpp +++ b/src/qt/display.cpp @@ -22,8 +22,6 @@ public: virtual wxRect GetGeometry() const wxOVERRIDE; virtual wxRect GetClientArea() const wxOVERRIDE; - virtual wxString GetName() const wxOVERRIDE; - #if wxUSE_DISPLAY virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; @@ -46,11 +44,6 @@ wxRect wxDisplayImplQt::GetClientArea() const return wxQtConvertRect( QApplication::desktop()->availableGeometry( GetIndex() )); } -wxString wxDisplayImplQt::GetName() const -{ - return wxString(); -} - #if wxUSE_DISPLAY wxArrayVideoModes wxDisplayImplQt::GetModes(const wxVideoMode& WXUNUSED(mode)) const { diff --git a/src/unix/displayx11.cpp b/src/unix/displayx11.cpp index 7c376bf83c..b1794b5127 100644 --- a/src/unix/displayx11.cpp +++ b/src/unix/displayx11.cpp @@ -132,8 +132,6 @@ public: return IsPrimary() ? wxGetMainScreenWorkArea() : m_rect; } - virtual wxString GetName() const wxOVERRIDE { return wxString(); } - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE;