gtkfeatures.h does not exist under gtk+ 1.3.1, #ifndef it out

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

diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h
index 01b2eecf053bd8bc596c2fb08b91502450d07133..c3260a6e3833d0d061cedac6047a6436677ea35c 100644 (file)
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __HELPWINH__
-#define __HELPWINH__
+#ifndef _WX_HELPWIN_H_
+#define _WX_HELPWIN_H_

 
 #ifdef __GNUG__
 #pragma interface "helpwin.h"
 
 #ifdef __GNUG__
 #pragma interface "helpwin.h"


@@ -18,37 +18,39 @@
 
 #include "wx/wx.h"
 
 
 #include "wx/wx.h"
 

-#if USE_HELP
+#if wxUSE_HELP

 
 #include "wx/helpbase.h"
 
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {
 
 #include "wx/helpbase.h"
 
 class WXDLLEXPORT wxWinHelpController: public wxHelpControllerBase
 {

-  DECLARE_CLASS(wxWinHelpController)
+    DECLARE_CLASS(wxWinHelpController)
+        
+public:
+    wxWinHelpController() {};
+    ~wxWinHelpController() {};

 
 

- public:
-  wxWinHelpController(void);
-  ~wxWinHelpController(void);
+    // Must call this to set the filename
+    virtual bool Initialize(const wxString& file);

 
 

-  // Must call this to set the filename and server name
-  virtual bool Initialize(const wxString& file, int server = -1);
+    // If file is "", reloads file given in Initialize
+    virtual bool LoadFile(const wxString& file = wxEmptyString);
+    virtual bool DisplayContents();
+    virtual bool DisplaySection(int sectionNo);
+    virtual bool DisplayBlock(long blockNo);
+    virtual bool KeywordSearch(const wxString& k);
+    virtual bool Quit();

 
 

-  // If file is "", reloads file given  in Initialize
-  virtual bool LoadFile(const wxString& file = "");
-  virtual bool DisplayContents(void);
-  virtual bool DisplaySection(int sectionNo);
-  virtual bool DisplayBlock(long blockNo);
-  virtual bool KeywordSearch(const wxString& k);
-
-  virtual bool Quit(void);
-  virtual void OnQuit(void);
-
-  inline wxString GetHelpFile(void) const { return m_helpFile; }
+    inline wxString GetHelpFile() const { return m_helpFile; }

 
 protected:
 
 protected:

-  wxString m_helpFile;
+    // Append extension if necessary.
+    wxString GetValidFilename(const wxString& file) const;
+    
+private:
+    wxString m_helpFile;

 };
 
 };
 

-#endif // USE_HELP
+#endif // wxUSE_HELP

 #endif
 #endif

-    // __HELPWINH__
+// _WX_HELPWIN_H_