The char->wxChar in window.h cascades through some other header files.

[wxWidgets.git] / user / wxLayout / wxlparser.cpp

diff --git a/user/wxLayout/wxlparser.cpp b/user/wxLayout/wxlparser.cpp
index 2e3f9f54c4fd1ed3d751d238722dc4a5bc1b211f..d9cfe9b3feb2a72130831f6d04f437f4467d0dfd 100644 (file)
--- a/user/wxLayout/wxlparser.cpp
+++ b/user/wxLayout/wxlparser.cpp
@@ -1,7 +1,7 @@
 /*-*- c++ -*-********************************************************
  * wxlparser.h : parsers,  import/export for wxLayoutList           *
  *                                                                  *
 /*-*- c++ -*-********************************************************
  * wxlparser.h : parsers,  import/export for wxLayoutList           *
  *                                                                  *

- * (C) 1998 by Karsten Ballüder (Ballueder@usa.net)                 *
+ * (C) 1998,1999 by Karsten Ballüder (Ballueder@usa.net)            *

  *                                                                  *
  * $Id$
  *******************************************************************/
  *                                                                  *
  * $Id$
  *******************************************************************/


@@ -10,28 +10,54 @@
 #   pragma implementation "wxlparser.h"
 #endif
 
 #   pragma implementation "wxlparser.h"
 #endif
 

-#include   "wxllist.h"
-#include   "wxlparser.h"
+//#include "Mpch.h"
+#ifdef M_PREFIX
+#   include "gui/wxllist.h"
+#   include "gui/wxlparser.h"
+#else
+#   include "wxllist.h"
+#   include "wxlparser.h"
+#endif

 
 #define   BASE_SIZE 12
 
 
 #define   BASE_SIZE 12
 

-void wxLayoutImportText(wxLayoutList &list, String const &str)
+inline static bool IsEndOfLine(const char *p, int mode)
+{
+   // in addition to Unix EOL convention we also (but not instead) understand
+   // the DOS one under Windows
+   return
+      (mode == WXLO_EXPORT_WITH_CRLF) ?
+      ((*p == '\r') && (*(p + 1) == '\n')) 
+      :
+      (((*p == '\r') && (*(p + 1) == '\n'))||(*p == '\n'));
+}
+
+void wxLayoutImportText(wxLayoutList *list, wxString const &str, int withflag)

 {
 {

+   if(str.Length() == 0)
+      return;

    char * cptr = (char *)str.c_str(); // string gets changed only temporarily
    const char * begin = cptr;
    char  backup;
    
    for(;;)
    {
    char * cptr = (char *)str.c_str(); // string gets changed only temporarily
    const char * begin = cptr;
    char  backup;
    
    for(;;)
    {

-      begin = cptr++;
-      while(*cptr && *cptr != '\n')
+      begin = cptr;
+      while( *cptr && !IsEndOfLine(cptr, withflag) )

          cptr++;
       backup = *cptr;
       *cptr = '\0';
          cptr++;
       backup = *cptr;
       *cptr = '\0';

-      list.Insert(begin);
+      list->Insert(begin);

       *cptr = backup;
       *cptr = backup;

-      if(backup == '\n')
-         list.LineBreak();
+
+      // check if it's the end of this line
+      if ( IsEndOfLine(cptr, withflag) )
+      {
+         // if it was "\r\n", skip the following '\n'
+         if ( *cptr == '\r' )
+            cptr++;
+         list->LineBreak();
+      }

       else if(backup == '\0') // reached end of string
          break;
       cptr++;
       else if(backup == '\0') // reached end of string
          break;
       cptr++;


@@ -39,32 +65,29 @@ void wxLayoutImportText(wxLayoutList &list, String const &str)
 }
 
 static
 }
 
 static

-String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
-                                 wxLayoutStyleInfo **lastStylePtr)
+wxString wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
+                                 wxLayoutStyleInfo *styleInfo)

 {
    static char buffer[20];
 {
    static char buffer[20];

-   String html;
+   wxString html;

    
    

-   wxLayoutStyleInfo *si = cmd.GetStyle();
-   wxLayoutStyleInfo *last_si = NULL;
+   wxLayoutStyleInfo si;
+   cmd.GetStyle(&si);

 
    int size, sizecount;
    
 
    int size, sizecount;
    

-   if(lastStylePtr != NULL)
-      last_si = *lastStylePtr;
-   

    html += "<font ";
 
    html +="color=";
    html += "<font ";
 
    html +="color=";

-   sprintf(buffer,"\"#%02X%02X%02X\"", si->fg_red,si->fg_green,si->fg_blue);
+   sprintf(buffer,"\"#%02X%02X%02X\"", si.fg_red,si.fg_green,si.fg_blue);

    html += buffer;
 
 
    html += " bgcolor=";
    html += buffer;
 
 
    html += " bgcolor=";

-   sprintf(buffer,"\"#%02X%02X%02X\"", si->bg_red,si->bg_green,si->bg_blue);
+   sprintf(buffer,"\"#%02X%02X%02X\"", si.bg_red,si.bg_green,si.bg_blue);

    html += buffer;
 
    html += buffer;
 

-   switch(si->family)
+   switch(si.family)

    {
    case wxSWISS:
    case wxMODERN:
    {
    case wxSWISS:
    case wxMODERN:


@@ -78,12 +101,12 @@ String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
    }
 
    size = BASE_SIZE; sizecount = 0;
    }
 
    size = BASE_SIZE; sizecount = 0;

-   while(size < si->size && sizecount < 5)
+   while(size < si.size && sizecount < 5)

    {
       sizecount ++;
       size = (size*12)/10;
    }
    {
       sizecount ++;
       size = (size*12)/10;
    }

-   while(size > si->size && sizecount > -5)
+   while(size > si.size && sizecount > -5)

    {
       sizecount --;
       size = (size*10)/12;
    {
       sizecount --;
       size = (size*10)/12;


@@ -94,93 +117,130 @@ String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
 
    html +=">";
 
 
    html +=">";
 

-   if(last_si != NULL)
+   if(styleInfo != NULL)

       html ="</font>"+html; // terminate any previous font command
 
       html ="</font>"+html; // terminate any previous font command
 

-   if((si->weight == wxBOLD) && ( (!last_si) || (last_si->weight != wxBOLD)))
+   if((si.weight == wxBOLD) && ( (!styleInfo) || (styleInfo->weight != wxBOLD)))

       html += "<b>";
    else
       html += "<b>";
    else

-      if(si->weight != wxBOLD && ( last_si && (last_si->weight == wxBOLD)))
+      if(si.weight != wxBOLD && ( styleInfo && (styleInfo->weight == wxBOLD)))

          html += "</b>";
 
          html += "</b>";
 

-   if(si->style == wxSLANT)
-      si->style = wxITALIC; // the same for html
+   if(si.style == wxSLANT)
+      si.style = wxITALIC; // the same for html

    
    

-   if((si->style == wxITALIC) && ( (!last_si) || (last_si->style != wxITALIC)))
+   if((si.style == wxITALIC) && ( (!styleInfo) || (styleInfo->style != wxITALIC)))

       html += "<i>";
    else
       html += "<i>";
    else

-      if(si->style != wxITALIC && ( last_si && (last_si->style == wxITALIC)))
+      if(si.style != wxITALIC && ( styleInfo && (styleInfo->style == wxITALIC)))

          html += "</i>";
 
          html += "</i>";
 

-   if(si->underline && ( (!last_si) || ! last_si->underline))
+   if(si.underline && ( (!styleInfo) || ! styleInfo->underline))

       html += "<u>";
       html += "<u>";

-   else if(si->underline == false && ( last_si && last_si->underline))
+   else if(si.underline == false && ( styleInfo && styleInfo->underline))

       html += "</u>";
       html += "</u>";

+
+   
+   *styleInfo = si; // update last style info

    
    

-   if(last_si)
-      delete last_si;
-   *lastStylePtr = si;

    return html;
 }
 
 
 
 #define   WXLO_IS_TEXT(type) \
    return html;
 }
 
 
 
 #define   WXLO_IS_TEXT(type) \

-( (type == WXLO_TYPE_TEXT || type == WXLO_TYPE_LINEBREAK) \
+( type == WXLO_TYPE_TEXT \

   || (type == WXLO_TYPE_CMD \
       && mode == WXLO_EXPORT_AS_HTML))
 
 
   
   || (type == WXLO_TYPE_CMD \
       && mode == WXLO_EXPORT_AS_HTML))
 
 
   

-   wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
-                                        wxLayoutList::iterator &from,
-                                        wxLayoutExportMode mode)
+wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
+                                     int mode, int flags)

 {
 {

-   if(from == list.end())
-      return NULL;
-   
-   wxLayoutObjectType   type = (*from)->GetType();
-   wxLayoutExportObject     * export = new wxLayoutExportObject();
-
-   static wxLayoutStyleInfo *s_si = NULL;
+   wxASSERT(status);
+   wxLayoutExportObject * export;

    
    

-   if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case
+   if(status->m_iterator == NULLIT) // end of line

    {
    {

-      export->type = WXLO_EXPORT_OBJECT;
-      export->content.object = *from;
-      from++;
-      return export;
+      if(!status->m_line || status->m_line->GetNextLine() == NULL)
+         // reached end of list
+         return NULL;
+   }
+   export = new wxLayoutExportObject();
+   wxLayoutObjectType type;
+   if(status->m_iterator != NULLIT)
+   {
+      type = (** status->m_iterator).GetType();
+      if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case
+      {
+         export->type = WXLO_EXPORT_OBJECT;
+         export->content.object = *status->m_iterator;
+         status->m_iterator++;
+         return export;
+      }
+   }
+   else
+   {  // iterator == NULLIT
+      if(mode == WXLO_EXPORT_AS_OBJECTS)
+      {
+         export->type = WXLO_EXPORT_EMPTYLINE;
+         export->content.object = NULL; //empty line
+         status->m_line = status->m_line->GetNextLine();
+         if(status->m_line)
+            status->m_iterator = status->m_line->GetFirstObject();
+         return export;
+      }
+      else
+         type = WXLO_TYPE_TEXT;

    }
 
    }
 

-   String *str = new String();
-   
+   wxString *str = new wxString();

    // text must be concatenated
    // text must be concatenated

-   while(from != list.end() && WXLO_IS_TEXT(type))
+   int testf = WXLO_EXPORT_WITH_CRLF;
+   for(;;)

    {
    {

+      while(status->m_iterator == NULLIT)
+      {
+         if(flags & WXLO_EXPORT_AS_HTML)
+            *str += "<br>";
+         if(flags & WXLO_EXPORT_WITH_CRLF)
+            *str += "\r\n";
+         else
+            *str += '\n';
+
+         status->m_line = status->m_line->GetNextLine();
+         if(status->m_line)
+            status->m_iterator = status->m_line->GetFirstObject();
+         else
+            break; // end of list
+      }
+      if(! status->m_line)  // reached end of list, fall through
+         break; 
+      type = (** status->m_iterator).GetType();
+      if(type == WXLO_TYPE_ICON)
+         break;

       switch(type)
       {
       case WXLO_TYPE_TEXT:
       switch(type)
       {
       case WXLO_TYPE_TEXT:

-         *str += ((wxLayoutObjectText *)*from)->GetText();
-         break;
-      case WXLO_TYPE_LINEBREAK:
-         if(mode == WXLO_EXPORT_AS_HTML)
-            *str += "<br>";
-         *str += '\n';
+         *str += ((wxLayoutObjectText *)*status->m_iterator)->GetText();

          break;
       case WXLO_TYPE_CMD:
          break;
       case WXLO_TYPE_CMD:

-         //wxASSERT(mode == WXLO_EXPORT_AS_HTML,"reached cmd object in text mode")
-         assert(mode == WXLO_EXPORT_AS_HTML);
+         wxASSERT_MSG( mode == WXLO_EXPORT_AS_HTML,
+                       "reached cmd object in text mode" );
+         

          *str += wxLayoutExportCmdAsHTML(*(wxLayoutObjectCmd const
          *str += wxLayoutExportCmdAsHTML(*(wxLayoutObjectCmd const

-                                           *)*from, &s_si);
+                                           *)*status->m_iterator, & status->m_si);

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

-      from++;
-      if(from != list.end())
-         type = (*from)->GetType();
+      status->m_iterator++;

    }
    }

-   export->type = (mode == WXLO_EXPORT_AS_HTML) ?  WXLO_EXPORT_HTML : WXLO_EXPORT_TEXT;
+
+   export->type = (mode == WXLO_EXPORT_AS_HTML)
+      ?  WXLO_EXPORT_HTML : WXLO_EXPORT_TEXT;

    export->content.text = str;
    return export;
 }
    export->content.text = str;
    return export;
 }

+