Applied wxVScrolledWindow patch

[wxWidgets.git] / utils / HelpGen / src / ifcontext.h

diff --git a/utils/HelpGen/src/ifcontext.h b/utils/HelpGen/src/ifcontext.h
index 50f2eaded29534288eddb7f151ed0587b3c43170..419d7006b1d42bd09be4127694aecde5211d97d0 100644 (file)
--- a/utils/HelpGen/src/ifcontext.h
+++ b/utils/HelpGen/src/ifcontext.h
@@ -6,7 +6,7 @@
 // Created:     27/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleskandars Gluchovas
 // Created:     27/12/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleskandars Gluchovas

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IFCONTEXT_G__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __IFCONTEXT_G__


@@ -18,24 +18,24 @@
 class spBookmark
 {
 public:
 class spBookmark
 {
 public:

-       size_t mFrom;
-       size_t mLen;
-       size_t mFileNo;
+    size_t mFrom;
+    size_t mLen;
+    size_t mFileNo;

 
 

-       inline spBookmark() {}
+    inline spBookmark() {}

 
 

-       inline spBookmark( int from, int len, int fileNo )
-               : mFrom( from ), mLen( len ), mFileNo( fileNo )
-       {}
+    inline spBookmark( int from, int len, int fileNo )
+        : mFrom( from ), mLen( len ), mFileNo( fileNo )
+    {}

 };
 
 #if defined( wxUSE_TEMPLATE_STL )
 
 };
 
 #if defined( wxUSE_TEMPLATE_STL )
 

-       typedef vector<spBookmark) BookmarkListT
+    typedef vector<spBookmark) BookmarkListT

 
 #else
 
 
 #else
 

-       typedef WXSTL_VECTOR_SHALLOW_COPY(spBookmark) BookmarkListT;
+    typedef WXSTL_VECTOR_SHALLOW_COPY(spBookmark) BookmarkListT;

 
 #endif
 
 
 #endif
 


@@ -44,56 +44,57 @@ class spInterFileContext : public spContext
 {
 protected:
 
 {
 protected:
 

-       BookmarkListT  mDeletionMarks;
+    BookmarkListT  mDeletionMarks;

 
 

-       BookmarkListT  mFiltered;
+    BookmarkListT  mFiltered;

 
 

-       size_t         mCurFileNo;
+    size_t         mCurFileNo;

 
 

-       CJSourceParser mParser;
+    CJSourceParser mParser;

 
 protected:
 
 
 protected:
 

-       size_t GetFileNoOfContext( spContext& ctx );
-       size_t GetFileNo( const string& fname );
+    size_t GetFileNoOfContext( spContext& ctx );
+    size_t GetFileNo( const wxString& fname );

 
 

-       void InsertBookmarkSorted( BookmarkListT& lst, spBookmark& mark );
+    void InsertBookmarkSorted( BookmarkListT& lst, spBookmark& mark );

 
 

-       void DoAppendSourceFragment( string& source, 
-                                                                string& result, 
-                                                        size_t  pos, size_t len );
+    void DoAppendSourceFragment( wxString& source,
+                                 wxString& result,
+                                 size_t    pos,
+                                 size_t len );

 
 

-       void GenerateContextBody( spContext& ctx, 
-                                                         string&    source,
-                                                         string&    result, 
-                                                         size_t& lastSavedPos,
-                                                         size_t& lastKnownPos );
+    void GenerateContextBody( spContext& ctx,
+                              wxString&  source,
+                              wxString&  result,
+                              size_t&    lastSavedPos,
+                              size_t&    lastKnownPos );

 
 public:
 
 
 public:
 

-       StrListT       mFiles;
-       StrListT       mContents;
+    StrListT       m_Files;
+    StrListT       m_Contents;

 
 public:
 
 
 public:
 

-       spInterFileContext();
-       ~spInterFileContext();
+    spInterFileContext();
+    ~spInterFileContext();

 
 

-       void AddFile( const string& fname, const string& content );
+    void AddFile( const wxString& fname, const wxString& content );

 
 

-       void RemoveContext( spContext& ctx );
+    void RemoveContext( spContext& ctx );

 
 

-       void GenrateContents();
+    void GenrateContents();

 
 

-       void ParseContents( SourceParserPlugin* pPlugin = NULL );
+    void ParseContents( SourceParserPlugin* pPlugin = NULL );

 
 

-       void WriteToFiles();
+    void WriteToFiles();

 
 

-       // overriden method of the base class (finds out the source fragment)
+    // overriden method of the base class (finds out the source fragment)

 
 

-       virtual string GetBody( spContext* pCtx = NULL );
+    virtual wxString GetBody( spContext* pCtx = NULL );

 
 

-       virtual string GetHeader( spContext* pCtx = NULL );
+    virtual wxString GetHeader( spContext* pCtx = NULL );

 };
 
 
 };