Don't create multiple parent-less top level frames in layout sample.

[wxWidgets.git] / include / wx / msw / wince / helpwce.h

diff --git a/include/wx/msw/wince/helpwce.h b/include/wx/msw/wince/helpwce.h
index f3ccfc4410fc3123b633d56c5303d34de7be5a6e..9923e515c09eed60d618bb598c737056eda48bc3 100644 (file)
--- a/include/wx/msw/wince/helpwce.h
+++ b/include/wx/msw/wince/helpwce.h
@@ -1,30 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwce.h
+// Name:        wx/msw/wince/helpwce.h

 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWCE_H_
 #define _WX_HELPWCE_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_HELPWCE_H_
 #define _WX_HELPWCE_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "helpwce.cpp"
-#endif
-

 #if wxUSE_HELP
 
 #include "wx/helpbase.h"
 
 #if wxUSE_HELP
 
 #include "wx/helpbase.h"
 

-class WXDLLEXPORT wxWinceHelpController : public wxHelpControllerBase
+class WXDLLIMPEXP_CORE wxWinceHelpController : public wxHelpControllerBase

 {
 public:
 {
 public:

-    wxWinceHelpController() { }
-    virtual ~wxWinceHelpController();
+    wxWinceHelpController(wxWindow* parentWindow = NULL): wxHelpControllerBase(parentWindow) {}
+    virtual ~wxWinceHelpController() {}

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


@@ -37,7 +33,8 @@ public:
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);
     virtual bool DisplayBlock(long blockNo);
     virtual bool DisplayContextPopup(int contextId);
     virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos);

-    virtual bool KeywordSearch(const wxString& k);
+    virtual bool KeywordSearch(const wxString& k,
+                               wxHelpSearchMode mode = wxHELP_SEARCH_ALL);

     virtual bool Quit();
 
     wxString GetHelpFile() const { return m_helpFile; }
     virtual bool Quit();
 
     wxString GetHelpFile() const { return m_helpFile; }


@@ -49,7 +46,7 @@ protected:
     // View topic, or just the HTML file
     bool ViewURL(const wxString& topic = wxEmptyString);
 
     // View topic, or just the HTML file
     bool ViewURL(const wxString& topic = wxEmptyString);
 

-protected:
+private:

     wxString m_helpFile;
 
     DECLARE_CLASS(wxWinceHelpController)
     wxString m_helpFile;
 
     DECLARE_CLASS(wxWinceHelpController)


@@ -59,4 +56,3 @@ protected:
 
 #endif
 // _WX_HELPWCE_H_
 
 #endif
 // _WX_HELPWCE_H_

-