X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62a1177692935b06dc6382c22cb65620b5cf6888..14b4c0ff125b7bd175916f465e76a359b4fda706:/samples/richedit/wxllist.h

diff --git a/samples/richedit/wxllist.h b/samples/richedit/wxllist.h
index 5263acd334..9806179483 100644
--- a/samples/richedit/wxllist.h
+++ b/samples/richedit/wxllist.h
@@ -1,5 +1,5 @@
 /*-*- c++ -*-********************************************************
- * wxLayoutList.h - a formatted text rendering engine for wxWindows *
+ * wxLayoutList.h - a formatted text rendering engine for wxWidgets *
  *                                                                  *
  * (C) 1999-2000 by Karsten Ballüder (ballueder@gmx.net)            *
  *                                                                  *
@@ -32,7 +32,7 @@
 #   include "MObject.h"
 #endif
 
-// use the wxWindows caret class instead of home grown cursor whenever possible
+// use the wxWidgets caret class instead of home grown cursor whenever possible
 #ifdef __WXMSW__
 #   undef WXLAYOUT_USE_CARET
 #   define WXLAYOUT_USE_CARET 1
@@ -260,9 +260,6 @@ protected:
 /// Define a list type of wxLayoutObject pointers.
 KBLIST_DEFINE(wxLayoutObjectList, wxLayoutObject);
 
-/// An illegal iterator to save typing.
-#define NULLIT (wxLayoutObjectList::iterator(NULL))
-
 /// The iterator type.
 typedef wxLayoutObjectList::iterator wxLOiterator;
 
@@ -595,7 +592,7 @@ public:
         @param xpos the column number
         @param offset where to store the difference between xpos and
         the object's head
-        @return iterator to the object or NULLIT
+        @return iterator to the object or iterator to NULL
     */
     wxLayoutObjectList::iterator FindObject(CoordType xpos, CoordType
         *offset) const ;
@@ -607,7 +604,7 @@ public:
         @param xpos the screen x coordinate
         @param offset where to store the difference between xpos and
         the object's head
-        @return iterator to the object or NULLIT
+        @return iterator to the object or iterator to NULL
     */
     wxLayoutObjectList::iterator FindObjectScreen(wxDC &dc,
         wxLayoutList *llist,
@@ -650,7 +647,7 @@ public:
     inline CoordType GetLineNumber() const { return m_LineNumber; }
 
     /** Return the length of the line.
-        @return line lenght in cursor positions
+        @return line length in cursor positions
     */
     inline CoordType GetLength() const { return m_Length; }
     //@}
@@ -771,7 +768,7 @@ public:
 
 private:
     /// Destructor is private. Use DeleteLine() to remove it.
-    ~wxLayoutLine();
+    ~wxLayoutLine(){};
 
     /**@name Functions to let the lines synchronise with each other. */
     //@{
@@ -1393,12 +1390,12 @@ public:
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
-   The wxLayoutPrintout object for printing within the wxWindows print
+   The wxLayoutPrintout object for printing within the wxWidgets print
    framework.
 
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /** This class implements a wxPrintout for printing a wxLayoutList within
-    the wxWindows printing framework.
+    the wxWidgets printing framework.
  */
 class wxLayoutPrintout: public wxPrintout
 {
@@ -1412,7 +1409,7 @@ public:
         _T("wxLayout Printout"));
 
     /// Destructor.
-    ~wxLayoutPrintout();
+    ~wxLayoutPrintout(){};
 
     /** Function which prints the n-th page.
         @param page the page number to print
@@ -1425,7 +1422,7 @@ public:
     */
     bool HasPage(int page);
 
-    /** Gets called from wxWindows to find out which pages are existing.
+    /** Gets called from wxWidgets to find out which pages are existing.
         I'm not totally sure about the parameters though.
         @param minPage the first page in the document
         @param maxPage the last page in the document