Don't call IAutoComplete::Init() twice for the same control as this leaks memory...

[wxWidgets.git] / include / wx / palmos / help.h

diff --git a/include/wx/palmos/help.h b/include/wx/palmos/help.h
index 2aa2b0d719368f393e909c723b076b1331467932..379c5bf7d9a8bf48bde0f06ee5837af2a714efcc 100644 (file)
--- a/include/wx/palmos/help.h
+++ b/include/wx/palmos/help.h
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwin.h
+// Name:        wx/palmos/helpwin.h

 // Purpose:     Help system: WinHelp implementation
 // Purpose:     Help system: WinHelp implementation

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -12,23 +12,19 @@
 #ifndef _WX_HELP_H_
 #define _WX_HELP_H_
 
 #ifndef _WX_HELP_H_
 #define _WX_HELP_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "help.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 WXDLLEXPORT wxPalmHelpController: public wxHelpControllerBase
+class WXDLLIMPEXP_CORE wxPalmHelpController: public wxHelpControllerBase

 {
     DECLARE_CLASS(wxPalmHelpController)
 
 public:
 {
     DECLARE_CLASS(wxPalmHelpController)
 
 public:

-    wxPalmHelpController() {};
-    ~wxPalmHelpController() {};
+    wxPalmHelpController() {}
+    virtual ~wxPalmHelpController() {}

 
     // 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;
 };