Added #define wxHelpController to help.h; added wxWinHelpController::Quit code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@97 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -900,11 +900,10 @@ class WXDLLEXPORT wxSysColourChangedEvent: public wxEvent
|
||||
{ m_eventType = wxEVT_SYS_COLOUR_CHANGED; }
|
||||
};
|
||||
|
||||
/* TODO, apart from events for individual controls...
|
||||
/* TODO
|
||||
wxEVT_POWER,
|
||||
wxEVT_CREATE,
|
||||
wxEVT_DESTROY,
|
||||
wxEVT_SHOW,
|
||||
wxEVT_MOUSE_CAPTURE_CHANGED,
|
||||
wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95)
|
||||
wxEVT_QUERY_NEW_PALETTE,
|
||||
|
@@ -9,5 +9,13 @@
|
||||
#include "wx/generic/helpxlp.h"
|
||||
#endif
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#define wxHelpController wxWinHelpController
|
||||
#elif defined(__GTK__)
|
||||
#define wxHelpController wxHTMLHelpController
|
||||
#else
|
||||
#define wxHelpController wxXLPHelpController
|
||||
#endif
|
||||
|
||||
#endif
|
||||
// __HELPH_BASE__
|
||||
|
@@ -32,7 +32,8 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
|
||||
// Must call this to set the filename and server name.
|
||||
// server is only required when implementing TCP/IP-based
|
||||
// help controllers.
|
||||
virtual bool Initialize(const wxString& file, int server = -1) = 0;
|
||||
virtual bool Initialize(const wxString& file, int server) { return FALSE; };
|
||||
virtual bool Initialize(const wxString& file) = 0;
|
||||
|
||||
// If file is "", reloads file given in Initialize
|
||||
virtual bool LoadFile(const wxString& file = "") = 0;
|
||||
|
Reference in New Issue
Block a user