more warning fixes about empty if statement in helper classes in release build

[wxWidgets.git] / include / wx / msw / helpchm.h

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index f6dfebf704126c705534fc3e6d5d4353dff4952d..859290f94ca462c0f25fe364c97a82f359578220 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -6,16 +6,12 @@
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     16/04/2000
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #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,11 +19,11 @@
 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);

+    virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize( file ); }

 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);
 
     // If file is "", reloads file given in Initialize
     virtual bool LoadFile(const wxString& file = wxEmptyString);


@@ -43,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;