Thread: [wxdevcenter-commits] SF.net SVN: wxdevcenter:[57] trunk/wxdevcenter

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 57
          http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=57&view=rev
Author:   cursorstar
Date:     2009-09-10 15:20:49 +0000 (Thu, 10 Sep 2009)

Log Message:
-----------
Intend to add pch

Modified Paths:
--------------
    trunk/wxdevcenter/Makefile.am
    trunk/wxdevcenter/Makefile.in
    trunk/wxdevcenter/src/Makefile.am
    trunk/wxdevcenter/src/Makefile.in
    trunk/wxdevcenter/src/plugins/text/bookmark.cpp
    trunk/wxdevcenter/src/plugins/text/bookmark.hpp
    trunk/wxdevcenter/src/plugins/text/text.cpp
    trunk/wxdevcenter/src/plugins/text/view.cpp
    trunk/wxdevcenter/src/sys/action.hpp
    trunk/wxdevcenter/src/sys/bookmark.hpp
    trunk/wxdevcenter/src/sys/search.hpp
    trunk/wxdevcenter/src/wxdevcenter.hpp

Modified: trunk/wxdevcenter/Makefile.am
===================================================================

--- trunk/wxdevcenter/Makefile.am	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/Makefile.am	2009-09-10 15:20:49 UTC (rev 57)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Created by Anjuta
 
-SUBDIRS = src po \
+SUBDIRS = . src po \
 	share
 
 wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
@@ -23,3 +23,9 @@
 		fi \
 	done
 
+
+# overide default process to create pch
+all-local: src/wxdevcenter.hpp.gch
+
+src/wxdevcenter.hpp.gch:
+	cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch

Modified: trunk/wxdevcenter/Makefile.in
===================================================================
--- trunk/wxdevcenter/Makefile.in	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/Makefile.in	2009-09-10 15:20:49 UTC (rev 57)
@@ -241,7 +241,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = src po \
+SUBDIRS = . src po \
 	share
 
 wxdevcenterdocdir = ${prefix}/doc/wxdevcenter
@@ -618,7 +618,7 @@
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA) config.h
+all-am: Makefile $(DATA) config.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(wxdevcenterdocdir)"; do \
@@ -710,21 +710,22 @@
 	install-strip
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip install-wxdevcenterdocDATA installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-wxdevcenterdocDATA
+	all all-am all-local am--refresh check check-am clean \
+	clean-generic clean-libtool ctags ctags-recursive dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
+	dist-tarZ dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool distclean-tags distcleancheck \
+	distdir distuninstallcheck dvi dvi-am html html-am info \
+	info-am install install-am install-data install-data-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip install-wxdevcenterdocDATA \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-wxdevcenterdocDATA
 
 
 # Copy all the spec files. Of cource, only one is actually used.
@@ -734,6 +735,12 @@
 			cp -p $$specfile $(distdir); \
 		fi \
 	done
+
+# overide default process to create pch
+all-local: src/wxdevcenter.hpp.gch
+
+src/wxdevcenter.hpp.gch:
+	cd src && $(MAKE) $(AM_MAKEFLAGS) wxdevcenter.hpp.gch
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: trunk/wxdevcenter/src/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/Makefile.am	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/Makefile.am	2009-09-10 15:20:49 UTC (rev 57)
@@ -50,5 +50,7 @@
 	$(WXDEVCENTER_LIBS) \
 	$(WX_LIBS)
 
+CLEANFILES = wxdevcenter.hpp.gch
 
-
+wxdevcenter.hpp.gch: wxdevcenter.hpp
+	$(CXXCOMPILE) -Winvalid-pch -c wxdevcenter.hpp -o wxdevcenter.hpp.gch

Modified: trunk/wxdevcenter/src/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/Makefile.in	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/Makefile.in	2009-09-10 15:20:49 UTC (rev 57)
@@ -304,6 +304,7 @@
 	$(WXDEVCENTER_LIBS) \
 	$(WX_LIBS)
 
+CLEANFILES = wxdevcenter.hpp.gch
 all: all-recursive
 
 .SUFFIXES:
@@ -633,6 +634,7 @@
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -719,6 +721,9 @@
 	tags tags-recursive uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-libLTLIBRARIES
 
+
+wxdevcenter.hpp.gch: wxdevcenter.hpp
+	$(CXXCOMPILE) -Winvalid-pch -c wxdevcenter.hpp -o wxdevcenter.hpp.gch
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: trunk/wxdevcenter/src/plugins/text/bookmark.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/bookmark.cpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/bookmark.cpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -32,7 +32,7 @@
 // dcBookmarkList
 //==========================================================================
 
-void dcBookmarkList::insert(const dcBookmark& bm)
+void dcBookmarkList::insert(const dcTextBookmark& bm)
 {
 	for(iterator it=begin(); it!=end(); it++)
 	{
@@ -48,7 +48,7 @@
 
 void dcBookmarkList::Insert(int line, const wxString& name)
 {
-	dcBookmark bm = {line, name};
+	dcTextBookmark bm = {line, name};
 	insert(bm);
 }
 
@@ -114,7 +114,7 @@
 	bool modified = false;
 	for(iterator iter=begin(); iter!=end(); iter++)
 	{
-		dcBookmark& bm = *iter;
+		dcTextBookmark& bm = *iter;
 		if(bm.line>=pos)
 		{
 			bm.line += nb;
@@ -170,7 +170,7 @@
 			else if(list!=NULL)
 			{
 				wxString num = line.BeforeFirst(wxT(':'));
-				dcBookmark bm;
+				dcTextBookmark bm;
 				bm.line = 0;
 				num.ToLong(&bm.line);
 				if(bm.line>0)
@@ -204,7 +204,7 @@
 		
 		for(dcBookmarkList::iterator it=list.begin(); it!=list.end(); it++)
 		{
-			const dcBookmark& bm = *it;
+			const dcTextBookmark& bm = *it;
 			text.Write32(bm.line);
 			text.WriteString(wxT(" : ") + bm.name + wxT("\n"));
 		}

Modified: trunk/wxdevcenter/src/plugins/text/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/bookmark.hpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/bookmark.hpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -17,8 +17,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _BOOKMARK_HPP_
-#define _BOOKMARK_HPP_
+#ifndef _TEXTBOOKMARK_HPP_
+#define _TEXTBOOKMARK_HPP_
 
 #include <map>
 #include <list>
@@ -26,19 +26,19 @@
 class wxListCtrl;
 class dcTextView;
 
-struct dcBookmark
+struct dcTextBookmark
 {
 	long line;
 	wxString name;
 	
-	bool operator<(const dcBookmark& bm)const{return line<bm.line;}
+	bool operator<(const dcTextBookmark& bm)const{return line<bm.line;}
 };
 
-class dcBookmarkList : public std::list<dcBookmark>
+class dcBookmarkList : public std::list<dcTextBookmark>
 {
-	typedef std::list<dcBookmark> List;
+	typedef std::list<dcTextBookmark> List;
 public:	
-	void insert(const dcBookmark& bm);
+	void insert(const dcTextBookmark& bm);
 	void Insert(int line, const wxString& name);
 	
 	void Remove(int line);
@@ -83,5 +83,5 @@
 	dcTextView* m_view;
 };
 
-#endif // _BOOKMARK_HPP_
+#endif // _TEXTBOOKMARK_HPP_
 

Modified: trunk/wxdevcenter/src/plugins/text/text.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/text.cpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/text.cpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -4,6 +4,7 @@
  * @author Emilien KIA
  */
 #include "../../wxdevcenter.hpp"
+
 #include "text.hpp"
 #include "view.hpp"
 

Modified: trunk/wxdevcenter/src/plugins/text/view.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/view.cpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/plugins/text/view.cpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -524,7 +524,7 @@
 	if(!name.IsEmpty())
 	{
 		dcBookmarkList& list = dcBookmarkProvider::Get(GetDocument()->GetFilename());
-		dcBookmark bm = {line, name};
+		dcTextBookmark bm = {line, name};
 		list.insert(bm);
 		
 		UpdateBookmarkWorkBar();

Modified: trunk/wxdevcenter/src/sys/action.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/action.hpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/sys/action.hpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -22,6 +22,7 @@
 #include <set>
 #include <map>
 
+#include "../ui/perspective.hpp"
 
 /**
  * Action combo key descriptor.

Modified: trunk/wxdevcenter/src/sys/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/bookmark.hpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/sys/bookmark.hpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -20,6 +20,8 @@
 #ifndef _BOOKMARK_HPP_
 #define _BOOKMARK_HPP_
 
+#include <wx/uri.h>
+
 /**
  * dcBookmark
  */

Modified: trunk/wxdevcenter/src/sys/search.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/search.hpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/sys/search.hpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -21,6 +21,7 @@
 #define _SEARCH_HPP_
 
 #include "bookmark.hpp"
+#include "../ui/workbar.hpp"
 
 #include <set>
 #include <list>

Modified: trunk/wxdevcenter/src/wxdevcenter.hpp
===================================================================
--- trunk/wxdevcenter/src/wxdevcenter.hpp	2009-09-10 11:28:12 UTC (rev 56)
+++ trunk/wxdevcenter/src/wxdevcenter.hpp	2009-09-10 15:20:49 UTC (rev 57)
@@ -107,16 +107,26 @@
 /*
  * Global inclusions :
  */
+#include "sys/action.hpp"
+#include "sys/bookmark.hpp"
+#include "sys/config.hpp"
+#include "sys/iterator.hpp"
 #include "sys/manager.hpp"
-#include "ui/perspective.hpp"
-#include "sys/action.hpp"
+#include "sys/plugin.hpp"
+#include "sys/search.hpp"
+#include "sys/task.hpp"
 
 #include "docview/workspace.hpp"
 #include "docview/project.hpp"
 #include "docview/document.hpp"
 #include "docview/view.hpp"
 
+#include "tools/bitvector.hpp"
+
+#include "ui/art.hpp"
+#include "ui/configui.hpp"
 #include "ui/frame.hpp"
+#include "ui/perspective.hpp"
 #include "ui/workbar.hpp"
 
 #endif /*WXDEVCENTER_H_*/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [wxdevcenter-commits] SF.net SVN: wxdevcenter:[57] trunk/wxdevcenter

wxdevcenter-cvs