Improve composite flags handling in the property grid wxFlagsProperty.

[wxWidgets.git] / src / richtext / richtextbuffer.cpp

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index b15c5c5f494a80fc7aeb8ce90c162d3b39773f0f..230a8a4731b8de220223312a1a8479e3af557121 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-09-30
 // Author:      Julian Smart
 // Modified by:
 // Created:     2005-09-30

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -7447,7 +7446,10 @@ bool wxRichTextParagraphLayoutBox::InsertParagraphsWithUndo(wxRichTextBuffer* bu
 /// Submit command to insert the given text
 bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
 {
 /// Submit command to insert the given text
 bool wxRichTextBuffer::InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags)
 {

-    return ctrl->GetFocusObject()->InsertTextWithUndo(this, pos, text, ctrl, flags);
+    if (ctrl)
+        return ctrl->GetFocusObject()->InsertTextWithUndo(this, pos, text, ctrl, flags);
+    else
+        return wxRichTextParagraphLayoutBox::InsertTextWithUndo(this, pos, text, ctrl, flags);

 }
 
 /// Submit command to insert the given text
 }
 
 /// Submit command to insert the given text


@@ -8317,6 +8319,7 @@ wxString wxRichTextBuffer::GetExtWildcard(bool combine, bool save, wxArrayInt* t
     return wildcard;
 }
 
     return wildcard;
 }
 

+#if wxUSE_FFILE && wxUSE_STREAMS

 /// Load a file
 bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type)
 {
 /// Load a file
 bool wxRichTextBuffer::LoadFile(const wxString& filename, wxRichTextFileType type)
 {


@@ -8345,7 +8348,9 @@ bool wxRichTextBuffer::SaveFile(const wxString& filename, wxRichTextFileType typ
     else
         return false;
 }
     else
         return false;
 }

+#endif // wxUSE_FFILE && wxUSE_STREAMS

 
 

+#if wxUSE_STREAMS

 /// Load from a stream
 bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type)
 {
 /// Load from a stream
 bool wxRichTextBuffer::LoadFile(wxInputStream& stream, wxRichTextFileType type)
 {


@@ -8374,6 +8379,7 @@ bool wxRichTextBuffer::SaveFile(wxOutputStream& stream, wxRichTextFileType type)
     else
         return false;
 }
     else
         return false;
 }

+#endif // wxUSE_STREAMS

 
 /// Copy the range to the clipboard
 bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)
 
 /// Copy the range to the clipboard
 bool wxRichTextBuffer::CopyToClipboard(const wxRichTextRange& range)


@@ -9397,7 +9403,8 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
     const int colCount = table->GetColumnCount();
     wxArrayInt rowTops;
     rowTops.Add(0, rowCount+1);
     const int colCount = table->GetColumnCount();
     wxArrayInt rowTops;
     rowTops.Add(0, rowCount+1);

-    for (int row = 0; row < rowCount; ++row)
+    int row;
+    for (row = 0; row < rowCount; ++row)

     {
         for (int column = 0; column < colCount; ++column)
         {
     {
         for (int column = 0; column < colCount; ++column)
         {


@@ -9413,10 +9420,9 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
     
     bool needsRelay = false;
 
     
     bool needsRelay = false;
 

-    int row, col;

     for (row = 0; row < rowCount-1; ++row) // -1 as the bottom row can't rowspan
     {
     for (row = 0; row < rowCount-1; ++row) // -1 as the bottom row can't rowspan
     {

-        for (col = 0; col < colCount; ++col)
+        for (int col = 0; col < colCount; ++col)

         {
             wxRichTextCell* cell = table->GetCell(row, col);
             if (cell && cell->IsShown())
         {
             wxRichTextCell* cell = table->GetCell(row, col);
             if (cell && cell->IsShown())


@@ -9473,7 +9479,7 @@ void ExpandCellsWithRowspan(const wxRichTextTable* table, int paddingY, int& bot
     // There were overflowing rowspanning cells, so layout yet again to make the increased row depths show
     for (row = 0; row < rowCount; ++row)
     {
     // There were overflowing rowspanning cells, so layout yet again to make the increased row depths show
     for (row = 0; row < rowCount; ++row)
     {

-        for (col = 0; col < colCount; ++col)
+        for (int col = 0; col < colCount; ++col)

         {
             wxRichTextCell* cell = table->GetCell(row, col);
             if (cell && cell->IsShown())
         {
             wxRichTextCell* cell = table->GetCell(row, col);
             if (cell && cell->IsShown())


@@ -9517,12 +9523,13 @@ bool wxRichTextTable::Layout(wxDC& dc, wxRichTextDrawingContext& context, const
     wxRichTextAttr attr(GetAttributes());
     context.ApplyVirtualAttributes(attr, this);
 
     wxRichTextAttr attr(GetAttributes());
     context.ApplyVirtualAttributes(attr, this);
 

+    bool tableHasPercentWidth = (attr.GetTextBoxAttr().GetWidth().GetUnits() == wxTEXT_ATTR_UNITS_PERCENTAGE);

     // If we have no fixed table size, and assuming we're not pushed for
     // space, then we don't have to try to stretch the table to fit the contents.
     // If we have no fixed table size, and assuming we're not pushed for
     // space, then we don't have to try to stretch the table to fit the contents.

-    bool stretchToFitTableWidth = false;
-
+    bool stretchToFitTableWidth = tableHasPercentWidth;
+    

     int tableWidth = rect.width;
     int tableWidth = rect.width;

-    if (attr.GetTextBoxAttr().GetWidth().IsValid())
+    if (attr.GetTextBoxAttr().GetWidth().IsValid() && !tableHasPercentWidth)

     {
         tableWidth = converter.GetPixels(attr.GetTextBoxAttr().GetWidth());
 
     {
         tableWidth = converter.GetPixels(attr.GetTextBoxAttr().GetWidth());