X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62a1177692935b06dc6382c22cb65620b5cf6888..61c213fe224da24ce33c9187263e75a17ca83a04:/samples/richedit/wxlparser.cpp?ds=sidebyside diff --git a/samples/richedit/wxlparser.cpp b/samples/richedit/wxlparser.cpp index fb139f5991..c5705745a4 100644 --- a/samples/richedit/wxlparser.cpp +++ b/samples/richedit/wxlparser.cpp @@ -180,10 +180,11 @@ wxLayoutExportStatus::wxLayoutExportStatus(wxLayoutList *list) wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status, int mode, int flags) { + wxLayoutObjectList::iterator nulled(NULL); wxASSERT(status); wxLayoutExportObject * exp; - if(status->m_iterator == NULLIT) // end of line + if(status->m_iterator == nulled) // end of line { if(!status->m_line || status->m_line->GetNextLine() == NULL) // reached end of list @@ -191,7 +192,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status, } exp = new wxLayoutExportObject(); wxLayoutObjectType type; - if(status->m_iterator != NULLIT) + if(status->m_iterator != nulled) { type = (** status->m_iterator).GetType(); if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case @@ -203,7 +204,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status, } } else - { // iterator == NULLIT + { // iterator == nulled if(mode == WXLO_EXPORT_AS_OBJECTS) { exp->type = WXLO_EXPORT_EMPTYLINE; @@ -222,7 +223,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status, // text must be concatenated for(;;) { - while(status->m_iterator == NULLIT) + while(status->m_iterator == nulled) { if(mode & WXLO_EXPORT_AS_HTML) *str += _T("
");