From 0e4acbd463920ae9d18972dfa16f5e4633f2ea97 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 11 Sep 2003 09:58:31 +0000 Subject: [PATCH] Applied patch [ 794760 ] Majority of "... hides virtual function ..." removal git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/dde.h | 1 + include/wx/msw/enhmeta.h | 9 +++++++++ include/wx/msw/helpbest.h | 1 + include/wx/msw/helpchm.h | 1 + include/wx/msw/helpwin.h | 2 ++ include/wx/msw/ole/dataobj2.h | 27 +++++++++++++++++++++++++++ include/wx/protocol/http.h | 5 +++-- 7 files changed, 44 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h index d2d9bea68c..dd55e69610 100644 --- a/include/wx/msw/dde.h +++ b/include/wx/msw/dde.h @@ -55,6 +55,7 @@ public: // Calls that CLIENT can make virtual bool Execute(const wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); + virtual bool Execute(const wxString& str) { return Execute(str, -1, wxIPC_TEXT); } virtual wxChar *Request(const wxString& item, int *size = NULL, wxIPCFormat format = wxIPC_TEXT); virtual bool Poke(const wxString& item, wxChar *data, int size = -1, wxIPCFormat format = wxIPC_TEXT); virtual bool StartAdvise(const wxString& item); diff --git a/include/wx/msw/enhmeta.h b/include/wx/msw/enhmeta.h index 0d4689648c..b5469627d6 100644 --- a/include/wx/msw/enhmeta.h +++ b/include/wx/msw/enhmeta.h @@ -160,6 +160,15 @@ public: virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + protected: wxEnhMetaFile m_metafile; diff --git a/include/wx/msw/helpbest.h b/include/wx/msw/helpbest.h index b8bd0bc1a9..003f100e8e 100644 --- a/include/wx/msw/helpbest.h +++ b/include/wx/msw/helpbest.h @@ -33,6 +33,7 @@ public: // Must call this to set the filename virtual bool Initialize(const wxString& file); + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } // If file is "", reloads file given in Initialize virtual bool LoadFile(const wxString& file = wxEmptyString) diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h index f6dfebf704..09c621b5f3 100644 --- a/include/wx/msw/helpchm.h +++ b/include/wx/msw/helpchm.h @@ -28,6 +28,7 @@ public: // Must call this to set the filename virtual bool Initialize(const wxString& file); + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } // If file is "", reloads file given in Initialize virtual bool LoadFile(const wxString& file = wxEmptyString); diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h index 0e1a67541b..da2c7c2fd4 100644 --- a/include/wx/msw/helpwin.h +++ b/include/wx/msw/helpwin.h @@ -32,11 +32,13 @@ public: // Must call this to set the filename virtual bool Initialize(const wxString& file); + virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); } // If file is "", reloads file given in Initialize virtual bool LoadFile(const wxString& file = wxEmptyString); virtual bool DisplayContents(); virtual bool DisplaySection(int sectionNo); + virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); } virtual bool DisplayBlock(long blockNo); virtual bool DisplayContextPopup(int contextId); virtual bool KeywordSearch(const wxString& k, diff --git a/include/wx/msw/ole/dataobj2.h b/include/wx/msw/ole/dataobj2.h index 753d1329d7..f69c376127 100644 --- a/include/wx/msw/ole/dataobj2.h +++ b/include/wx/msw/ole/dataobj2.h @@ -38,6 +38,15 @@ public: virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + private: // the DIB data void /* BITMAPINFO */ *m_data; @@ -65,6 +74,15 @@ public: virtual bool GetDataHere(void *buf) const; virtual bool SetData(size_t len, const void *buf); + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + private: DECLARE_NO_COPY_CLASS(wxBitmapDataObject2) }; @@ -84,6 +102,15 @@ public: virtual bool GetDataHere(void *pData) const; virtual void AddFile(const wxString& file); + virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const + { return GetDataSize(); } + virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format), + void *buf) const + { return GetDataHere(buf); } + virtual bool SetData(const wxDataFormat& WXUNUSED(format), + size_t len, const void *buf) + { return SetData(len, buf); } + private: DECLARE_NO_COPY_CLASS(wxFileDataObject) }; diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h index b3ee9a5384..11fef8e09d 100644 --- a/include/wx/protocol/http.h +++ b/include/wx/protocol/http.h @@ -27,8 +27,9 @@ public: wxHTTP(); ~wxHTTP(); - bool Connect(const wxString& host, unsigned short port = 0); - bool Connect(wxSockAddress& addr, bool wait); + virtual bool Connect(const wxString& host, unsigned short port); + virtual bool Connect(const wxString& host) { return Connect(host, 0); } + virtual bool Connect(wxSockAddress& addr, bool wait); bool Abort(); wxInputStream *GetInputStream(const wxString& path); inline wxProtocolError GetError() { return m_perr; } -- 2.45.2