Upported combobox changes and another fix.

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index cbda2b6ad3c80c32fbe3a0e25b01578ea1b6ee56..f26cb3c7238564eeb549fdc9469f889a44dfef4d 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLWIN_H_
 #define _WX_HTMLWIN_H_
 
 #ifndef _WX_HTMLWIN_H_
 #define _WX_HTMLWIN_H_
 

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

 #pragma interface "htmlwin.h"
 #endif
 
 #pragma interface "htmlwin.h"
 #endif
 


@@ -26,6 +26,7 @@
 #include "wx/html/htmlcell.h"
 #include "wx/filesys.h"
 #include "wx/html/htmlfilt.h"
 #include "wx/html/htmlcell.h"
 #include "wx/filesys.h"
 #include "wx/html/htmlfilt.h"

+#include "wx/filename.h"

 
 class wxHtmlProcessor;
 class wxHtmlWinModule;
 
 class wxHtmlProcessor;
 class wxHtmlWinModule;


@@ -85,7 +86,7 @@ public:
     // specify document location, use LoadPage() istead
     // Return value : FALSE if an error occured, TRUE otherwise
     bool SetPage(const wxString& source);
     // specify document location, use LoadPage() istead
     // Return value : FALSE if an error occured, TRUE otherwise
     bool SetPage(const wxString& source);

-    
+

     // Append to current page
     bool AppendToPage(const wxString& source);
 
     // Append to current page
     bool AppendToPage(const wxString& source);
 


@@ -100,6 +101,9 @@ public:
     // Return value : same as SetPage
     virtual bool LoadPage(const wxString& location);
 
     // Return value : same as SetPage
     virtual bool LoadPage(const wxString& location);
 

+    // Loads HTML page from file
+    bool LoadFile(const wxFileName& filename);
+

     // Returns full location of opened page
     wxString GetOpenedPage() const {return m_OpenedPage;}
     // Returns anchor within opened page
     // Returns full location of opened page
     wxString GetOpenedPage() const {return m_OpenedPage;}
     // Returns anchor within opened page


@@ -175,14 +179,14 @@ public:
     // Called when user clicked on hypertext link. Default behavior is to
     // call LoadPage(loc)
     virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
     // Called when user clicked on hypertext link. Default behavior is to
     // call LoadPage(loc)
     virtual void OnLinkClicked(const wxHtmlLinkInfo& link);

-    
-    // Called when wxHtmlWindow wants to fetch data from an URL (e.g. when 
-    // loading a page or loading an image). The data are downloaded if and only if 
+
+    // Called when wxHtmlWindow wants to fetch data from an URL (e.g. when
+    // loading a page or loading an image). The data are downloaded if and only if

     // OnOpeningURL returns TRUE. If OnOpeningURL returns wxHTML_REDIRECT,
     // it must set *redirect to the new URL
     // OnOpeningURL returns TRUE. If OnOpeningURL returns wxHTML_REDIRECT,
     // it must set *redirect to the new URL

-    virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
-                                             const wxString& url,
-                                             wxString *redirect) const 
+    virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType WXUNUSED(type),
+                                             const wxString& WXUNUSED(url),
+                                             wxString *WXUNUSED(redirect)) const

         { return wxHTML_OPEN; }
 
 protected:
         { return wxHTML_OPEN; }
 
 protected:


@@ -269,6 +273,7 @@ private:
     static wxHtmlProcessorList *m_GlobalProcessors;
 
     DECLARE_EVENT_TABLE()
     static wxHtmlProcessorList *m_GlobalProcessors;
 
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxHtmlWindow)

 };
 
 
 };