Partially functioning selections.

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

diff --git a/user/wxLayout/wxlparser.cpp b/user/wxLayout/wxlparser.cpp
index d9cfe9b3feb2a72130831f6d04f437f4467d0dfd..804805cd6002fb2d540f69f65ae7df8ea67ddf77 100644 (file)
--- a/user/wxLayout/wxlparser.cpp
+++ b/user/wxLayout/wxlparser.cpp
@@ -148,13 +148,36 @@ wxString wxLayoutExportCmdAsHTML(wxLayoutObjectCmd const & cmd,
 
 
 
 
 
 

+wxLayoutExportStatus::wxLayoutExportStatus(wxLayoutList *list,
+                                           wxPoint fromPos,
+                                           wxPoint toPos)
+{
+   list->GetDefaults()->GetStyle(&m_si);
+   m_line = list->GetFirstLine();
+   m_iterator = m_line->GetFirstObject();
+   m_fromPos = fromPos;
+   m_toPos = toPos;
+
+   if(m_fromPos != wxLayoutExportNoPosition)
+   {
+      while(m_line && (*m_line)->GetLineNumber() != m_fromPos.y)
+         m_line->GetNextLine();
+      wxASSERT(m_line);
+      m_iterator = (**i).FindObject(fromPos.x);
+   }
+}
+   
+
+

 #define   WXLO_IS_TEXT(type) \
 ( type == WXLO_TYPE_TEXT \
   || (type == WXLO_TYPE_CMD \
       && mode == WXLO_EXPORT_AS_HTML))
 
 
 #define   WXLO_IS_TEXT(type) \
 ( type == WXLO_TYPE_TEXT \
   || (type == WXLO_TYPE_CMD \
       && mode == WXLO_EXPORT_AS_HTML))
 
 

-  
+
+extern const wxPoint wxLayoutExportNoPosition = wxPoint(-1,-1);
+

 wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
                                      int mode, int flags)
 {
 wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
                                      int mode, int flags)
 {


@@ -197,7 +220,6 @@ wxLayoutExportObject *wxLayoutExport(wxLayoutExportStatus *status,
 
    wxString *str = new wxString();
    // text must be concatenated
 
    wxString *str = new wxString();
    // text must be concatenated

-   int testf = WXLO_EXPORT_WITH_CRLF;

    for(;;)
    {
       while(status->m_iterator == NULLIT)
    for(;;)
    {
       while(status->m_iterator == NULLIT)