Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove wxOVERRIDE, forgot that it's trunk only

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@76366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2014-04-18 02:28:19 +00:00
parent 8799c2e10f
commit 7e8dc7744c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gtk/display.cpp
View File

@@ -94,9 +94,9 @@ void wxClientDisplayRect(int* x, int* y, int* width, int* height)
class wxDisplayFactoryGTK: public wxDisplayFactory class wxDisplayFactoryGTK: public wxDisplayFactory
{ {
public: public:
virtual wxDisplayImpl* CreateDisplay(unsigned n) wxOVERRIDE; virtual wxDisplayImpl* CreateDisplay(unsigned n);
virtual unsigned GetCount() wxOVERRIDE; virtual unsigned GetCount();
virtual int GetFromPoint(const wxPoint& pt) wxOVERRIDE; virtual int GetFromPoint(const wxPoint& pt);
}; };
class wxDisplayImplGTK: public wxDisplayImpl class wxDisplayImplGTK: public wxDisplayImpl
@@ -104,13 +104,13 @@ class wxDisplayImplGTK: public wxDisplayImpl
typedef wxDisplayImpl base_type; typedef wxDisplayImpl base_type;
public: public:
wxDisplayImplGTK(unsigned i); wxDisplayImplGTK(unsigned i);
virtual wxRect GetGeometry() const wxOVERRIDE; virtual wxRect GetGeometry() const;
virtual wxRect GetClientArea() const wxOVERRIDE; virtual wxRect GetClientArea() const;
virtual wxString GetName() const wxOVERRIDE; virtual wxString GetName() const;
virtual bool IsPrimary() const wxOVERRIDE; virtual bool IsPrimary() const;
virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const wxOVERRIDE; virtual wxArrayVideoModes GetModes(const wxVideoMode& mode) const;
virtual wxVideoMode GetCurrentMode() const wxOVERRIDE; virtual wxVideoMode GetCurrentMode() const;
virtual bool ChangeMode(const wxVideoMode& mode) wxOVERRIDE; virtual bool ChangeMode(const wxVideoMode& mode);
GdkScreen* const m_screen; GdkScreen* const m_screen;
}; };