added wxWindow::GetPopupMenuSelectionFromUser() (modified patch 1793823)

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

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 26780b540e94e4639147e5247cabe74a7a08c452..8f554ce8c22baefe6e672ee67e4234d79e0a20b4 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -19,11 +19,11 @@
 #include "wx/html/htmlcell.h"
 #include "wx/encconv.h"
 
-class WXDLLIMPEXP_HTML wxHtmlWindow;
-class WXDLLIMPEXP_HTML wxHtmlWindowInterface;
-class WXDLLIMPEXP_HTML wxHtmlWinParser;
-class WXDLLIMPEXP_HTML wxHtmlWinTagHandler;
-class WXDLLIMPEXP_HTML wxHtmlTagsModule;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
+class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler;
+class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
 
 
 //--------------------------------------------------------------------------------
@@ -149,7 +149,7 @@ protected:
     virtual void AddText(const wxString& txt);
 
 private:
-    void DoAddText(wxChar *temp, int& templen, wxChar nbsp);
+    void DoAddText(wxChar *temp, int& templen);
 
     bool m_tmpLastWasSpace;
     wxChar *m_tmpStrBuf;
@@ -201,6 +201,7 @@ private:
             // html font sizes and faces of fixed and proportional fonts
 
 #if !wxUSE_UNICODE
+    wxChar m_nbsp;
     wxFontEncoding m_InputEnc, m_OutputEnc;
             // I/O font encodings
     wxEncodingConverter *m_EncConv;