changed wxUSE_DRAGIMAG to wxUSE_DRAGIMAGE and use it everywhere now

[wxWidgets.git] / include / wx / helpbase.h

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index d6d7ff83b5208c45994135e707537c191ff5f6ce..17443e79ac56135a40ec2ea21d6989091f018090 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -47,9 +47,19 @@ public:
     
     // If file is "", reloads file given  in Initialize
     virtual bool LoadFile(const wxString& file = "") = 0;
     
     // If file is "", reloads file given  in Initialize
     virtual bool LoadFile(const wxString& file = "") = 0;

+
+    // Displays the contents

     virtual bool DisplayContents(void) = 0;
     virtual bool DisplayContents(void) = 0;

+
+    // Display the given section

     virtual bool DisplaySection(int sectionNo) = 0;
 
     virtual bool DisplaySection(int sectionNo) = 0;
 

+    // Display the section using a context id
+    virtual bool DisplayContextPopup(int WXUNUSED(contextId)) { return FALSE; };
+
+    // Display the text in a popup, if possible
+    virtual bool DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos)) { return FALSE; };
+

     // By default, uses KeywordSection to display a topic. Implementations
     // may override this for more specific behaviour.
     virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); };
     // By default, uses KeywordSection to display a topic. Implementations
     // may override this for more specific behaviour.
     virtual bool DisplaySection(const wxString& section) { return KeywordSearch(section); };


@@ -76,34 +86,6 @@ public:
     virtual void OnQuit(void) {};
 };
 
     virtual void OnQuit(void) {};
 };
 

-/*
- * wxContextHelp
- * Invokes context-sensitive help. When the user
- * clicks on a window, a wxEVT_HELP event will be sent to that
- * window for the application to display help for.
- */
-
-class WXDLLEXPORT wxContextHelp: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxContextHelp)
-public:
-    wxContextHelp(wxWindow* win = NULL, bool beginHelp = TRUE);
-    ~wxContextHelp();
-
-    bool BeginContextHelp(wxWindow* win);
-    bool EndContextHelp();
-
-    bool EventLoop();
-    bool DispatchEvent(wxWindow* win, const wxPoint& pt);
-
-    void SetStatus(bool status) { m_status = status; }
-
-protected:
-
-    bool    m_inHelp;
-    bool    m_status; // TRUE if the user left-clicked
-};
-

 #endif // wxUSE_HELP
 #endif
 // _WX_HELPBASEH__
 #endif // wxUSE_HELP
 #endif
 // _WX_HELPBASEH__