removed wxUSE_XPM_IN_MSW from setup0.h

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index c88745ae04036c0d1d234c132b86ca62f556a5fd..2bf22cd0cc8d5563f165f9340c45208eea7b1280 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -133,7 +133,7 @@ public:
     // Adds HTML processor to this instance of wxHtmlWindow:
     void AddProcessor(wxHtmlProcessor *processor);
     // Adds HTML processor to wxHtmlWindow class as whole:
     // 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);

 
 protected:
     // Scrolls to anchor of this name. (Anchor is #news
 
 protected:
     // Scrolls to anchor of this name. (Anchor is #news


@@ -212,7 +212,7 @@ private:
 
     // html processors array:
     wxHtmlProcessorList *m_Processors;
 
     // html processors array:
     wxHtmlProcessorList *m_Processors;

-    static wxHtmlProcessorList *m_SharedProcessors;
+    static wxHtmlProcessorList *m_GlobalProcessors;    

 
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };