projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SWIG patches to allow compiling the generated code with
[wxWidgets.git]
/
include
/
wx
/
msw
/
helpchm.h
diff --git
a/include/wx/msw/helpchm.h
b/include/wx/msw/helpchm.h
index aa76e84a64a28e3a8141e7de44fb87bf5f7728a6..859290f94ca462c0f25fe364c97a82f359578220 100644
(file)
--- a/
include/wx/msw/helpchm.h
+++ b/
include/wx/msw/helpchm.h
@@
-12,10
+12,6
@@
#ifndef _WX_HELPCHM_H_
#define _WX_HELPCHM_H_
#ifndef _WX_HELPCHM_H_
#define _WX_HELPCHM_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpchm.h"
-#endif
-
#if wxUSE_MS_HTML_HELP
#include "wx/helpbase.h"
#if wxUSE_MS_HTML_HELP
#include "wx/helpbase.h"
@@
-23,8
+19,7
@@
class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase
{
public:
class WXDLLEXPORT wxCHMHelpController : public wxHelpControllerBase
{
public:
- wxCHMHelpController() { }
- virtual ~wxCHMHelpController();
+ wxCHMHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) { }
// Must call this to set the filename
virtual bool Initialize(const wxString& file);
// Must call this to set the filename
virtual bool Initialize(const wxString& file);
@@
-44,6
+39,11
@@
public:
wxString GetHelpFile() const { return m_helpFile; }
wxString GetHelpFile() const { return m_helpFile; }
+ // helper of DisplayTextPopup(), also used in wxSimpleHelpProvider::ShowHelp
+ static bool ShowContextHelpPopup(const wxString& text,
+ const wxPoint& pos,
+ wxWindow *window);
+
protected:
// Append extension if necessary.
wxString GetValidFilename(const wxString& file) const;
protected:
// Append extension if necessary.
wxString GetValidFilename(const wxString& file) const;