projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding new files for xti merge
[wxWidgets.git]
/
include
/
wx
/
msw
/
helpwin.h
diff --git
a/include/wx/msw/helpwin.h
b/include/wx/msw/helpwin.h
index da2c7c2fd4cef3136101319735a615b2e0551de7..5af4f824e0beeefdc6ec3bb39460cade2a47c8e8 100644
(file)
--- a/
include/wx/msw/helpwin.h
+++ b/
include/wx/msw/helpwin.h
@@
-6,29
+6,25
@@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_HELPWIN_H_
#define _WX_HELPWIN_H_
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_HELPWIN_H_
#define _WX_HELPWIN_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpwin.h"
-#endif
-
#include "wx/wx.h"
#if wxUSE_HELP
#include "wx/helpbase.h"
#include "wx/wx.h"
#if wxUSE_HELP
#include "wx/helpbase.h"
-class WXDLL
EXPORT
wxWinHelpController: public wxHelpControllerBase
+class WXDLL
IMPEXP_CORE
wxWinHelpController: public wxHelpControllerBase
{
DECLARE_CLASS(wxWinHelpController)
{
DECLARE_CLASS(wxWinHelpController)
-
+
public:
public:
- wxWinHelpController(
) {};
- ~wxWinHelpController() {};
+ wxWinHelpController(
wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
+ virtual ~wxWinHelpController() {}
// 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);
@@
-50,7
+46,7
@@
public:
protected:
// Append extension if necessary.
wxString GetValidFilename(const wxString& file) const;
protected:
// Append extension if necessary.
wxString GetValidFilename(const wxString& file) const;
-
+
private:
wxString m_helpFile;
};
private:
wxString m_helpFile;
};