always let the multiline text control process the Enter key presses

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

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index fee91731c254ac9217c9894699351a9db956db6c..4ce8afd0f76eb172fd200297afca3d3c13871c4f 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -24,6 +24,7 @@
 #include "wx/html/htmlcell.h"
 #include "wx/encconv.h"
 
 #include "wx/html/htmlcell.h"
 #include "wx/encconv.h"
 

+class WXDLLEXPORT wxHtmlWindow;

 class WXDLLEXPORT wxHtmlWinParser;
 class WXDLLEXPORT wxHtmlWinTagHandler;
 class WXDLLEXPORT wxHtmlTagsModule;
 class WXDLLEXPORT wxHtmlWinParser;
 class WXDLLEXPORT wxHtmlWinTagHandler;
 class WXDLLEXPORT wxHtmlTagsModule;


@@ -40,16 +41,18 @@ class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser
     friend class wxHtmlWindow;
 
 public:
     friend class wxHtmlWindow;
 
 public:

-    wxHtmlWinParser(wxWindow *wnd = NULL);
+    wxHtmlWinParser(wxHtmlWindow *wnd = NULL);

     ~wxHtmlWinParser();
 
     virtual void InitParser(const wxString& source);
     virtual void DoneParser();
     virtual wxObject* GetProduct();
 
     ~wxHtmlWinParser();
 
     virtual void InitParser(const wxString& source);
     virtual void DoneParser();
     virtual wxObject* GetProduct();
 

+    virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const;
+

     // Set's the DC used for parsing. If SetDC() is not called,
     // parsing won't proceed
     // 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;}
         { m_DC = dc; m_PixelScale = pixel_scale; }
 
     wxDC *GetDC() {return m_DC;}


@@ -61,13 +64,13 @@ public:
     // height/width. They return h/w of default font
     // for this DC. If you want actual values, call
     // GetDC()->GetChar...()
     // height/width. They return h/w of default font
     // for this DC. If you want actual values, call
     // GetDC()->GetChar...()

- 
+

     // returns associated wxWindow
     // returns associated wxWindow

-    wxWindow *GetWindow() {return m_Window;}
+    wxHtmlWindow *GetWindow() {return m_Window;}

 
     // sets fonts to be used when displaying HTML page.
     void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes);
 
     // 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);
 
     // Adds tags module. see wxHtmlTagsModule for details.
     static void AddModule(wxHtmlTagsModule *module);
 


@@ -123,12 +126,14 @@ public:
     virtual wxFont* CreateCurrentFont();
 
 protected:
     virtual wxFont* CreateCurrentFont();
 
 protected:

-    virtual void AddText(const char *txt);
+    virtual void AddText(const wxChar* txt);

 
 private:
     bool m_tmpLastWasSpace;
 
 private:
     bool m_tmpLastWasSpace;

-        // temporary variable used by AddText
-    wxWindow *m_Window;
+    wxChar *m_tmpStrBuf;
+    size_t  m_tmpStrBufSize;
+        // temporary variables used by AddText
+    wxHtmlWindow *m_Window;

             // window we're parsing for
     double m_PixelScale;
     wxDC *m_DC;
             // window we're parsing for
     double m_PixelScale;
     wxDC *m_DC;


@@ -234,3 +239,4 @@ public:
 
 
 
 
 
 

+