Fix reentrancy in wxDataViewRendererBase::FinishEditing().

[wxWidgets.git] / include / wx / html / winpars.h

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 8f554ce8c22baefe6e672ee67e4234d79e0a20b4..75f4da2d7fad369bd5c0da81de54394d7fc55a23 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        winpars.h
+// Name:        wx/html/winpars.h

 // Purpose:     wxHtmlWinParser class (parser to be used with wxHtmlWindow)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Purpose:     wxHtmlWinParser class (parser to be used with wxHtmlWindow)
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$


@@ -52,7 +52,8 @@ public:
     // Set's the DC used for parsing. If SetDC() is not called,
     // parsing won't proceed
     virtual void SetDC(wxDC *dc, double pixel_scale = 1.0)
     // Set's the DC used for parsing. If SetDC() is not called,
     // parsing won't proceed
     virtual void SetDC(wxDC *dc, double pixel_scale = 1.0)

-        { m_DC = dc; m_PixelScale = pixel_scale; }
+        { SetDC(dc, pixel_scale, pixel_scale); }
+    void SetDC(wxDC *dc, double pixel_scale, double font_scale);

 
     wxDC *GetDC() {return m_DC;}
     double GetPixelScale() {return m_PixelScale;}
 
     wxDC *GetDC() {return m_DC;}
     double GetPixelScale() {return m_PixelScale;}


@@ -106,6 +107,8 @@ public:
 
     int GetFontSize() const {return m_FontSize;}
     void SetFontSize(int s);
 
     int GetFontSize() const {return m_FontSize;}
     void SetFontSize(int s);

+    // Try to map a font size in points to the HTML 1-7 font size range.
+    void SetFontPointSize(int pt);

     int GetFontBold() const {return m_FontBold;}
     void SetFontBold(int x) {m_FontBold = x;}
     int GetFontItalic() const {return m_FontItalic;}
     int GetFontBold() const {return m_FontBold;}
     void SetFontBold(int x) {m_FontBold = x;}
     int GetFontItalic() const {return m_FontItalic;}


@@ -145,11 +148,25 @@ public:
     // creates font depending on m_Font* members.
     virtual wxFont* CreateCurrentFont();
 
     // creates font depending on m_Font* members.
     virtual wxFont* CreateCurrentFont();
 

+    enum WhitespaceMode
+    {
+        Whitespace_Normal,  // normal mode, collapse whitespace
+        Whitespace_Pre      // inside <pre>, keep whitespace as-is
+    };
+
+    // change the current whitespace handling mode
+    void SetWhitespaceMode(WhitespaceMode mode) { m_whitespaceMode = mode; }
+    WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; }
+

 protected:
     virtual void AddText(const wxString& txt);
 
 private:
 protected:
     virtual void AddText(const wxString& txt);
 
 private:

-    void DoAddText(wxChar *temp, int& templen);
+    void FlushWordBuf(wxChar *temp, int& len);
+    void AddWord(wxHtmlWordCell *word);
+    void AddWord(const wxString& word)
+        { AddWord(new wxHtmlWordCell(word, *(GetDC()))); }
+    void AddPreBlock(const wxString& text);

 
     bool m_tmpLastWasSpace;
     wxChar *m_tmpStrBuf;
 
     bool m_tmpLastWasSpace;
     wxChar *m_tmpStrBuf;


@@ -157,7 +174,7 @@ private:
         // temporary variables used by AddText
     wxHtmlWindowInterface *m_windowInterface;
             // window we're parsing for
         // temporary variables used by AddText
     wxHtmlWindowInterface *m_windowInterface;
             // window we're parsing for

-    double m_PixelScale;
+    double m_PixelScale, m_FontScale;

     wxDC *m_DC;
             // Device Context we're parsing for
     static wxList m_Modules;
     wxDC *m_DC;
             // Device Context we're parsing for
     static wxList m_Modules;


@@ -207,9 +224,16 @@ private:
     wxEncodingConverter *m_EncConv;
 #endif
 
     wxEncodingConverter *m_EncConv;
 #endif
 

+    // current whitespace handling mode
+    WhitespaceMode m_whitespaceMode;
+

     wxHtmlWordCell *m_lastWordCell;
 
     wxHtmlWordCell *m_lastWordCell;
 

-    DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
+    // current position on line, in num. of characters; used to properly
+    // expand TABs; only updated while inside <pre>
+    int m_posColumn;
+
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinParser);

 };
 
 
 };
 
 


@@ -236,7 +260,7 @@ public:
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
 
 protected:
     wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
 

-    DECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);

 };
 
 
 };