a few more buglets

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

diff --git a/user/wxLayout/TODO b/user/wxLayout/TODO
index 428859cd9ec58938c3b8e32b276fa84885fd9502..36c27bcfce3f095470720da131936c18d94d16d9 100644 (file)
--- a/user/wxLayout/TODO
+++ b/user/wxLayout/TODO
@@ -17,8 +17,13 @@ TODO
 =====================================================================
 
 Inserting NL in empty line sometimes doesn't move cursor down.
 =====================================================================
 
 Inserting NL in empty line sometimes doesn't move cursor down.

+Line numbers go a bit berserk, too. :-)
+
+The following two probs can probably be fixed by adding the
+RecalculateLayout() method:
+ Funny re-layout shows again in sample text.
+ Printing works again, but layout at begin of new page is corrupted.

 
 

-Printing produces empty pages only.

 
 Selections:
   - moving in negative direction doesn't work
 
 Selections:
   - moving in negative direction doesn't work

diff --git a/user/wxLayout/wxLayout.cpp b/user/wxLayout/wxLayout.cpp
index 3fbeea93ac4a59b977f56221688590477a0e1629..42665629241b789b6322173d26a42510aae433ad 100644 (file)
--- a/user/wxLayout/wxLayout.cpp
+++ b/user/wxLayout/wxLayout.cpp
@@ -116,14 +116,12 @@ MyFrame::MyFrame(void) :
 void
 MyFrame::AddSampleText(wxLayoutList *llist)
 {
 void
 MyFrame::AddSampleText(wxLayoutList *llist)
 {

-#if 0

    llist->Clear(wxSWISS,16,wxNORMAL,wxNORMAL, false);
    llist->SetFont(-1,-1,-1,-1,-1,"blue");
    llist->Insert("blue");
    llist->SetFont(-1,-1,-1,-1,-1,"black");
    llist->Insert("The quick brown fox jumps over the lazy dog.");
    llist->LineBreak();
    llist->Clear(wxSWISS,16,wxNORMAL,wxNORMAL, false);
    llist->SetFont(-1,-1,-1,-1,-1,"blue");
    llist->Insert("blue");
    llist->SetFont(-1,-1,-1,-1,-1,"black");
    llist->Insert("The quick brown fox jumps over the lazy dog.");
    llist->LineBreak();

-#endif

    
    llist->SetFont(wxROMAN,16,wxNORMAL,wxNORMAL, false);
    llist->Insert("--");
    
    llist->SetFont(wxROMAN,16,wxNORMAL,wxNORMAL, false);
    llist->Insert("--");


@@ -152,7 +150,6 @@ MyFrame::AddSampleText(wxLayoutList *llist)
    llist->SetFont(-1,-1,wxNORMAL);
    llist->LineBreak();
 
    llist->SetFont(-1,-1,wxNORMAL);
    llist->LineBreak();
 

-#if 0

    llist->Insert("and ");
    llist->SetFont(-1,-1,wxSLANT);
    llist->Insert("slanted");
    llist->Insert("and ");
    llist->SetFont(-1,-1,wxSLANT);
    llist->Insert("slanted");


@@ -197,7 +194,6 @@ MyFrame::AddSampleText(wxLayoutList *llist)
          llist->LineBreak();
       }
    }
          llist->LineBreak();
       }
    }

-#endif

    llist->MoveCursorTo(wxPoint(0,0));
    m_lwin->SetDirty();
    m_lwin->Refresh();
    llist->MoveCursorTo(wxPoint(0,0));
    m_lwin->SetDirty();
    m_lwin->Refresh();

diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp
index f6c86e10e0d1a749086fabeead6cdf0da4039698..a56aad668dba31291d8c81179b69cd5dfd87997b 100644 (file)
--- a/user/wxLayout/wxllist.cpp
+++ b/user/wxLayout/wxllist.cpp
@@ -1410,6 +1410,7 @@ wxLayoutList::LineBreak(void)
       m_FirstLine = m_CursorLine->GetPreviousLine();
    m_CursorPos.y++;
    m_CursorPos.x = 0;
       m_FirstLine = m_CursorLine->GetPreviousLine();
    m_CursorPos.y++;
    m_CursorPos.x = 0;

+// doesn't help   m_CursorLine.MarkDirty();

    m_CursorLine->RecalculatePositions(true, this); //FIXME needed?
    return true;
 }
    m_CursorLine->RecalculatePositions(true, this); //FIXME needed?
    return true;
 }

diff --git a/user/wxLayout/wxllist.h b/user/wxLayout/wxllist.h
index 52c87053db3e94020bfb2ce1ea610cac2de1e5eb..a9cf311850f7bd06edaad384f286f7ef62e28711 100644 (file)
--- a/user/wxLayout/wxllist.h
+++ b/user/wxLayout/wxllist.h
@@ -606,6 +606,8 @@ public:
 
    /// Returns dirty state
    bool IsDirty(void) const { return m_Dirty; }
 
    /// Returns dirty state
    bool IsDirty(void) const { return m_Dirty; }

+   /// Marks line as diry.
+   void MarkDirty(void) { m_Dirty = true; }

 private:
    /// Destructor is private. Use DeleteLine() to remove it.
    ~wxLayoutLine();
 private:
    /// Destructor is private. Use DeleteLine() to remove it.
    ~wxLayoutLine();