added wxART_MISSING_IMAGE

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

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 1b6b02a6d67ec1d2e3b6679e6918353528ac82d7..d2dd34023017be9edae097669177ff217ddc0ac7 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -11,7 +11,7 @@
 #ifndef _WX_WINPARS_H_
 #define _WX_WINPARS_H_
 
 #ifndef _WX_WINPARS_H_
 #define _WX_WINPARS_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "winpars.h"
 #endif
 
 #pragma interface "winpars.h"
 #endif
 


@@ -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);
 


@@ -114,10 +117,12 @@ public:
     const wxHtmlLinkInfo& GetLink() const { return m_Link; }
     void SetLink(const wxHtmlLinkInfo& link);
 
     const wxHtmlLinkInfo& GetLink() const { return m_Link; }
     void SetLink(const wxHtmlLinkInfo& link);
 

+#if !wxUSE_UNICODE

     void SetInputEncoding(wxFontEncoding enc);
     wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
     wxFontEncoding GetOutputEncoding() const { return m_OutputEnc; }
     wxEncodingConverter *GetEncodingConverter() const { return m_EncConv; }
     void SetInputEncoding(wxFontEncoding enc);
     wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
     wxFontEncoding GetOutputEncoding() const { return m_OutputEnc; }
     wxEncodingConverter *GetEncodingConverter() const { return m_EncConv; }

+#endif

 
     // creates font depending on m_Font* members.
     virtual wxFont* CreateCurrentFont();
 
     // creates font depending on m_Font* members.
     virtual wxFont* CreateCurrentFont();


@@ -130,7 +135,7 @@ private:
     wxChar *m_tmpStrBuf;
     size_t  m_tmpStrBufSize;
         // temporary variables used by AddText
     wxChar *m_tmpStrBuf;
     size_t  m_tmpStrBufSize;
         // temporary variables used by AddText

-    wxWindow *m_Window;
+    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;


@@ -158,7 +163,9 @@ private:
 
     wxFont* m_FontsTable[2][2][2][2][7];
     wxString m_FontsFacesTable[2][2][2][2][7];
 
     wxFont* m_FontsTable[2][2][2][2][7];
     wxString m_FontsFacesTable[2][2][2][2][7];

+#if !wxUSE_UNICODE

     wxFontEncoding m_FontsEncTable[2][2][2][2][7];
     wxFontEncoding m_FontsEncTable[2][2][2][2][7];

+#endif

             // table of loaded fonts. 1st four indexes are 0 or 1, depending on on/off
             // state of these flags (from left to right):
             // [bold][italic][underlined][fixed_size]
             // table of loaded fonts. 1st four indexes are 0 or 1, depending on on/off
             // state of these flags (from left to right):
             // [bold][italic][underlined][fixed_size]


@@ -169,9 +176,13 @@ private:
     wxString m_FontFaceFixed, m_FontFaceNormal;
             // html font sizes and faces of fixed and proportional fonts
 
     wxString m_FontFaceFixed, m_FontFaceNormal;
             // html font sizes and faces of fixed and proportional fonts
 

+    DECLARE_NO_COPY_CLASS(wxHtmlWinParser)
+
+#if !wxUSE_UNICODE

     wxFontEncoding m_InputEnc, m_OutputEnc;
             // I/O font encodings
     wxEncodingConverter *m_EncConv;
     wxFontEncoding m_InputEnc, m_OutputEnc;
             // I/O font encodings
     wxEncodingConverter *m_EncConv;

+#endif

 };
 
 
 };
 
 


@@ -197,6 +208,8 @@ 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)

 };
 
 
 };
 
 


@@ -236,3 +249,4 @@ public:
 
 
 
 
 
 

+