source id type is unsigned; minor cleanup

[wxWidgets.git] / include / wx / html / helpwnd.h

diff --git a/include/wx/html/helpwnd.h b/include/wx/html/helpwnd.h
index d8f082554c42bf968f17cfe7f2fab0e305b79428..5e31933df585c45dbd7a057ff9c35d68accaa6fe 100644 (file)
--- a/include/wx/html/helpwnd.h
+++ b/include/wx/html/helpwnd.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwnd.h
+// Name:        wx/html/helpwnd.h

 // Purpose:     wxHtmlHelpWindow
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
 // Purpose:     wxHtmlHelpWindow
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik


@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef _WX_HELPWIN_H_
-#define _WX_HELPWIN_H_
+#ifndef _WX_HELPWND_H_
+#define _WX_HELPWND_H_

 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 


@@ -91,7 +91,7 @@ public:
                 const wxSize& size = wxDefaultSize,
                 int style = wxTAB_TRAVERSAL|wxNO_BORDER,
                 int helpStyle = wxHF_DEFAULT_STYLE);
                 const wxSize& size = wxDefaultSize,
                 int style = wxTAB_TRAVERSAL|wxNO_BORDER,
                 int helpStyle = wxHF_DEFAULT_STYLE);

-    ~wxHtmlHelpWindow();
+    virtual ~wxHtmlHelpWindow();

 
     wxHtmlHelpData* GetData() { return m_Data; }
     wxHtmlHelpController* GetController() const { return m_helpController; }
 
     wxHtmlHelpData* GetData() { return m_Data; }
     wxHtmlHelpController* GetController() const { return m_helpController; }


@@ -252,6 +252,8 @@ protected:
     int m_hfStyle;
 
 private:
     int m_hfStyle;
 
 private:

+    void DoIndexFind();
+    void DoIndexAll();

     void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it);
     wxHtmlHelpMergedIndex *m_mergedIndex;
 
     void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it);
     wxHtmlHelpMergedIndex *m_mergedIndex;
 


@@ -293,36 +295,6 @@ enum
     wxID_HTML_COUNTINFO
 };
 
     wxID_HTML_COUNTINFO
 };
 

-/*!
- * Help window event
- */
-
-class WXDLLIMPEXP_HTML wxHtmlWindowEvent: public wxNotifyEvent
-{
-public:
-    wxHtmlWindowEvent(wxEventType commandType = wxEVT_NULL, int id = 0):
-                 wxNotifyEvent(commandType, id)
-    {
-
-    }
-
-    void SetURL(const wxString& url) { m_url = url; }
-    const wxString& GetURL() const { return m_url; }
-
-private:
-    wxString    m_url;
-
-    DECLARE_DYNAMIC_CLASS(wxHtmlWindowEvent);
-};
-
-typedef void (wxEvtHandler::*wxHtmlWindowEventFunction)(wxHtmlWindowEvent&);
-
-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EVENT_TYPE(wxEVT_COMMAND_HTMLWINDOW_URL_CLICKED, 1000)
-END_DECLARE_EVENT_TYPES()
-
-#define EVT_HTMLWINDOW_URL_CLICKED(id, fn) DECLARE_EVENT_TABLE_ENTRY( wxEVT_COMMAND_HTMLWINDOW_URL_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxHtmlWindowEventFunction) & fn, (wxObject *) NULL ),
-

 #endif // wxUSE_WXHTML_HELP
 
 #endif
 #endif // wxUSE_WXHTML_HELP
 
 #endif