]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 26ffe1f)
Fixed Windows DLL link problems with wxHtmlProcessor
authorKendall Bennett <KendallB@scitechsoft.com>
Thu, 3 May 2001 20:34:23 +0000 (20:34 +0000)
committerKendall Bennett <KendallB@scitechsoft.com>
Thu, 3 May 2001 20:34:23 +0000 (20:34 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/html/htmlwin.h patch | blob | blame | history
src/html/htmlwin.cpp patch | blob | blame | history

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 2c8ebf7763f5ca966e40ef940bdf75b719a70c13..c88745ae04036c0d1d234c132b86ca62f556a5fd 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -27,8 +27,7 @@
 #include "wx/filesys.h"
 #include "wx/html/htmlfilt.h"
 
-class WXDLLEXPORT wxHtmlProcessor;
-
+class wxHtmlProcessor;
 class wxHtmlWinModule;
 class wxHtmlHistoryArray;
 class wxHtmlProcessorList;
@@ -52,7 +51,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
 public:
     wxHtmlWindow() : wxScrolledWindow() {};
     wxHtmlWindow(wxWindow *parent, wxWindowID id = -1,
-                 const wxPoint& pos = wxDefaultPosition, 
+                 const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHW_SCROLLBAR_AUTO,
                  const wxString& name = "htmlWindow");
@@ -130,7 +129,7 @@ public:
 
     // Returns a pointer to the parser.
     wxHtmlWinParser *GetParser() const { return m_Parser; }
-    
+
     // Adds HTML processor to this instance of wxHtmlWindow:
     void AddProcessor(wxHtmlProcessor *processor);
     // Adds HTML processor to wxHtmlWindow class as whole:
@@ -143,7 +142,7 @@ protected:
     // Return value : TRUE if anchor exists, FALSE otherwise
     bool ScrollToAnchor(const wxString& anchor);
 
-    // Prepares layout (= fill m_PosX, m_PosY for fragments) based on 
+    // Prepares layout (= fill m_PosX, m_PosY for fragments) based on
     // actual size of window. This method also setup scrollbars
     void CreateLayout();
 
@@ -210,10 +209,10 @@ private:
     int m_HistoryPos;
     // if this FLAG is false, items are not added to history
     bool m_HistoryOn;
-    
+
     // html processors array:
     wxHtmlProcessorList *m_Processors;
-    static wxHtmlProcessorList *m_SharedProcessors;    
+    static wxHtmlProcessorList *m_SharedProcessors;
 
     DECLARE_EVENT_TABLE()
 };
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 1d84af92a4ffd103a9b6fd586d2b5244f96cf253..7f5fe924d2201b239749fa13932dda6ff16a15ec 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -130,7 +130,7 @@ void wxHtmlWindow::SetFonts(wxString normal_face, wxString fixed_face, const int
 
     m_Parser->SetFonts(normal_face, fixed_face, sizes);
     // fonts changed => contents invalid, so reload the page:
-    SetPage(wxT("<html><body></body></html>")); 
+    SetPage(wxT("<html><body></body></html>"));
     if (!op.IsEmpty()) LoadPage(op);
 }
 
@@ -182,7 +182,7 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     m_Cell->SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
     m_Cell->SetAlignHor(wxHTML_ALIGN_CENTER);
     CreateLayout();
-    if (m_tmpCanDrawLocks == 0) 
+    if (m_tmpCanDrawLocks == 0)
         Refresh();
     return TRUE;
 }
@@ -409,7 +409,7 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
     m_Borders = cfg->Read(wxT("wxHtmlWindow/Borders"), m_Borders);
     p_fff = cfg->Read(wxT("wxHtmlWindow/FontFaceFixed"), m_Parser->m_FontFaceFixed);
     p_ffn = cfg->Read(wxT("wxHtmlWindow/FontFaceNormal"), m_Parser->m_FontFaceNormal);
-    for (int i = 0; i < 7; i++) 
+    for (int i = 0; i < 7; i++)
     {
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
         p_fontsizes[i] = cfg->Read(tmp, m_Parser->m_FontsSizes[i]);
@@ -436,7 +436,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
     cfg->Write(wxT("wxHtmlWindow/Borders"), (long) m_Borders);
     cfg->Write(wxT("wxHtmlWindow/FontFaceFixed"), m_Parser->m_FontFaceFixed);
     cfg->Write(wxT("wxHtmlWindow/FontFaceNormal"), m_Parser->m_FontFaceNormal);
-    for (int i = 0; i < 7; i++) 
+    for (int i = 0; i < 7; i++)
     {
         tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
         cfg->Write(tmp, (long) m_Parser->m_FontsSizes[i]);
@@ -529,10 +529,10 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
         m_Processors->DeleteContents(TRUE);
     }
     wxHtmlProcessorList::Node *node;
-    
+
     for (node = m_Processors->GetFirst(); node; node = node->GetNext())
     {
-        if (processor->GetPriority() > node->GetData()->GetPriority()) 
+        if (processor->GetPriority() > node->GetData()->GetPriority())
         {
             m_Processors->Insert(node, processor);
             break;
@@ -548,10 +548,10 @@ void wxHtmlWindow::AddProcessor(wxHtmlProcessor *processor)
         m_SharedProcessors->DeleteContents(TRUE);
     }
     wxHtmlProcessorList::Node *node;
-    
+
     for (node = m_SharedProcessors->GetFirst(); node; node = node->GetNext())
     {
-        if (processor->GetPriority() > node->GetData()->GetPriority()) 
+        if (processor->GetPriority() > node->GetData()->GetPriority())
         {
             m_SharedProcessors->Insert(node, processor);
             break;
@@ -573,10 +573,10 @@ void wxHtmlWindow::CleanUpStatics()
     m_DefaultFilter = NULL;
     m_Filters.DeleteContents(TRUE);
     m_Filters.Clear();
-    
+
     delete m_SharedProcessors;
     m_SharedProcessors = NULL;
-    
+
     delete s_cur_hand;
     delete s_cur_arrow;
 }
@@ -696,7 +696,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& WXUNUSED(event))
 }
 
 
-
+IMPLEMENT_ABSTRACT_CLASS(wxHtmlProcessor,wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindow,wxScrolledWindow)
 
wxWidgets (Impactor)