Minor header cleaning.

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

diff --git a/include/wx/archive.h b/include/wx/archive.h
index 0858d299f3c4de51fbd7742b06751289b0738f26..6f0ce844e15b3ccf308786b5b9003aca98e40bc1 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        archive.h
+// Name:        wx/archive.h

 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Purpose:     Streams for archive formats
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$


@@ -55,7 +55,7 @@ public:
     virtual void SetIsReadOnly(bool isReadOnly = true) = 0;
     virtual void SetName(const wxString& name,
                          wxPathFormat format = wxPATH_NATIVE) = 0;
     virtual void SetIsReadOnly(bool isReadOnly = true) = 0;
     virtual void SetName(const wxString& name,
                          wxPathFormat format = wxPATH_NATIVE) = 0;

-    
+

     wxArchiveEntry *Clone() const { return DoClone(); }
 
     void SetNotifier(wxArchiveNotifier& notifier);
     wxArchiveEntry *Clone() const { return DoClone(); }
 
     void SetNotifier(wxArchiveNotifier& notifier);


@@ -94,14 +94,14 @@ public:
     typedef wxArchiveEntry entry_type;
 
     virtual ~wxArchiveInputStream() { }
     typedef wxArchiveEntry entry_type;
 
     virtual ~wxArchiveInputStream() { }

-    
+

     virtual bool OpenEntry(wxArchiveEntry& entry) = 0;
     virtual bool CloseEntry() = 0;
 
     wxArchiveEntry *GetNextEntry()  { return DoGetNextEntry(); }
 
     virtual char Peek()             { return wxInputStream::Peek(); }
     virtual bool OpenEntry(wxArchiveEntry& entry) = 0;
     virtual bool CloseEntry() = 0;
 
     wxArchiveEntry *GetNextEntry()  { return DoGetNextEntry(); }
 
     virtual char Peek()             { return wxInputStream::Peek(); }

-    
+

 protected:
     wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv);
     wxArchiveInputStream(wxInputStream *stream, wxMBConv& conv);
 protected:
     wxArchiveInputStream(wxInputStream& stream, wxMBConv& conv);
     wxArchiveInputStream(wxInputStream *stream, wxMBConv& conv);


@@ -123,7 +123,7 @@ private:
 //
 // Only one entry can be open for output at a time; another call to
 // PutNextEntry closes the current entry and begins the next.
 //
 // Only one entry can be open for output at a time; another call to
 // PutNextEntry closes the current entry and begins the next.

-// 
+//

 // The overload 'bool PutNextEntry(wxArchiveEntry *entry)' takes ownership
 // of the entry object.
 
 // The overload 'bool PutNextEntry(wxArchiveEntry *entry)' takes ownership
 // of the entry object.
 


@@ -207,7 +207,7 @@ public:
         if (m_rep)
             m_rep->AddRef();
     }
         if (m_rep)
             m_rep->AddRef();
     }

-    
+

     ~wxArchiveIterator() {
         if (m_rep)
             m_rep->UnRef();
     ~wxArchiveIterator() {
         if (m_rep)
             m_rep->UnRef();


@@ -255,13 +255,13 @@ private:
         typename Arc::entry_type* m_entry;
         T m_value;
         int m_ref;
         typename Arc::entry_type* m_entry;
         T m_value;
         int m_ref;

-        
+

     public:
         Rep(Arc& arc, typename Arc::entry_type* entry)
             : m_arc(arc), m_entry(entry), m_value(), m_ref(1) { }
         ~Rep()
             { delete m_entry; }
     public:
         Rep(Arc& arc, typename Arc::entry_type* entry)
             : m_arc(arc), m_entry(entry), m_value(), m_ref(1) { }
         ~Rep()
             { delete m_entry; }

-        
+

         void AddRef() {
             m_ref++;
         }
         void AddRef() {
             m_ref++;
         }


@@ -278,7 +278,7 @@ private:
                 return NULL;
             }
             if (m_ref > 1) {
                 return NULL;
             }
             if (m_ref > 1) {

-                m_ref--; 
+                m_ref--;

                 return new Rep(m_arc, entry);
             }
             delete m_entry;
                 return new Rep(m_arc, entry);
             }
             delete m_entry;

diff --git a/include/wx/artprov.h b/include/wx/artprov.h
index 61cb8c518d6c6d2b63bbf53fba955e1311cebf1b..184a21791f1165fc21b3ffa9c9a91502659e5946 100644 (file)
--- a/include/wx/artprov.h
+++ b/include/wx/artprov.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        artprov.h
+// Name:        wx/artprov.h

 // Purpose:     wxArtProvider class
 // Author:      Vaclav Slavik
 // Modified by:
 // Purpose:     wxArtProvider class
 // Author:      Vaclav Slavik
 // Modified by:


@@ -146,7 +146,7 @@ public:
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 
                           const wxArtClient& client = wxART_OTHER,
                           const wxSize& size = wxDefaultSize);
 

-    // Get the size hint of an icon from a specific wxArtClient, queries 
+    // Get the size hint of an icon from a specific wxArtClient, queries

     // the topmost provider if platform_dependent = false
     static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false);
 
     // the topmost provider if platform_dependent = false
     static wxSize GetSizeHint(const wxArtClient& client, bool platform_dependent = false);
 


@@ -172,7 +172,7 @@ protected:
     static void CleanUpProviders();
 
     // Get the default size of an icon for a specific client
     static void CleanUpProviders();
 
     // Get the default size of an icon for a specific client

-    virtual wxSize DoGetSizeHint(const wxArtClient& client) 
+    virtual wxSize DoGetSizeHint(const wxArtClient& client)

     {
         return GetSizeHint(client, true);
     }
     {
         return GetSizeHint(client, true);
     }

diff --git a/include/wx/caret.h b/include/wx/caret.h
index 8cff8f2f48b6cb9ab54db5aa633c6b7e2d3b1edb..ff5071ca7829133cb5699d9d3f7d439845a376ea 100644 (file)
--- a/include/wx/caret.h
+++ b/include/wx/caret.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        caret.h
+// Name:        wx/caret.h

 // Purpose:     wxCaretBase class - the interface of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxCaretBase class - the interface of wxCaret
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -250,4 +250,3 @@ private:
 #endif // wxUSE_CARET
 
 #endif // _WX_CARET_H_BASE_
 #endif // wxUSE_CARET
 
 #endif // _WX_CARET_H_BASE_

-

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index 9ae7f96a68503a5cc6535d7a3a72ada09193c71a..2af5f9e2e3d52c5afb37d7414e89c5a7c941d1d8 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cmndata.h
+// Name:        wx/cmndata.h

 // Purpose:     Common GDI data classes
 // Author:      Julian Smart and others
 // Modified by:
 // Purpose:     Common GDI data classes
 // Author:      Julian Smart and others
 // Modified by:


@@ -210,13 +210,13 @@ public:
 
     wxString GetFilename() const { return m_filename; }
     void SetFilename( const wxString &filename ) { m_filename = filename; }
 
     wxString GetFilename() const { return m_filename; }
     void SetFilename( const wxString &filename ) { m_filename = filename; }

-    
+

     void operator=(const wxPrintData& data);
 
     char* GetPrivData() const { return m_privData; }
     int GetPrivDataLen() const { return m_privDataLen; }
     void SetPrivData( char *privData, int len );
     void operator=(const wxPrintData& data);
 
     char* GetPrivData() const { return m_privData; }
     int GetPrivDataLen() const { return m_privDataLen; }
     void SetPrivData( char *privData, int len );

-   
+

 
 #if WXWIN_COMPATIBILITY_2_4
     // PostScript-specific data
 
 #if WXWIN_COMPATIBILITY_2_4
     // PostScript-specific data


@@ -262,12 +262,12 @@ private:
     wxPrintQuality  m_printQuality;
     wxPaperSize     m_paperId;
     wxSize          m_paperSize;
     wxPrintQuality  m_printQuality;
     wxPaperSize     m_paperId;
     wxSize          m_paperSize;

-    
+

     wxString        m_filename;
     wxString        m_filename;

-    
+

     char* m_privData;
     int   m_privDataLen;
     char* m_privData;
     int   m_privDataLen;

-    
+

     wxPrintNativeDataBase  *m_nativeData;
 
 private:
     wxPrintNativeDataBase  *m_nativeData;
 
 private:

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index b99ed6a64bee34baec62a2b258dbb141ff4b89ef..05e6d5e70ea00fa75a8eec18bf7cb255f9ae1378 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dynarray.h
+// Name:        wx/dynarray.h

 // Purpose:     auto-resizable (i.e. dynamic) array support
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     auto-resizable (i.e. dynamic) array support
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -1007,4 +1007,3 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
     }
 
 #endif // _DYNARRAY_H
     }
 
 #endif // _DYNARRAY_H

-

diff --git a/include/wx/fileback.h b/include/wx/fileback.h
index 5fda9c0c50c81662c69be0dc862b7ac4bfe610a2..9b5c6378648e7171711b7e8b97781493f33e89c2 100644 (file)
--- a/include/wx/fileback.h
+++ b/include/wx/fileback.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/fileback.h
+// Name:        wx/fileback.h

 // Purpose:     Back an input stream with memory or a file
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Purpose:     Back an input stream with memory or a file
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$

diff --git a/include/wx/filesys.h b/include/wx/filesys.h
index e3df47187a0738c0ec19721ea2a68e139fb9a9e0..267daac0f814c36ab174b5c7404c9210dce588da 100644 (file)
--- a/include/wx/filesys.h
+++ b/include/wx/filesys.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        filesys.h
+// Name:        wx/filesys.h

 // Purpose:     class for opening files - virtual file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik
 // Purpose:     class for opening files - virtual file system
 // Author:      Vaclav Slavik
 // Copyright:   (c) 1999 Vaclav Slavik

diff --git a/include/wx/fs_arc.h b/include/wx/fs_arc.h
index 55008728361b3eef353e4cddb61393e12c7424b0..53e83fa2eed854c4703e4ffbf86bbc52eb57dc12 100644 (file)
--- a/include/wx/fs_arc.h
+++ b/include/wx/fs_arc.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_arc.h
+// Name:        wx/fs_arc.h

 // Purpose:     Archive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell
 // Purpose:     Archive file system
 // Author:      Vaclav Slavik, Mike Wetherell
 // Copyright:   (c) 1999 Vaclav Slavik, (c) 2006 Mike Wetherell

diff --git a/include/wx/fs_filter.h b/include/wx/fs_filter.h
index 97c90048304d5136de491eabfadbf7d81c4d857e..bd8924cc436dc2cb4af272c9c4b8168a1bebced6 100644 (file)
--- a/include/wx/fs_filter.h
+++ b/include/wx/fs_filter.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        fs_filter.h
+// Name:        wx/fs_filter.h

 // Purpose:     Filter file system handler
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
 // Purpose:     Filter file system handler
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index ae3849bb4fefbeab281863f5d655a02360877c9a..79bf8b5ec2d1ac16c461d294ba35bbff0b310626 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/include/wx/fs_zip.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        include/wx/fs_zip.h
+// Name:        wx/fs_zip.h

 // Purpose:     wxZipFSHandler typedef for compatibility
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell
 // Purpose:     wxZipFSHandler typedef for compatibility
 // Author:      Mike Wetherell
 // Copyright:   (c) 2006 Mike Wetherell

diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h
index 8761fa749c52a594a1f3d3e4c229d8b07471c7d1..2fdcdd39f9edabe225755f515af215378ca67bc2 100644 (file)
--- a/include/wx/gifdecod.h
+++ b/include/wx/gifdecod.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gifdecod.h
+// Name:        wx/gifdecod.h

 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.02
 // Purpose:     wxGIFDecoder, GIF reader for wxImage and wxAnimation
 // Author:      Guillermo Rodriguez Garcia <guille@iies.es>
 // Version:     3.02


@@ -114,4 +114,3 @@ private:
 
 #endif  // wxUSE_STREAM && wxUSE_GIF
 #endif  // _WX_GIFDECOD_H
 
 #endif  // wxUSE_STREAM && wxUSE_GIF
 #endif  // _WX_GIFDECOD_H

-

diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h
index c85fac0e6a65e91bdae632d153464384a1f0f6b3..4a19f800fa82637c86e67bae50a39872fd29949c 100644 (file)
--- a/include/wx/imagbmp.h
+++ b/include/wx/imagbmp.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagbmp.h
+// Name:        wx/imagbmp.h

 // Purpose:     wxImage BMP, ICO, CUR and ANI handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$
 // Purpose:     wxImage BMP, ICO, CUR and ANI handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$

diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h
index c921a8aca789bcf577687b22c32b138dac111a7f..a883bde7d6c7e73cafc4cdb152f67beafc28369b 100644 (file)
--- a/include/wx/imagtga.h
+++ b/include/wx/imagtga.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagtga.h
+// Name:        wx/imagtga.h

 // Purpose:     wxImage TGA handler
 // Author:      Seth Jackson
 // RCS-ID:      $Id$
 // Purpose:     wxImage TGA handler
 // Author:      Seth Jackson
 // RCS-ID:      $Id$

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index d3de6928d3b9fec702b01cfa33bd6687140cfbf3..d8eb3c27a17d062214574add83b7ca6fad82a0b2 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        prntbase.h
+// Name:        wx/prntbase.h

 // Purpose:     Base classes for printing framework
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Base classes for printing framework
 // Author:      Julian Smart
 // Modified by:

diff --git a/include/wx/process.h b/include/wx/process.h
index a904f879ad9aec3211ab284fd3a0a6270e3c225c..298a209b8c04d00eb6f745ee5534b471e9faaac2 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        process.h
+// Name:        wx/process.h

 // Purpose:     wxProcess class
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method
 // Purpose:     wxProcess class
 // Author:      Guilhem Lavaux
 // Modified by: Vadim Zeitlin to check error codes, added Detach() method

diff --git a/include/wx/sizer.h b/include/wx/sizer.h
index c3837e3deb741eabd4d32f678b8654d2cff1ead9..f05a5e3e6645d704fc892d362bdb804819111d1b 100644 (file)
--- a/include/wx/sizer.h
+++ b/include/wx/sizer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        sizer.h
+// Name:        wx/sizer.h

 // Purpose:     provide wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)
 // Purpose:     provide wxSizer class for layout
 // Author:      Robert Roebling and Robin Dunn
 // Modified by: Ron Lee, Vadim Zeitlin (wxSizerFlags)


@@ -467,7 +467,7 @@ public:
     wxSizerItem* PrependStretchSpacer(int prop = 1);
 
     // set (or possibly unset if window is NULL) or get the window this sizer
     wxSizerItem* PrependStretchSpacer(int prop = 1);
 
     // set (or possibly unset if window is NULL) or get the window this sizer

-    // is used in 
+    // is used in

     void SetContainingWindow(wxWindow *window);
     wxWindow *GetContainingWindow() const { return m_containingWindow; }
 
     void SetContainingWindow(wxWindow *window);
     wxWindow *GetContainingWindow() const { return m_containingWindow; }
 


@@ -484,9 +484,9 @@ public:
     virtual bool Detach( wxSizer *sizer );
     virtual bool Detach( int index );
 
     virtual bool Detach( wxSizer *sizer );
     virtual bool Detach( int index );
 

-    virtual bool Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive = false );  
-    virtual bool Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive = false );  
-    virtual bool Replace( size_t index, wxSizerItem *newitem );  
+    virtual bool Replace( wxWindow *oldwin, wxWindow *newwin, bool recursive = false );
+    virtual bool Replace( wxSizer *oldsz, wxSizer *newsz, bool recursive = false );
+    virtual bool Replace( size_t index, wxSizerItem *newitem );

 
     virtual void Clear( bool delete_windows = false );
     virtual void DeleteWindows();
 
     virtual void Clear( bool delete_windows = false );
     virtual void DeleteWindows();


@@ -1050,4 +1050,3 @@ wxSizer::InsertStretchSpacer(size_t index, int prop)
 
 
 #endif // __WXSIZER_H__
 
 
 #endif // __WXSIZER_H__

-

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index 714156d9764dca5dcc5137041d31519f2ae5873b..b92119904f85f6eb98696797652e3a5255d611d7 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tarstrm.h
+// Name:        wx/tarstrm.h

 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$

diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h
index e6e5b30d35524010d21da6d1594fd810f60ff900..549e7eba7358a84398294c7ccb945bfe1e86843a 100644 (file)
--- a/include/wx/xpmdecod.h
+++ b/include/wx/xpmdecod.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        xpmdecod.h
+// Name:        wx/xpmdecod.h

 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$
 // Purpose:     wxXPMDecoder, XPM reader for wxImage and wxBitmap
 // Author:      Vaclav Slavik
 // CVS-ID:      $Id$


@@ -45,4 +45,3 @@ public:
 #endif // wxUSE_IMAGE && wxUSE_XPM
 
 #endif  // _WX_XPM_H_
 #endif // wxUSE_IMAGE && wxUSE_XPM
 
 #endif  // _WX_XPM_H_

-

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 8d704a001addfd8169e2b0211446fe984e6a9ea3..be3ff8790cec7bbaa382610d8d64a7b0c6c7e52c 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        zipstrm.h
+// Name:        wx/zipstrm.h

 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
 // Purpose:     Streams for Zip files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$


@@ -25,7 +25,7 @@
        || !defined __GNUC_MINOR__ \
        || !defined __GNUC_PATCHLEVEL__ \
        || __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 30402)
        || !defined __GNUC_MINOR__ \
        || !defined __GNUC_PATCHLEVEL__ \
        || __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ < 30402)

-#define WXZIPFIX WXDLLIMPEXP_BASE 
+#define WXZIPFIX WXDLLIMPEXP_BASE

 #else
 #define WXZIPFIX
 #endif
 #else
 #define WXZIPFIX
 #endif


@@ -52,7 +52,7 @@ enum wxZipMethod
 };
 
 // Originating File-System.
 };
 
 // Originating File-System.

-// 
+//

 // These are Pkware's values. Note that Info-zip disagree on some of them,
 // most notably NTFS.
 //
 // These are Pkware's values. Note that Info-zip disagree on some of them,
 // most notably NTFS.
 //


@@ -267,7 +267,7 @@ private:
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////

-// wxZipOutputStream 
+// wxZipOutputStream

 
 WX_DECLARE_LIST_WITH_DECL(wxZipEntry, wxZipEntryList_, class WXDLLIMPEXP_BASE);
 
 
 WX_DECLARE_LIST_WITH_DECL(wxZipEntry, wxZipEntryList_, class WXDLLIMPEXP_BASE);
 


@@ -302,7 +302,7 @@ public:
 
     int  GetLevel() const                       { return m_level; }
     void WXZIPFIX SetLevel(int level);
 
     int  GetLevel() const                       { return m_level; }
     void WXZIPFIX SetLevel(int level);

-    
+

 protected:
     virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size);
     virtual wxFileOffset OnSysTell() const      { return m_entrySize; }
 protected:
     virtual size_t WXZIPFIX OnSysWrite(const void *buffer, size_t size);
     virtual wxFileOffset OnSysTell() const      { return m_entrySize; }


@@ -352,7 +352,7 @@ private:
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////

-// wxZipInputStream 
+// wxZipInputStream

 
 class WXDLLIMPEXP_BASE wxZipInputStream : public wxArchiveInputStream
 {
 
 class WXDLLIMPEXP_BASE wxZipInputStream : public wxArchiveInputStream
 {


@@ -408,7 +408,7 @@ private:
     wxUint32 ReadSignature();
     bool FindEndRecord();
     bool LoadEndRecord();
     wxUint32 ReadSignature();
     bool FindEndRecord();
     bool LoadEndRecord();

-    
+

     bool AtHeader() const       { return m_headerSize == 0; }
     bool AfterHeader() const    { return m_headerSize > 0 && !m_decomp; }
     bool IsOpened() const       { return m_decomp != NULL; }
     bool AtHeader() const       { return m_headerSize == 0; }
     bool AfterHeader() const    { return m_headerSize > 0 && !m_decomp; }
     bool IsOpened() const       { return m_decomp != NULL; }

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index badb3e4f78ed3357d959e2720e765cf19bd075df..fd3cb5eb0a03dec52f48fa16a4051168b6bfa83d 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        zstream.h
+// Name:        wx/zstream.h

 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell
 // Purpose:     Memory stream classes
 // Author:      Guilhem Lavaux
 // Modified by: Mike Wetherell