updated wxLayout

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

user/wxLayout/wxLayout.cpp

@@ -223,7 +223,15 @@ void MyFrame::OnCommand( wxCommandEvent &event )
       Close( TRUE );
       break;
    case ID_PRINT:
-      m_lwin->Print();
+{
+   wxPrinter printer;
+   wxLayoutPrintout printout(m_lwin->GetLayoutList(),_("M: Printout"));
+   if (! printer.Print(this, &printout, TRUE))
+      wxMessageBox(                           
+         _("There was a problem with printing the message:\n"
+           "perhaps your current printer is not set up correctly?"),
+         _("Printing"), wxOK);
+}
       break;
    case ID_NOWRAP:
    case ID_WRAP:

user/wxLayout/wxllist.cpp

@@ -20,12 +20,15 @@
     is four cursor positions long. This makes sure that cursor
     positions are "as expected", i.e. in "abc\ndef" the 'd' would be
     at positions (x=0,y=1).
+
+
+    The redrawing of the cursor no longer erases it at the last
+    position, because the list gets redrawn anyway.
 */
 
 /*
   TODO:
 
-  - cursor redraw problems
   - blinking cursor
   - mouse click positions cursor
   - selection (SetMark(), GetSelection())
@@ -33,18 +36,13 @@
   - wxlwindow: formatting menu: problem with checked/unchecked consistency gtk bug?
 */
 
-/*
-  Known wxGTK bugs:
-  - MaxX()/MaxY() don't get set
-*/
-
  
 #ifdef __GNUG__
 #pragma implementation "wxllist.h"
 #endif
 
 //#include "Mpch.h"
-#ifdef M_BASEDIR
+#ifdef M_PREFIX
 #   include "gui/wxllist.h"
 #else
 #   include "wxllist.h"
@@ -244,7 +242,8 @@ wxLayoutList::wxLayoutList()
    m_DefaultSetting = NULL;
    m_WrapMargin = -1;
    m_Editable = FALSE;
-
+   m_boldCursor = FALSE;
+   
    Clear();
 }
 
@@ -259,7 +258,6 @@ void
 wxLayoutList::LineBreak(void)
 {
    Insert(new wxLayoutObjectLineBreak);
-//   m_CursorPos.x = 0; m_CursorPos.y++;
 }
 
 void
@@ -420,7 +418,7 @@ wxLayoutList::Draw(wxDC &dc,
                    iterator start,
                    wxPoint const &translate)
 {
-   Layout(dc); // FIXME just for now
+   //Layout(dc); // FIXME just for now
 
    ResetSettings(dc);
 
@@ -449,7 +447,7 @@ wxLayoutList::Draw(wxDC &dc,
 
 /** Erase at least to end of line */
 void
-wxLayoutList::EraseAndDraw(wxDC &dc, iterator start)
+wxLayoutList::EraseAndDraw(wxDC &dc, iterator start, wxPoint const &translate)
 {
    //look for begin of line
    while(start != end() && start != begin() && (**start).GetType() !=
@@ -468,7 +466,7 @@ wxLayoutList::EraseAndDraw(wxDC &dc, iterator start)
    dc.SetBrush(wxBrush(*m_ColourBG, wxSOLID));
    dc.SetPen(wxPen(*m_ColourBG,0,wxTRANSPARENT));
    dc.DrawRectangle(p.x,p.y,2000,2000); //dc.MaxX(),dc.MaxY());
-   Draw(dc,-1,-1,start,wxPoint(0,0));
+   Draw(dc,-1,-1,start,translate);
    //dc.DrawRectangle(p.x,p.y,2000,2000); //dc.MaxX(),dc.MaxY());
 }
 
@@ -476,13 +474,18 @@ wxLayoutList::EraseAndDraw(wxDC &dc, iterator start)
 void
 wxLayoutList::CalculateCursor(wxDC &dc)
 {
+   if(! m_CursorMoved)
+      return;
+   
    CoordType width, height, descent;
    CoordType baseLineSkip = 20; //FIXME
 
+   int cursorWidth = m_boldCursor ? 4 : 2;
+   
    if( m_CursorObject == iterator(NULL))  // empty list
    {
       m_CursorCoords = wxPoint(0,0);
-      m_CursorSize = wxPoint(2,baseLineSkip);
+      m_CursorSize = wxPoint(cursorWidth,baseLineSkip);
       m_CursorMoved = false; // coords are valid
       return;
    }
@@ -497,14 +500,14 @@ wxLayoutList::CalculateCursor(wxDC &dc)
       dc.GetTextExtent(sstr,&width,&height,&descent);
       m_CursorCoords = wxPoint(m_CursorCoords.x+width,
                                m_CursorCoords.y);
-      m_CursorSize = wxPoint(2,height);
+      m_CursorSize = wxPoint(cursorWidth,height);
    }
    else if(obj.GetType() == WXLO_TYPE_LINEBREAK)
    {
       if(m_CursorOffset == 1) // behind linebreak
          m_CursorCoords = wxPoint(0, m_CursorCoords.y + baseLineSkip);
       //m_CursorCoords = wxPoint(0, m_CursorCoords.y);
-      m_CursorSize = wxPoint(2,baseLineSkip);
+      m_CursorSize = wxPoint(cursorWidth,baseLineSkip);
    }
    else
    {
@@ -512,43 +515,52 @@ wxLayoutList::CalculateCursor(wxDC &dc)
       //cursorPosition = wxPoint(position.x, position.y);
       //cursorSize = wxPoint(size.x > 0 ? size.x : 1,size.y > 0 ? size.y : baseLineSkip);
       m_CursorCoords = wxPoint(m_CursorCoords.x+obj.GetSize().x, m_CursorCoords.y);
-      m_CursorSize = wxPoint(2, obj.GetSize().y);
+      m_CursorSize = wxPoint(cursorWidth, obj.GetSize().y);
       if(m_CursorSize.y < 1) m_CursorSize.y = baseLineSkip;
    }
    m_CursorMoved = false; // coords are valid
 }
 
 void
-wxLayoutList::DrawCursor(wxDC &dc, bool erase)
+wxLayoutList::DrawCursor(wxDC &dc, bool erase, wxPoint const &translate)
 {
    if(! m_Editable)
       return;
    
    if(erase)
-   {
-      //dc.SetBrush(*wxWHITE_BRUSH);
-      //dc.SetPen(wxPen(*wxWHITE,1,wxSOLID));
-      //dc.DrawRectangle(m_CursorCoords.x, m_CursorCoords.y, m_CursorSize.x, m_CursorSize.y);
-      dc.Blit(m_CursorCoords.x, m_CursorCoords.y, m_CursorSize.x,
-              m_CursorSize.y, &m_CursorMemDC,
-              0, 0, 0, 0);
-   }
+      ;
+#if 0
+   dc.Blit(m_CursorCoords.x+translate.x,
+              m_CursorCoords.y+translate.y,
+              m_CursorSize.x,m_CursorSize.y,
+              &m_CursorMemDC,
+           0, 0, 0, 0);
+#endif
    else
    {
+      // erase it at the old position:
       if(IsDirty() || CursorMoved())
       {
-         DrawCursor(dc,true);
+         // We don't need to erase the cursor because the screen gets
+         // redrawn completely.
+//         DrawCursor(dc,true);
+         // this is needed to update the cursor coordinates
          Layout(dc);
       }
-      // Save background:
+#if      0
+// Save background:
       wxBitmap bm(m_CursorSize.x+1,m_CursorSize.y+1);
       m_CursorMemDC.SelectObject(bm);
-      m_CursorMemDC.Blit(0, 0, m_CursorSize.x, m_CursorSize.y,
-                         &dc, m_CursorCoords.x,
-                         m_CursorCoords.y, 0, 0);
+      m_CursorMemDC.Blit(0, 0,
+                         m_CursorSize.x, m_CursorSize.y,
+                         &dc,
+                         m_CursorCoords.x+translate.x,
+                         m_CursorCoords.y+translate.y, 0, 0);
+#endif
+      // draw it:
       dc.SetBrush(*wxBLACK_BRUSH);
       dc.SetPen(wxPen(*wxBLACK,1,wxSOLID));
-      dc.DrawRectangle(m_CursorCoords.x, m_CursorCoords.y,
+      dc.DrawRectangle(m_CursorCoords.x+translate.x, m_CursorCoords.y+translate.y,
                        m_CursorSize.x, m_CursorSize.y);
    }
 }
@@ -713,6 +725,11 @@ wxLayoutList::MoveCursor(int dx, int dy)
    if(newPos.y < 0) newPos.y = 0;
    else if(newPos.y > m_MaxLine) newPos.y = m_MaxLine;
 
+   //FIXME: quick and dirty hack: as last object in buffer should be a 
+   // linebreak, we don't allow to go there
+   if(newPos.y >= m_MaxLine)
+      return false;
+
    if(newPos.y > m_CursorPos.y ||
       newPos.y == m_CursorPos.y &&
       newPos.x >= m_CursorPos.x)
@@ -720,7 +737,12 @@ wxLayoutList::MoveCursor(int dx, int dy)
    else
       direction = up;
 
-   wxASSERT(m_CursorObject);
+   if ( !m_CursorObject )
+   {
+      // list is empty
+       return FALSE;
+   }
+
    // now move cursor forwards until at the new position:
 
    // first, go to the right line:
@@ -758,6 +780,12 @@ wxLayoutList::MoveCursor(int dx, int dy)
       newPos.y = m_CursorPos.y;  // exited by break
       
    // now line is right, go to right column:
+   if(dx == 0) // we are moving up or down only
+   {
+      int max_x = GetLineLength(m_CursorObject);
+      if(max_x <= newPos.x)  // ... so we don't want to cross linebreaks
+         newPos.x = max_x-1; // but just go to the right column
+   }
    direction = newPos.x >= m_CursorPos.x ? down : up;
    while(newPos.x != m_CursorPos.x)
    {
@@ -819,8 +847,16 @@ wxLayoutList::MoveCursor(int dx, int dy)
          }
       }
    }
+
    return true; // FIXME: when return what?
 }
+void
+wxLayoutList::SetCursor(wxPoint const &p)
+{
+   m_CursorPos = p;
+   m_CursorObject = FindObjectCursor(&m_CursorPos, &m_CursorOffset);
+   m_CursorMoved = true;  
+}
 
 void
 wxLayoutList::Delete(CoordType count)
@@ -842,8 +878,8 @@ wxLayoutList::Delete(CoordType count)
       if(i == end())
          return; // we cannot delete anything more
 
-/* Here we need to treat linebreaks differently.
-   If m_CursorOffset==0 we are before the linebreak, otherwise behind.  */
+   /* Here we need to treat linebreaks differently.
+      If m_CursorOffset==0 we are before the linebreak, otherwise behind.  */
       if((*i)->GetType() == WXLO_TYPE_LINEBREAK)
       {
          if(m_CursorOffset == 0)
@@ -866,26 +902,32 @@ wxLayoutList::Delete(CoordType count)
       {
          wxLayoutObjectText *tobj = (wxLayoutObjectText *)*i;
          CoordType len = tobj->CountPositions();
-// If we find the end of a text object, this means that we
-// have to delete from the object following it.
+         /* If we find the end of a text object, this means that we
+            have to delete from the object following it. */
          if(len == m_CursorOffset)
          {
             i++;
             m_CursorOffset = 0;
             goto startover;
          }
-         else if(len <= count) // delete this object
-         {
-            count -= len;
-            erase(i);
-            m_CursorObject = i;
-            m_CursorOffset = 0;
-            continue; 
-         }
          else
          {
-            len = count;
-            tobj->GetText().erase(m_CursorOffset,len);
+            if(m_CursorOffset == 0 && len <= count) // delete this object
+            {
+               count -= len;
+               erase(i);
+               m_CursorObject = i;
+               m_CursorOffset = 0;
+               continue; 
+            }
+
+            int todelete = count;
+            if(todelete > len-m_CursorOffset)
+               todelete = len-m_CursorOffset;
+            
+            len = len - todelete;
+            tobj->GetText().erase(m_CursorOffset,todelete);
+            count -= todelete;
             // cursor unchanged
             return; // we are done
          }
@@ -915,6 +957,7 @@ wxLayoutList::Delete(CoordType count)
    while(count && i != end());      
 }
 
+
 void
 wxLayoutList::Insert(wxLayoutObjectBase *obj)
 {
@@ -1074,7 +1117,10 @@ wxLayoutList::GetLineLength(wxLayoutObjectList::iterator i, CoordType offs)
    CoordType len = 0;
 
    if(offs == 0 && (**i).GetType() == WXLO_TYPE_LINEBREAK)
-      i--;
+      if(i != begin())
+         i--;
+      else
+         return 0; // at begin of buffer in front of a linebreak
          
 // search backwards for beginning of line:
    while(i != begin() && (*i)->GetType() != WXLO_TYPE_LINEBREAK)
@@ -1100,7 +1146,7 @@ wxLayoutList::Clear(int family, int size, int style, int weight,
    m_dirty = true;  // force redraw/recalc
    wxLayoutObjectList::iterator i = begin();
 
-   wxBitmap bm(1,1);
+   wxBitmap bm(4,4);
    m_CursorMemDC.SelectObject(bm);
 
    while(i != end()) // == while valid
@@ -1124,7 +1170,7 @@ wxLayoutList::Clear(int family, int size, int style, int weight,
    m_CursorOffset = 0;
    m_CursorSize = wxPoint(2,(BASELINESTRETCH*m_FontPtSize)/10);
    
-   m_MaxLine = 1;
+   m_MaxLine = 0;
    m_LineHeight = (BASELINESTRETCH*m_FontPtSize)/10;
    m_MaxX = 0; m_MaxY = 0;
 
@@ -1211,8 +1257,8 @@ wxLayoutList::WrapLine(void)
       for(; offset > 0; offset--)
          if(t.GetText().c_str()[offset] == ' ' || t.GetText().c_str()[offset] == '\t')
          {
-            String left = t.GetText().substr(0,offset-1); // get part before cursor
-            t.GetText() = t.GetText().substr(offset,t.CountPositions()-offset); // keeps the right halve
+            String left = t.GetText().substr(0,offset); // get part before cursor
+            t.GetText() = t.GetText().substr(offset+1,t.CountPositions()-offset-1); // keeps the right halve
             insert(i,new wxLayoutObjectLineBreak);
             insert(i,new wxLayoutObjectText(left)); // inserts before
             break;
@@ -1322,10 +1368,9 @@ wxLayoutPrintout::DrawHeader(wxDC &dc,
                              int pageno)
 {
    // make backups of all essential parameters
-   wxBrush &brush = dc.GetBrush();
-   wxPen   &pen = dc.GetPen();
-   wxFont  &font = dc.GetFont(),
-           *myfont;
+   const wxBrush& brush = dc.GetBrush();
+   const wxPen&   pen = dc.GetPen();
+   const wxFont&  font = dc.GetFont();
    
    dc.SetBrush(*wxWHITE_BRUSH);
    dc.SetPen(wxPen(*wxBLACK,0,wxSOLID));
@@ -1333,8 +1378,9 @@ wxLayoutPrintout::DrawHeader(wxDC &dc,
                            topleft.y,bottomright.x-topleft.x,
                            bottomright.y-topleft.y);  
    dc.SetBrush(*wxBLACK_BRUSH);
-   myfont = new wxFont((WXLO_DEFAULTFONTSIZE*12)/10,wxSWISS,wxNORMAL,wxBOLD,false,"Helvetica");
-   dc.SetFont(*myfont);
+   wxFont myfont = wxFont((WXLO_DEFAULTFONTSIZE*12)/10,
+                          wxSWISS,wxNORMAL,wxBOLD,false,"Helvetica");
+   dc.SetFont(myfont);
 
    wxString page;
    page = "9999/9999  ";  // many pages...
@@ -1349,8 +1395,6 @@ wxLayoutPrintout::DrawHeader(wxDC &dc,
    dc.SetPen(pen);
    dc.SetBrush(brush);
    dc.SetFont(font);
-
-   delete myfont;
 }
 
 

user/wxLayout/wxllist.h

@@ -5,6 +5,8 @@
  *                                                                  *
  * $Id$
  *******************************************************************/
+
+
 #ifndef WXLLIST_H
 #define WXLLIST_H
 
@@ -23,7 +25,7 @@
 // skip the following defines if embedded in M application
 #ifdef   M_BASEDIR
 #   ifdef   DEBUG
-//#      define   WXLAYOUT_DEBUG
+#      define   WXLAYOUT_DEBUG
 #   endif
 #else
     // for testing only:
@@ -328,7 +330,8 @@ public:
              wxPoint const &translate = wxPoint(0,0));
 
    /** Deletes at least to the end of line and redraws */
-   void EraseAndDraw(wxDC &dc, iterator start = iterator(NULL));
+   void EraseAndDraw(wxDC &dc, iterator start = iterator(NULL),
+                     wxPoint const &translate = wxPoint(0,0));
    
    /** Finds the object occupying a certain screen position.
        @return pointer to wxLayoutObjectBase or NULL if not found
@@ -360,9 +363,8 @@ public:
    bool IsEditable(void) const { return m_Editable; }
    /// move cursor, returns true if it could move to the desired position
    bool MoveCursor(int dx = 0, int dy = 0);
-   void SetCursor(wxPoint const &p) { m_CursorPos = p; }
-   void DrawCursor(wxDC &dc, bool erase = false);
-   
+   void SetCursor(wxPoint const &p);
+   void DrawCursor(wxDC &dc, bool erase = false,wxPoint const &translate = wxPoint(0,0));
    /// Get current cursor position cursor coords
    wxPoint GetCursor(void) const { return m_CursorPos; }
    /// Gets graphical coordinates of cursor
@@ -391,6 +393,13 @@ public:
 
    /// Return maximum X,Y coordinates
    wxPoint GetSize(void) const { return wxPoint(m_MaxX, m_MaxY); }
+
+   /// calculates current cursor coordinates, called in Layout()
+   void CalculateCursor(wxDC &dc);
+
+   /// toggle normal/bold cursor
+   void SetBoldCursor(bool bold = true)
+      { m_boldCursor = bold; m_CursorMoved = true;}
 //@}
 protected:
    /// font parameters:
@@ -431,7 +440,7 @@ protected:
    /// object iterator for current cursor position:
    iterator  m_CursorObject;
    /// position of cursor within m_CursorObject:
-   int       m_CursorOffset;
+   CoordType m_CursorOffset;
    
    /// to store content overwritten by cursor
    wxMemoryDC m_CursorMemDC;
@@ -450,14 +459,14 @@ protected:
 private:
    /// Resets the font settings etc to default values
    void ResetSettings(wxDC &dc);
-   /// calculates current cursor coordinates, called in Layout()
-   void CalculateCursor(wxDC &dc);
    /// remembers the last cursor position for which FindObjectCursor was called
    wxPoint m_FoundCursor;
    /// remembers the iterator to the object related to m_FoundCursor
    wxLayoutObjectList::iterator m_FoundIterator;
    /// the wrap margin
    long m_WrapMargin;
+   /// draw a bold cursor?
+   bool m_boldCursor;
 };
 
 class wxLayoutPrintout: public wxPrintout

user/wxLayout/wxlparser.cpp

@@ -1,7 +1,7 @@
 /*-*- 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$
  *******************************************************************/
@@ -11,7 +11,7 @@
 #endif
 
 //#include "Mpch.h"
-#ifdef M_BASEDIR
+#ifdef M_PREFIX
 #   include "gui/wxllist.h"
 #   include "gui/wxlparser.h"
 #else
@@ -21,18 +21,18 @@
 
 #define   BASE_SIZE 12
 
-inline static bool IsEndOfLine(const char *p)
+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
-#ifdef OS_WIN
-      ((*p == '\r') && (*(p + 1) == '\n')) ||
-#endif
-      (*p == '\n');
+      ((mode & WXLO_EXPORT_WITH_MASK) == WXLO_EXPORT_WITH_CRLF) ?
+      ((*p == '\r') && (*(p + 1) == '\n')) 
+      :
+      (((*p == '\r') && (*(p + 1) == '\n'))||(*p == '\n'));
 }
 
-void wxLayoutImportText(wxLayoutList &list, String const &str)
+void wxLayoutImportText(wxLayoutList &list, String const &str, int withflag)
 {
    char * cptr = (char *)str.c_str(); // string gets changed only temporarily
    const char * begin = cptr;
@@ -41,7 +41,7 @@ void wxLayoutImportText(wxLayoutList &list, String const &str)
    for(;;)
    {
       begin = cptr;
-      while( *cptr && !IsEndOfLine(cptr) )
+      while( *cptr && !IsEndOfLine(cptr, withflag) )
          cptr++;
       backup = *cptr;
       *cptr = '\0';
@@ -49,7 +49,7 @@ void wxLayoutImportText(wxLayoutList &list, String const &str)
       *cptr = backup;
 
       // check if it's the end of this line
-      if ( IsEndOfLine(cptr) )
+      if ( IsEndOfLine(cptr, withflag) )
       {
          // if it was "\r\n", skip the following '\n'
          if ( *cptr == '\r' )
@@ -64,7 +64,7 @@ void wxLayoutImportText(wxLayoutList &list, String const &str)
 
 static
 String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
-                                 wxLayoutStyleInfo **lastStylePtr)
+                               wxLayoutStyleInfo **lastStylePtr)
 {
    static char buffer[20];
    String html;
@@ -152,13 +152,13 @@ String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
 #define   WXLO_IS_TEXT(type) \
 ( (type == WXLO_TYPE_TEXT || type == WXLO_TYPE_LINEBREAK) \
   || (type == WXLO_TYPE_CMD \
-      && mode == WXLO_EXPORT_AS_HTML))
+      && (mode & WXLO_EXPORT_AS_MASK) == WXLO_EXPORT_AS_HTML))
 
 
   
-   wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
-                                        wxLayoutList::iterator &from,
-                                        wxLayoutExportMode mode)
+wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+                                     wxLayoutList::iterator &from,
+                                     int mode)
 {
    if(from == list.end())
       return NULL;
@@ -168,7 +168,7 @@ String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
 
    static wxLayoutStyleInfo *s_si = NULL;
    
-   if( mode == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case
+   if( (mode & WXLO_EXPORT_AS_MASK) == WXLO_EXPORT_AS_OBJECTS || ! WXLO_IS_TEXT(type)) // simple case
    {
       export->type = WXLO_EXPORT_OBJECT;
       export->content.object = *from;
@@ -187,12 +187,15 @@ String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
          *str += ((wxLayoutObjectText *)*from)->GetText();
          break;
       case WXLO_TYPE_LINEBREAK:
-         if(mode == WXLO_EXPORT_AS_HTML)
+         if((mode & WXLO_EXPORT_AS_MASK) == WXLO_EXPORT_AS_HTML)
             *str += "<br>";
-         *str += '\n';
+         if((mode & WXLO_EXPORT_WITH_CRLF) == WXLO_EXPORT_WITH_CRLF)
+            *str += "\r\n";
+         else
+            *str += '\n';
          break;
       case WXLO_TYPE_CMD:
-         wxASSERT_MSG( mode == WXLO_EXPORT_AS_HTML,
+         wxASSERT_MSG( (mode&WXLO_EXPORT_AS_MASK) == WXLO_EXPORT_AS_HTML,
                        "reached cmd object in text mode" );
          
          *str += wxLayoutExportCmdAsHTML(*(wxLayoutObjectCmd const
@@ -205,7 +208,7 @@ String wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
       if(from != list.end())
          type = (*from)->GetType();
    }
-   export->type = (mode == WXLO_EXPORT_AS_HTML) ?  WXLO_EXPORT_HTML : WXLO_EXPORT_TEXT;
+   export->type = ((mode & WXLO_EXPORT_AS_MASK) == WXLO_EXPORT_AS_HTML) ?  WXLO_EXPORT_HTML : WXLO_EXPORT_TEXT;
    export->content.text = str;
    return export;
 }

user/wxLayout/wxlparser.h

@@ -25,10 +25,15 @@ enum wxLayoutExportType
 
 enum wxLayoutExportMode
 {
-   WXLO_EXPORT_AS_TEXT,
-   WXLO_EXPORT_AS_TEXT_AND_COMMANDS,
-   WXLO_EXPORT_AS_HTML,
-   WXLO_EXPORT_AS_OBJECTS
+   WXLO_EXPORT_AS_MASK = 0x0f,
+   WXLO_EXPORT_AS_TEXT = 0x00,
+   WXLO_EXPORT_AS_TEXT_AND_COMMANDS = 0x01,
+   WXLO_EXPORT_AS_HTML = 0x02,
+   WXLO_EXPORT_AS_OBJECTS = 0x03,
+   
+   WXLO_EXPORT_WITH_MASK = 0xf0,
+   WXLO_EXPORT_WITH_CRLF = 0x00,
+   WXLO_EXPORT_WITH_LF_ONLY = 0x10
 };
 
 struct wxLayoutExportObject
@@ -46,12 +51,22 @@ struct wxLayoutExportObject
       }
 };
 
+#ifdef OS_WIN
 /// import text into a wxLayoutList (including linefeeds):
-void wxLayoutImportText(wxLayoutList &list, String const &str);
-
+void wxLayoutImportText(wxLayoutList &list, String const &str,
+                        int withflag = WXLO_EXPORT_WITH_CRLF);
 
 wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
                                wxLayoutList::iterator &from,
-                               wxLayoutExportMode WXLO_EXPORT_AS_TEXT);
+                               int mode = WXLO_EXPORT_AS_TEXT|WXLO_EXPORT_WITH_CRLF); 
+#else
+/// import text into a wxLayoutList (including linefeeds):
+void wxLayoutImportText(wxLayoutList &list, String const &str,
+                        int withflag = WXLO_EXPORT_WITH_LF_ONLY);
+
+wxLayoutExportObject *wxLayoutExport(wxLayoutList &list,
+                               wxLayoutList::iterator &from,
+                               int mode = WXLO_EXPORT_AS_TEXT|WXLO_EXPORT_WITH_LF_ONLY); 
+#endif
 
 #endif //WXLPARSER_H

user/wxLayout/wxlwindow.h

@@ -42,6 +42,9 @@ public:
    */
    wxLayoutWindow(wxWindow *parent);
 
+   /// Destructor.
+   virtual ~wxLayoutWindow();
+   
    /* Returns a reference to the wxLayoutList object.
       @return the list
    */
@@ -54,14 +57,13 @@ public:
       {
          GetLayoutList().Clear(family,size,style,weight,underline,fg,bg);
          SetBackgroundColour( *GetLayoutList().GetDefaults()->GetBGColour());
-
+         Update();
          m_bDirty = FALSE;
       }
 
    // callbacks
    // NB: these functions are used as event handlers and must not be virtual
    void OnPaint(wxPaintEvent &event);
-   
    void OnLeftMouseClick(wxMouseEvent& event)
       { OnMouse(WXLOWIN_MENU_LCLICK, event); }
    void OnRightMouseClick(wxMouseEvent& event)
@@ -74,29 +76,42 @@ public:
 
    void EnablePopup(bool enable = true) { m_DoPopupMenu = enable; }
    /// gets called by either Update() or OnPaint()
-   void DoPaint(wxDC &dc);
+   void DoPaint(bool cursoronly = false);
 
 #ifdef __WXMSW__
    virtual long MSWGetDlgCode();
 #endif //MSW
 
-   void UpdateScrollbars(void);
-   void Print(void);
-   wxMenu * wxLayoutWindow::MakeFormatMenu(void);
+   /// if exact == false, assume 50% extra size for the future
+   void UpdateScrollbars(bool exact = false);  // don't change this to true!
+   void Print(wxDC &dc);
+   wxMenu * MakeFormatMenu(void);
 
    /// if the flag is true, we send events when user clicks on embedded objects
    inline void SetMouseTracking(bool doIt = true) { m_doSendEvents = doIt; }
 
-   virtual ~wxLayoutWindow() { if(m_PopupMenu) delete m_PopupMenu; }
-
    // dirty flag access
    bool IsDirty() const { return m_llist.IsDirty(); }
    void ResetDirty()    { m_llist.ResetDirty();     }
 
+   void OnSetFocus(wxFocusEvent &ev);
+   void OnKillFocus(wxFocusEvent &ev);
 protected:
+   /// Deletes from cursor to end of line.
+   void DeleteToEndOfLine(void);
+   /// Deletes everything left of cursor.
+   void DeleteToBeginOfLine(void);
+   /// Goto end of line.
+   void GotoEndOfLine(void);
+   /// Goto begin of line.
+   void GotoBeginOfLine(void);
+   /// Delete Line
+   void DeleteLine(void);
    /// generic function for mouse events processing
    void OnMouse(int eventId, wxMouseEvent& event);
-
+   /// scroll to cursor
+   void ScrollToCursor(void);
+   
    /// repaint if needed
    void Update(void);
 
@@ -107,8 +122,6 @@ protected:
    /// the layout list to be displayed
    wxLayoutList m_llist;
 
-   /// have we already set the scrollbars?
-   bool m_ScrollbarsSet;
    /// Where does the current view start?
    int m_ViewStartX; int m_ViewStartY;
    
@@ -119,7 +132,17 @@ protected:
    bool m_DoPopupMenu;
    /// the menu
    wxMenu * m_PopupMenu;
+   /// for derived classes, set when mouse is clicked
+   wxPoint m_ClickPosition;
+   /// for scrollbar calculations:
+   int m_maxx;
+   int m_maxy;
+   int m_lineHeight;
 private:
+   wxMemoryDC  *m_memDC;
+   wxBitmap    *m_bitmap;
+   wxPoint      m_bitmapSize;
+
    DECLARE_EVENT_TABLE()
 };