fix for non-unicode DMC builds

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

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index da9d6431a9be3a230d352491ef684e34fb903df7..9b651102d7dd68c80be28cd58ca7ddfe813a2fc7 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -11,7 +11,7 @@
 #ifndef _WX_HTMLWIN_H_
 #define _WX_HTMLWIN_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "htmlwin.h"
 #endif
 
@@ -21,7 +21,6 @@
 #include "wx/window.h"
 #include "wx/scrolwin.h"
 #include "wx/config.h"
-#include "wx/treectrl.h"
 #include "wx/html/winpars.h"
 #include "wx/html/htmlcell.h"
 #include "wx/filesys.h"
@@ -163,9 +162,6 @@ public:
     // Adds HTML processor to wxHtmlWindow class as whole:
     static void AddGlobalProcessor(wxHtmlProcessor *processor);
 
-    // what would we do with it?
-    virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
-
     // -- Callbacks --
 
     // Sets the title of the window
@@ -241,7 +237,9 @@ protected:
     };
 
     // Copies selection to clipboard if the clipboard support is available
-    void CopySelection(ClipboardType t = Secondary);
+    //
+    // returns true if anything was copied to clipboard, false otherwise
+    bool CopySelection(ClipboardType t = Secondary);
 
 #if wxUSE_CLIPBOARD
     // Convert selection to text: