From ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 30 Oct 2006 11:56:12 +0000 Subject: [PATCH] Minor header cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/archive.h | 18 +++++++++--------- include/wx/artprov.h | 6 +++--- include/wx/caret.h | 3 +-- include/wx/cmndata.h | 12 ++++++------ include/wx/dynarray.h | 3 +-- include/wx/fileback.h | 2 +- include/wx/filesys.h | 2 +- include/wx/fs_arc.h | 2 +- include/wx/fs_filter.h | 2 +- include/wx/fs_zip.h | 2 +- include/wx/gifdecod.h | 3 +-- include/wx/imagbmp.h | 2 +- include/wx/imagtga.h | 2 +- include/wx/prntbase.h | 2 +- include/wx/process.h | 2 +- include/wx/sizer.h | 11 +++++------ include/wx/tarstrm.h | 2 +- include/wx/xpmdecod.h | 3 +-- include/wx/zipstrm.h | 14 +++++++------- include/wx/zstream.h | 2 +- 20 files changed, 45 insertions(+), 50 deletions(-) diff --git a/include/wx/archive.h b/include/wx/archive.h index 0858d299f3..6f0ce844e1 100644 --- 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$ @@ -55,7 +55,7 @@ public: 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); @@ -94,14 +94,14 @@ public: 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(); } - + 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. -// +// // The overload 'bool PutNextEntry(wxArchiveEntry *entry)' takes ownership // of the entry object. @@ -207,7 +207,7 @@ public: if (m_rep) m_rep->AddRef(); } - + ~wxArchiveIterator() { if (m_rep) m_rep->UnRef(); @@ -255,13 +255,13 @@ private: 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; } - + void AddRef() { m_ref++; } @@ -278,7 +278,7 @@ private: return NULL; } if (m_ref > 1) { - m_ref--; + m_ref--; return new Rep(m_arc, entry); } delete m_entry; diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 61cb8c518d..184a21791f 100644 --- 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: @@ -146,7 +146,7 @@ public: 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); @@ -172,7 +172,7 @@ protected: 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); } diff --git a/include/wx/caret.h b/include/wx/caret.h index 8cff8f2f48..ff5071ca78 100644 --- 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: @@ -250,4 +250,3 @@ private: #endif // wxUSE_CARET #endif // _WX_CARET_H_BASE_ - diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h index 9ae7f96a68..2af5f9e2e3 100644 --- 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: @@ -210,13 +210,13 @@ public: 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 ); - + #if WXWIN_COMPATIBILITY_2_4 // PostScript-specific data @@ -262,12 +262,12 @@ private: wxPrintQuality m_printQuality; wxPaperSize m_paperId; wxSize m_paperSize; - + wxString m_filename; - + char* m_privData; int m_privDataLen; - + wxPrintNativeDataBase *m_nativeData; private: diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h index b99ed6a64b..05e6d5e70e 100644 --- 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: @@ -1007,4 +1007,3 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE } #endif // _DYNARRAY_H - diff --git a/include/wx/fileback.h b/include/wx/fileback.h index 5fda9c0c50..9b5c637864 100644 --- 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$ diff --git a/include/wx/filesys.h b/include/wx/filesys.h index e3df47187a..267daac0f8 100644 --- 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 diff --git a/include/wx/fs_arc.h b/include/wx/fs_arc.h index 5500872836..53e83fa2ee 100644 --- 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 diff --git a/include/wx/fs_filter.h b/include/wx/fs_filter.h index 97c9004830..bd8924cc43 100644 --- 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 diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h index ae3849bb4f..79bf8b5ec2 100644 --- 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 diff --git a/include/wx/gifdecod.h b/include/wx/gifdecod.h index 8761fa749c..2fdcdd39f9 100644 --- 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 // Version: 3.02 @@ -114,4 +114,3 @@ private: #endif // wxUSE_STREAM && wxUSE_GIF #endif // _WX_GIFDECOD_H - diff --git a/include/wx/imagbmp.h b/include/wx/imagbmp.h index c85fac0e6a..4a19f800fa 100644 --- 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$ diff --git a/include/wx/imagtga.h b/include/wx/imagtga.h index c921a8aca7..a883bde7d6 100644 --- 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$ diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h index d3de6928d3..d8eb3c27a1 100644 --- 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: diff --git a/include/wx/process.h b/include/wx/process.h index a904f879ad..298a209b8c 100644 --- 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 diff --git a/include/wx/sizer.h b/include/wx/sizer.h index c3837e3deb..f05a5e3e66 100644 --- 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) @@ -467,7 +467,7 @@ public: 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; } @@ -484,9 +484,9 @@ public: 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(); @@ -1050,4 +1050,3 @@ wxSizer::InsertStretchSpacer(size_t index, int prop) #endif // __WXSIZER_H__ - diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h index 714156d976..b92119904f 100644 --- 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$ diff --git a/include/wx/xpmdecod.h b/include/wx/xpmdecod.h index e6e5b30d35..549e7eba73 100644 --- 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$ @@ -45,4 +45,3 @@ public: #endif // wxUSE_IMAGE && wxUSE_XPM #endif // _WX_XPM_H_ - diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h index 8d704a001a..be3ff8790c 100644 --- 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$ @@ -25,7 +25,7 @@ || !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 @@ -52,7 +52,7 @@ enum wxZipMethod }; // Originating File-System. -// +// // 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); @@ -302,7 +302,7 @@ public: 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; } @@ -352,7 +352,7 @@ private: ///////////////////////////////////////////////////////////////////////////// -// wxZipInputStream +// wxZipInputStream class WXDLLIMPEXP_BASE wxZipInputStream : public wxArchiveInputStream { @@ -408,7 +408,7 @@ private: 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; } diff --git a/include/wx/zstream.h b/include/wx/zstream.h index badb3e4f78..fd3cb5eb0a 100644 --- 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 -- 2.47.2