correct access for virtuals

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index d2a55a7695eef4ac056abf6e042e9c350ee9dc3e..e32f005df53731ffe274e0f13e503bade1a25aac 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -443,7 +443,7 @@ protected:
 
     wxString DoSelectionToText(wxHtmlSelection *sel);
 
 
     wxString DoSelectionToText(wxHtmlSelection *sel);
 

-private:
+public:

     // wxHtmlWindowInterface methods:
     virtual void SetHTMLWindowTitle(const wxString& title);
     virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link);
     // wxHtmlWindowInterface methods:
     virtual void SetHTMLWindowTitle(const wxString& title);
     virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link);

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index b92119904f85f6eb98696797652e3a5255d611d7..58c6d9a48bd02776a3a10aad5cb5029011f8972a 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -118,11 +118,11 @@ public:
 
     void SetNotifier(wxTarNotifier& WXUNUSED(notifier)) { }
 
 
     void SetNotifier(wxTarNotifier& WXUNUSED(notifier)) { }
 

-private:
+protected:

     void SetOffset(wxFileOffset offset)         { m_Offset = offset; }
     void SetOffset(wxFileOffset offset)         { m_Offset = offset; }

-

     virtual wxArchiveEntry* DoClone() const     { return Clone(); }
 
     virtual wxArchiveEntry* DoClone() const     { return Clone(); }
 

+private:

     wxString     m_Name;
     int          m_Mode;
     bool         m_IsModeSet;
     wxString     m_Name;
     int          m_Mode;
     bool         m_IsModeSet;


@@ -161,6 +161,7 @@ public:
     virtual ~wxTarInputStream();
 
     bool OpenEntry(wxTarEntry& entry);
     virtual ~wxTarInputStream();
 
     bool OpenEntry(wxTarEntry& entry);

+    bool OpenEntry(wxArchiveEntry& entry);

     bool CloseEntry();
 
     wxTarEntry *GetNextEntry();
     bool CloseEntry();
 
     wxTarEntry *GetNextEntry();


@@ -173,11 +174,11 @@ protected:
     wxFileOffset OnSysTell() const      { return m_pos; }
     wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
 
     wxFileOffset OnSysTell() const      { return m_pos; }
     wxFileOffset OnSysSeek(wxFileOffset seek, wxSeekMode mode);
 

+    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
+

 private:
     void Init();
 
 private:
     void Init();
 

-    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
-    bool OpenEntry(wxArchiveEntry& entry);

     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     wxStreamError ReadHeaders();
     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     wxStreamError ReadHeaders();


@@ -218,6 +219,7 @@ public:
     virtual ~wxTarOutputStream();
 
     bool PutNextEntry(wxTarEntry *entry);
     virtual ~wxTarOutputStream();
 
     bool PutNextEntry(wxTarEntry *entry);

+    bool PutNextEntry(wxArchiveEntry *entry);

 
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),
 
     bool PutNextEntry(const wxString& name,
                       const wxDateTime& dt = wxDateTime::Now(),


@@ -227,7 +229,9 @@ public:
                          const wxDateTime& dt = wxDateTime::Now());
 
     bool CopyEntry(wxTarEntry *entry, wxTarInputStream& inputStream);
                          const wxDateTime& dt = wxDateTime::Now());
 
     bool CopyEntry(wxTarEntry *entry, wxTarInputStream& inputStream);

+    bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);

     bool CopyArchiveMetaData(wxTarInputStream& WXUNUSED(s)) { return true; }
     bool CopyArchiveMetaData(wxTarInputStream& WXUNUSED(s)) { return true; }

+    bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) { return true; }

 
     void Sync();
     bool CloseEntry();
 
     void Sync();
     bool CloseEntry();


@@ -246,9 +250,6 @@ protected:
 private:
     void Init(wxTarFormat format);
 
 private:
     void Init(wxTarFormat format);
 

-    bool PutNextEntry(wxArchiveEntry *entry);
-    bool CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
-    bool CopyArchiveMetaData(wxArchiveInputStream& WXUNUSED(s)) { return true; }

     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     bool WriteHeaders(wxTarEntry& entry);
     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     bool WriteHeaders(wxTarEntry& entry);

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 21a897bf6888bbba66d6615eae1611e98a04186e..c12688c0cc088d1e492d641492ec06cb4a1a93bf 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -221,9 +221,9 @@ protected:
 
     void Notify();
 
 
     void Notify();
 

-private:

     wxArchiveEntry* DoClone() const             { return ZipClone(); }
 
     wxArchiveEntry* DoClone() const             { return ZipClone(); }
 

+private:

     size_t ReadLocal(wxInputStream& stream, wxMBConv& conv);
     size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const;
 
     size_t ReadLocal(wxInputStream& stream, wxMBConv& conv);
     size_t WriteLocal(wxOutputStream& stream, wxMBConv& conv) const;
 


@@ -283,6 +283,7 @@ public:
     virtual WXZIPFIX ~wxZipOutputStream();
 
     bool PutNextEntry(wxZipEntry *entry)        { return DoCreate(entry); }
     virtual WXZIPFIX ~wxZipOutputStream();
 
     bool PutNextEntry(wxZipEntry *entry)        { return DoCreate(entry); }

+    bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);

 
     bool WXZIPFIX PutNextEntry(const wxString& name,
                                const wxDateTime& dt = wxDateTime::Now(),
 
     bool WXZIPFIX PutNextEntry(const wxString& name,
                                const wxDateTime& dt = wxDateTime::Now(),


@@ -292,7 +293,9 @@ public:
                                   const wxDateTime& dt = wxDateTime::Now());
 
     bool WXZIPFIX CopyEntry(wxZipEntry *entry, wxZipInputStream& inputStream);
                                   const wxDateTime& dt = wxDateTime::Now());
 
     bool WXZIPFIX CopyEntry(wxZipEntry *entry, wxZipInputStream& inputStream);

+    bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);

     bool WXZIPFIX CopyArchiveMetaData(wxZipInputStream& inputStream);
     bool WXZIPFIX CopyArchiveMetaData(wxZipInputStream& inputStream);

+    bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);

 
     void WXZIPFIX Sync();
     bool WXZIPFIX CloseEntry();
 
     void WXZIPFIX Sync();
     bool WXZIPFIX CloseEntry();


@@ -320,10 +323,6 @@ protected:
 private:
     void Init(int level);
 
 private:
     void Init(int level);
 

-    bool WXZIPFIX PutNextEntry(wxArchiveEntry *entry);
-    bool WXZIPFIX CopyEntry(wxArchiveEntry *entry, wxArchiveInputStream& stream);
-    bool WXZIPFIX CopyArchiveMetaData(wxArchiveInputStream& stream);
-

     bool IsOpened() const { return m_comp || m_pending; }
 
     bool DoCreate(wxZipEntry *entry, bool raw = false);
     bool IsOpened() const { return m_comp || m_pending; }
 
     bool DoCreate(wxZipEntry *entry, bool raw = false);


@@ -370,6 +369,7 @@ public:
     virtual WXZIPFIX ~wxZipInputStream();
 
     bool OpenEntry(wxZipEntry& entry)   { return DoOpen(&entry); }
     virtual WXZIPFIX ~wxZipInputStream();
 
     bool OpenEntry(wxZipEntry& entry)   { return DoOpen(&entry); }

+    bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);

     bool WXZIPFIX CloseEntry();
 
     wxZipEntry *GetNextEntry();
     bool WXZIPFIX CloseEntry();
 
     wxZipEntry *GetNextEntry();


@@ -391,6 +391,8 @@ protected:
     virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
     virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
 
     virtual wxInputStream* WXZIPFIX OpenDecompressor(wxInputStream& stream);
     virtual bool WXZIPFIX CloseDecompressor(wxInputStream *decomp);
 

+    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
+

 private:
     void Init();
     void Init(const wxString& file);
 private:
     void Init();
     void Init(const wxString& file);


@@ -398,10 +400,6 @@ private:
     static wxInputStream *OpenFile(const wxString& archive);
 #endif
 
     static wxInputStream *OpenFile(const wxString& archive);
 #endif
 

-    wxArchiveEntry *DoGetNextEntry()    { return GetNextEntry(); }
-
-    bool WXZIPFIX OpenEntry(wxArchiveEntry& entry);
-

     wxStreamError ReadLocal(bool readEndRec = false);
     wxStreamError ReadCentral();
 
     wxStreamError ReadLocal(bool readEndRec = false);
     wxStreamError ReadCentral();