Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
building a DLL.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-09-13 05:27:36 +00:00
parent e6a5dc94a4
commit f42b1601d6
7 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/html/helpctrl.h
View File

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

6
include/wx/html/helpdata.h
View File

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

2
include/wx/html/helpfrm.h
View File

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

2
src/html/helpctrl.cpp
View File

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

2
src/html/helpdata.cpp
View File

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

2
src/html/mod_image.cpp
View File

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

2
src/html/mod_links.cpp
View File

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