Avoid ifdef-ed override specification

Instead, add the base class functions so the derived class always
overrides. If/when wxX11 and wxMotif are removed there won't be an
ifdef that no one ever notices isn't needed anymore.
This commit is contained in:
Paul Cornett
2017-11-12 09:33:37 -08:00
parent 4e226d6784
commit 65cc4c1624
3 changed files with 3 additions and 4 deletions

View File

@@ -80,6 +80,7 @@ public:
virtual void HandlePropertyChange(WXEvent *event); virtual void HandlePropertyChange(WXEvent *event);
wxXVisualInfo* GetVisualInfo(WXDisplay* display); wxXVisualInfo* GetVisualInfo(WXDisplay* display);
virtual void* GetXVisualInfo() { return NULL; }
private: private:
// Motif-specific // Motif-specific

View File

@@ -146,10 +146,7 @@ public:
// This method is not currently used by the library itself, but remains for // This method is not currently used by the library itself, but remains for
// backwards compatibility and also because wxGTK has it we could start // backwards compatibility and also because wxGTK has it we could start
// using it for the same purpose in wxX11 too some day. // using it for the same purpose in wxX11 too some day.
virtual void *GetXVisualInfo() virtual void* GetXVisualInfo() wxOVERRIDE
#ifdef __WXGTK20__
wxOVERRIDE
#endif
{ {
return wxGLCanvasX11::GetDefaultXVisualInfo(); return wxGLCanvasX11::GetDefaultXVisualInfo();
} }

View File

@@ -84,6 +84,7 @@ public:
// with multiple display // with multiple display
return m_visualInfo; return m_visualInfo;
} }
virtual void* GetXVisualInfo() { return NULL; }
public: public:
static long sm_lastMessageTime; static long sm_lastMessageTime;