corrected CodeWarrior project target names and generated application names

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index c88745ae04036c0d1d234c132b86ca62f556a5fd..90544db7873fe7c4203604a909afb0b98bd81e50 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -72,7 +72,7 @@ public:
     // After the page is loaded, the method calls SetPage() to display it.
     // Note : you can also use path relative to previously loaded page
     // Return value : same as SetPage
-    bool LoadPage(const wxString& location);
+    virtual bool LoadPage(const wxString& location);
 
     // Returns full location of opened page
     wxString GetOpenedPage() const {return m_OpenedPage;}
@@ -133,7 +133,10 @@ public:
     // Adds HTML processor to this instance of wxHtmlWindow:
     void AddProcessor(wxHtmlProcessor *processor);
     // Adds HTML processor to wxHtmlWindow class as whole:
-    static void AddSharedProcessor(wxHtmlProcessor *processor);
+    static void AddGlobalProcessor(wxHtmlProcessor *processor);
+
+    // what would we do with it?
+    virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
 
 protected:
     // Scrolls to anchor of this name. (Anchor is #news
@@ -212,7 +215,7 @@ private:
 
     // html processors array:
     wxHtmlProcessorList *m_Processors;
-    static wxHtmlProcessorList *m_SharedProcessors;
+    static wxHtmlProcessorList *m_GlobalProcessors;
 
     DECLARE_EVENT_TABLE()
 };