fix for HP and IBM compilers, calls to static template functions must be qualified

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

diff --git a/src/richtext/richtextbuffer.cpp b/src/richtext/richtextbuffer.cpp
index 40c6c9e7b795e55d0f1575f42c87f35122bdb256..d68e8fc61f1e3ac0076e2949fb9b9a9958b490e3 100644 (file)
--- a/src/richtext/richtextbuffer.cpp
+++ b/src/richtext/richtextbuffer.cpp
@@ -688,6 +688,7 @@ void wxRichTextParagraphLayoutBox::Copy(const wxRichTextParagraphLayoutBox& obj)
     wxRichTextBox::Copy(obj);
 
     m_partialParagraph = obj.m_partialParagraph;
     wxRichTextBox::Copy(obj);
 
     m_partialParagraph = obj.m_partialParagraph;

+    m_defaultAttributes = obj.m_defaultAttributes;

 }
 
 /// Get/set the size for the given range.
 }
 
 /// Get/set the size for the given range.


@@ -8170,18 +8171,6 @@ bool wxRichTextImageBlock::Load(wxImage& image)
     return success;
 }
 
     return success;
 }
 

-// Array used in DecToHex conversion routine.
-static char hexArray[] = "0123456789ABCDEF";
-
-// Convert decimal integer to 2-character hex string
-inline void wxRichTextDecToHex(int dec, char* buf)
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = hexArray[firstDigit];
-    buf[1] = hexArray[secondDigit];
-}
-

 // Write data in hex to a stream
 bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
 {
 // Write data in hex to a stream
 bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
 {


@@ -8205,7 +8194,7 @@ bool wxRichTextImageBlock::WriteHex(wxOutputStream& stream)
         char* b = buf;
         for (i = 0; i < (n/2); i++)
         {
         char* b = buf;
         for (i = 0; i < (n/2); i++)
         {

-            wxRichTextDecToHex(m_data[j], b);
+            wxDecToHex(m_data[j], b, b+1);

             b += 2; j ++;
         }
 
             b += 2; j ++;
         }