Fixes to allow compilation with no wchar_t (djgpp probably has a real wchar_t

[wxWidgets.git] / samples / richedit / wxlparser.cpp

diff --git a/samples/richedit/wxlparser.cpp b/samples/richedit/wxlparser.cpp
index 75d9f981b9edae0310aec0046301bae5892d9888..c5705745a4c3278fc8d4207f29cc3b741875a6ad 100644 (file)
--- a/samples/richedit/wxlparser.cpp
+++ b/samples/richedit/wxlparser.cpp
@@ -45,6 +45,7 @@ void wxLayoutImportText(wxLayoutList *list, wxString const &str)
    // VZ: I still don't like it... the string data may be shared...
    wxChar * cptr = (wxChar *)str.c_str(); // const_cast
    const wxChar * begin = cptr;
    // VZ: I still don't like it... the string data may be shared...
    wxChar * cptr = (wxChar *)str.c_str(); // const_cast
    const wxChar * begin = cptr;

+   wxUnusedVar(begin);

    wxChar  backup;
 
    for(;;)
    wxChar  backup;
 
    for(;;)


@@ -165,7 +166,7 @@ wxLayoutExportStatus::wxLayoutExportStatus(wxLayoutList *list)
    m_si = list->GetDefaultStyleInfo();
    m_line = list->GetFirstLine();
    m_iterator = m_line->GetFirstObject();
    m_si = list->GetDefaultStyleInfo();
    m_line = list->GetFirstLine();
    m_iterator = m_line->GetFirstObject();

-   m_FirstTime = TRUE;
+   m_FirstTime = true;

 }
 
 
 }
 
 


@@ -179,10 +180,11 @@ wxLayoutExportStatus::wxLayoutExportStatus(wxLayoutList *list)
 wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
                                      int mode, int flags)
 {
 wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
                                      int mode, int flags)
 {

+   wxLayoutObjectList::iterator nulled(NULL);

    wxASSERT(status);
    wxLayoutExportObject * exp;
 
    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
    {
       if(!status->m_line || status->m_line->GetNextLine() == NULL)
          // reached end of list


@@ -190,7 +192,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
    }
    exp = new wxLayoutExportObject();
    wxLayoutObjectType type;
    }
    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
    {
       type = (** status->m_iterator).GetType();
       if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case


@@ -202,7 +204,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
       }
    }
    else
       }
    }
    else

-   {  // iterator == NULLIT
+   {  // iterator == nulled

       if(mode == WXLO_EXPORT_AS_OBJECTS)
       {
          exp->type = WXLO_EXPORT_EMPTYLINE;
       if(mode == WXLO_EXPORT_AS_OBJECTS)
       {
          exp->type = WXLO_EXPORT_EMPTYLINE;


@@ -215,12 +217,13 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
       else
          type = WXLO_TYPE_TEXT;
    }
       else
          type = WXLO_TYPE_TEXT;
    }

+   wxUnusedVar(type);

 
    wxString *str = new wxString();
    // text must be concatenated
    for(;;)
    {
 
    wxString *str = new wxString();
    // text must be concatenated
    for(;;)
    {

-      while(status->m_iterator == NULLIT)
+      while(status->m_iterator == nulled)

       {
          if(mode & WXLO_EXPORT_AS_HTML)
             *str += _T("<br>");
       {
          if(mode & WXLO_EXPORT_AS_HTML)
             *str += _T("<br>");


@@ -250,7 +253,7 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
             *str += wxLayoutExportCmdAsHTML(
                *(wxLayoutObjectCmd const *)*status->m_iterator,
                & status->m_si, status->m_FirstTime);
             *str += wxLayoutExportCmdAsHTML(
                *(wxLayoutObjectCmd const *)*status->m_iterator,
                & status->m_si, status->m_FirstTime);

-         status->m_FirstTime = FALSE;
+         status->m_FirstTime = false;

          break;
       default:  // ignore icons
          ;
          break;
       default:  // ignore icons
          ;