More notes and fixes - all .cpp files build ok

linux-notes.txt

@@ -11,18 +11,16 @@ Ubuntu packages required before building:
 
 These files do not compile, probably due to Windows dependencies:
 
-- CygwinDlg.cpp
-- ExceptionHandler.cpp
-- ExceptionAttacher.cpp
-- GetWinVer.cpp
-- IEHtmlWin.cpp
-- MiniVersion.cpp
-- ShellContextMenu.cpp
-- wxactivex.cpp
+- CygwinDlg.cpp - not needed, all uses are commented out
+- ExceptionHandler.cpp - never used?
+- ExceptionAttacher.cpp - never used?
+- GetWinVer.cpp - only used by ExceptionHandler
+- IEHtmlWin.cpp - cannot be compiled, replaced by MozillaHtmlWnd? all use is commented out
+- MiniVersion.cpp - only used by ExceptionHandler
+- ShellContextMenu.cpp - cannot be compiled, should be replaced with Gnome/KDE equivalent
+- wxactivex.cpp - only used by IEHtmlWin, cannot be compiled
 
 These files do not compile for other reasons:
 
-- styler-users.cpp
-- MozillaHtmlWnd.cpp
-- Utf.cpp
+- MozillaHtmlWnd.cpp - incomplete?
 

src/Makefile

@@ -5,7 +5,7 @@ LIBINCLUDES = -I../external/out/include -I../external/out/usr/include -I/usr/inc
 INCLUDES = $(WXINCLUDES) $(GTKINCLUDES) $(LIBINCLUDES) -I../ecore -I.
 
 CMPOPTS = -Wno-write-strings -DHAVE_CONFIG_H
-EXCEPT = CygwinDlg.cpp ExceptionHandler.cpp ExceptionAttacher.cpp GetWinVer.cpp IEHtmlWin.cpp MiniVersion.cpp ShellContextMenu.cpp wxactivex.cpp
+EXCEPT = CygwinDlg.cpp ExceptionHandler.cpp ExceptionAttacher.cpp GetWinVer.cpp IEHtmlWin.cpp MiniVersion.cpp MozillaHtmlWnd.cpp ShellContextMenu.cpp wxactivex.cpp
 SRCS = $(filter-out $(EXCEPT), $(wildcard *.cpp)) 
 OBJS = $(SRCS:.cpp=.o)
 

src/Utf.h

@@ -15,6 +15,7 @@
 #define __UTF_H__
 
 #include "wx/wxprec.h" // For compilers that support precompilation, includes "wx/wx.h".
+#include <wx/sstream.h>
 
 // UTF-8 Support functions
 
@@ -26,4 +27,4 @@ size_t ConvertToUTF8(const char* source, const size_t source_len, const wxMBConv
 size_t ConvertFromUTF8(const wxCharBuffer& utf8_buff, const wxMBConv& conv, wxWCharBuffer& wchar_buff,
 						size_t& wchar_buff_len, wxCharBuffer& dest_buff, size_t& dest_buff_len, size_t char_len);
 
-#endif // __UTF_H__
+#endif // __UTF_H__

src/styler_users.h

@@ -3,6 +3,7 @@
 
 #include "wx/wxprec.h" // For compilers that support precompilation, includes "wx/wx.h".
 #include "Catalyst.h"
+#include "Document.h"
 #include "StyleRun.h"
 #include "styler.h"