From 7e8dc7744c053519b69e8dddd7cc79021165fd0e Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Fri, 18 Apr 2014 02:28:19 +0000 Subject: [PATCH] remove wxOVERRIDE, forgot that it's trunk only git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/display.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gtk/display.cpp b/src/gtk/display.cpp index 8ab5cd9382..265b692063 100644 --- a/src/gtk/display.cpp +++ b/src/gtk/display.cpp @@ -94,9 +94,9 @@ void wxClientDisplayRect(int* x, int* y, int* width, int* height) class wxDisplayFactoryGTK: public wxDisplayFactory { public: - virtual wxDisplayImpl* CreateDisplay(unsigned n) wxOVERRIDE; - virtual unsigned GetCount() wxOVERRIDE; - virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; + virtual wxDisplayImpl* CreateDisplay(unsigned n); + virtual unsigned GetCount(); + virtual int GetFromPoint(const wxPoint& pt); }; class wxDisplayImplGTK: public wxDisplayImpl @@ -104,13 +104,13 @@ class wxDisplayImplGTK: public wxDisplayImpl typedef wxDisplayImpl base_type; public: wxDisplayImplGTK(unsigned i); - virtual wxRect GetGeometry() const wxOVERRIDE; - virtual wxRect GetClientArea() const wxOVERRIDE; - virtual wxString GetName() const wxOVERRIDE; - virtual bool IsPrimary() const wxOVERRIDE; - virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; - virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; - virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; + virtual wxRect GetGeometry() const; + virtual wxRect GetClientArea() const; + virtual wxString GetName() const; + virtual bool IsPrimary() const; + virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const; + virtual wxVideoMode GetCurrentMode() const; + virtual bool ChangeMode(const wxVideoMode& mode); GdkScreen* const m_screen; };