Fixed some compile errors (MSVC++ 6) and some very strange link errors when

building a DLL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/html/helpctrl.h

@@ -25,6 +25,8 @@
 
 class WXDLLEXPORT wxHtmlHelpController : public wxEvtHandler
 {
+    DECLARE_DYNAMIC_CLASS(wxHtmlHelpController)
+
 public:
     wxHtmlHelpController();
     virtual ~wxHtmlHelpController();

include/wx/html/helpdata.h

@@ -48,8 +48,8 @@ public:
      * (as opposed to appending only)
      * Note that storing index range is pointless, because the index is alphab. sorted. */
     void SetContentsRange(int start, int end) { contents_start = start; contents_end = end; }
-    GetContentsStart() const { return contents_start; }
-    GetContentsEnd() const { return contents_end; }
+    int GetContentsStart() const { return contents_start; }
+    int GetContentsEnd() const { return contents_end; }
 protected:
     wxString m_BasePath;
     wxString m_Title;
@@ -82,7 +82,7 @@ typedef struct
 //                  This class takes input streams and scans them for occurence
 //                  of keyword(s)
 //------------------------------------------------------------------------------
-class wxSearchEngine : public wxObject
+class WXDLLEXPORT wxSearchEngine : public wxObject
 {
 private:
     char *m_Keyword;

include/wx/html/helpfrm.h

@@ -153,7 +153,7 @@ protected:
     wxListBox *m_SearchList;
     wxChoice *m_SearchChoice;
 
-    struct {
+    struct WXDLLEXPORT _struct_Cfg {
 	long x, y, w, h;
 	long sashpos;
 	bool navig_on;

src/html/helpctrl.cpp

@@ -29,6 +29,8 @@
 #include "wx/wx.h"
 #include "wx/busyinfo.h"
 
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxEvtHandler)
+
 BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
     EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
 END_EVENT_TABLE()

src/html/helpdata.cpp

@@ -513,7 +513,7 @@ wxString wxHtmlHelpData::FindPageById(int id)
 //----------------------------------------------------------------------------------
 
 wxHtmlSearchStatus::wxHtmlSearchStatus(wxHtmlHelpData* data, const wxString& keyword,
-				       const wxString& book = wxEmptyString)
+				       const wxString& book)
 {
     m_Data = data;
     m_Keyword = keyword;

src/html/mod_image.cpp

@@ -26,7 +26,7 @@
 #include "wx/html/forcelink.h"
 #include "wx/html/mod_templ.h"
 
-#include "wx/wxhtml.h"
+
 #include "wx/image.h"
 #include "wx/dynarray.h"
 

src/html/mod_links.cpp

@@ -25,7 +25,7 @@
 
 #include <wx/html/forcelink.h>
 #include <wx/html/mod_templ.h>
-#include <wx/wxhtml.h>
+
 
 FORCE_LINK_ME(mod_links)