X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9749497156909657d17ef972857caaca4bd09da2..ff69a290d6752557193611642ee2c1f810fc6415:/include/wx/html/winpars.h diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h index fee91731c2..69f81a56a1 100644 --- a/include/wx/html/winpars.h +++ b/include/wx/html/winpars.h @@ -49,7 +49,7 @@ 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) + virtual void SetDC(wxDC *dc, double pixel_scale = 1.0) { m_DC = dc; m_PixelScale = pixel_scale; } wxDC *GetDC() {return m_DC;} @@ -61,13 +61,13 @@ public: // height/width. They return h/w of default font // for this DC. If you want actual values, call // GetDC()->GetChar...() - + // returns associated wxWindow wxWindow *GetWindow() {return m_Window;} // sets fonts to be used when displaying HTML page. void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes); - + // Adds tags module. see wxHtmlTagsModule for details. static void AddModule(wxHtmlTagsModule *module); @@ -123,11 +123,13 @@ public: virtual wxFont* CreateCurrentFont(); protected: - virtual void AddText(const char *txt); + virtual void AddText(const wxChar* txt); private: bool m_tmpLastWasSpace; - // temporary variable used by AddText + wxChar *m_tmpStrBuf; + size_t m_tmpStrBufSize; + // temporary variables used by AddText wxWindow *m_Window; // window we're parsing for double m_PixelScale; @@ -234,3 +236,4 @@ public: +