tons of fixes for wxGTK/Univ - seems to work, more or less, now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,13 +17,14 @@
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
|
||||
#if wxUSE_HELP
|
||||
|
||||
#include "wx/object.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/gdicmn.h"
|
||||
#include "wx/frame.h"
|
||||
|
||||
#if wxUSE_HELP
|
||||
|
||||
// Flags for SetViewer
|
||||
#define wxHELP_NETSCAPE 1
|
||||
|
||||
@@ -31,20 +32,20 @@
|
||||
class WXDLLEXPORT wxHelpControllerBase: public wxObject
|
||||
{
|
||||
DECLARE_CLASS(wxHelpControllerBase)
|
||||
|
||||
|
||||
public:
|
||||
inline wxHelpControllerBase() {}
|
||||
inline ~wxHelpControllerBase() {};
|
||||
|
||||
|
||||
// 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& WXUNUSED(file), int WXUNUSED(server) ) { return FALSE; }
|
||||
virtual bool Initialize(const wxString& WXUNUSED(file)) { return FALSE; }
|
||||
|
||||
|
||||
// Set viewer: only relevant to some kinds of controller
|
||||
virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {}
|
||||
|
||||
|
||||
// If file is "", reloads file given in Initialize
|
||||
virtual bool LoadFile(const wxString& file = "") = 0;
|
||||
|
||||
@@ -73,7 +74,7 @@ public:
|
||||
{
|
||||
// does nothing by default
|
||||
}
|
||||
/// Obtains the latest settings used by the help frame and the help
|
||||
/// Obtains the latest settings used by the help frame and the help
|
||||
/// frame.
|
||||
virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL,
|
||||
wxPoint *WXUNUSED(pos) = NULL,
|
||||
@@ -81,11 +82,12 @@ public:
|
||||
{
|
||||
return (wxFrame*) NULL;// does nothing by default
|
||||
}
|
||||
|
||||
|
||||
virtual bool Quit(void) = 0;
|
||||
virtual void OnQuit(void) {};
|
||||
};
|
||||
|
||||
#endif // wxUSE_HELP
|
||||
|
||||
#endif
|
||||
// _WX_HELPBASEH__
|
||||
|
Reference in New Issue
Block a user