X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77bae5e228394870a2c2a8444fd50ec622faf502..24e97652b0f3a5796c3fab61d87b1f636d64ce79:/include/wx/html/htmlwin.h

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 3fbcbd3cee..da9d6431a9 100644
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -32,7 +32,7 @@ class wxHtmlProcessor;
 class wxHtmlWinModule;
 class wxHtmlHistoryArray;
 class wxHtmlProcessorList;
-class WXDLLEXPORT wxHtmlWinAutoScrollTimer;
+class WXDLLIMPEXP_HTML wxHtmlWinAutoScrollTimer;
 
 
 // wxHtmlWindow flags:
@@ -62,7 +62,7 @@ enum wxHtmlOpeningStatus
 //                  SetPage(text) or LoadPage(filename).
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
+class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow
 {
     DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
     friend class wxHtmlWinModule;
@@ -214,14 +214,15 @@ protected:
     void OnMouseMove(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseUp(wxMouseEvent& event);
-    void OnIdle(wxIdleEvent& event);
 #if wxUSE_CLIPBOARD
     void OnKeyUp(wxKeyEvent& event);
     void OnDoubleClick(wxMouseEvent& event);
     void OnCopy(wxCommandEvent& event);
     void OnMouseEnter(wxMouseEvent& event);
     void OnMouseLeave(wxMouseEvent& event);
-#endif
+#endif // wxUSE_CLIPBOARD
+
+    virtual void OnInternalIdle();
 
     // Returns new filter (will be stored into m_DefaultFilter variable)
     virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
@@ -233,26 +234,26 @@ protected:
     // and wxHW_NO_SELECTION not used)
     bool IsSelectionEnabled() const;
 
-#if wxUSE_CLIPBOARD
-    // Convert selection to text:
-    wxString SelectionToText();
-
     enum ClipboardType
     {
         Primary,
         Secondary
     };
-    
-    // Copies selection to clipboard:
+
+    // Copies selection to clipboard if the clipboard support is available
     void CopySelection(ClipboardType t = Secondary);
 
+#if wxUSE_CLIPBOARD
+    // Convert selection to text:
+    wxString SelectionToText();
+
     // Helper functions to select parts of page:
     void SelectWord(const wxPoint& pos);
     void SelectLine(const wxPoint& pos);
 
     // Automatic scrolling during selection:
     void StopAutoScrolling();
-#endif
+#endif // wxUSE_CLIPBOARD
 
 protected:
     // This is pointer to the first cell in parsed data.  (Note: the first cell
@@ -297,16 +298,16 @@ protected:
     // helper class to automatically scroll the window if the user is selecting
     // text and the mouse leaves wxHtmlWindow:
     wxHtmlWinAutoScrollTimer *m_timerAutoScroll;
-#endif
+#endif // wxUSE_CLIPBOARD
 
 private:
     // window content for double buffered rendering:
     wxBitmap *m_backBuffer;
-    
+
     // variables used when user is selecting text
     wxPoint     m_tmpSelFromPos;
     wxHtmlCell *m_tmpSelFromCell;
-    
+
     // a flag indicated if mouse moved
     // (if TRUE we will try to change cursor in last call to OnIdle)
     bool m_tmpMouseMoved;
@@ -338,7 +339,7 @@ private:
 };
 
 
-#endif
+#endif // wxUSE_HTML
 
 #endif // _WX_HTMLWIN_H_