[Flamerobin-checkins] SF.net SVN: flamerobin:[1881] trunk/flamerobin

[<mg...@us...>]

Revision: 1881
          http://flamerobin.svn.sourceforge.net/flamerobin/?rev=1881&view=rev
Author:   mghie
Date:     2010-05-17 06:37:55 +0000 (Mon, 17 May 2010)

Log Message:
-----------
* Compilation fixes for gcc on Mac OS X
* Year in copyright info updated to 2010

Modified Paths:
--------------
    trunk/flamerobin/install/win32/FlameRobinSetup.iss
    trunk/flamerobin/src/gui/AboutBox.cpp
    trunk/flamerobin/src/gui/FRLayoutConfig.cpp
    trunk/flamerobin/src/gui/FRLayoutConfig.h
    trunk/flamerobin/src/sql/StatementBuilder.cpp

Property Changed:
----------------
    trunk/flamerobin/src/gui/FRLayoutConfig.cpp
    trunk/flamerobin/src/gui/FRLayoutConfig.h

Modified: trunk/flamerobin/install/win32/FlameRobinSetup.iss
===================================================================
--- trunk/flamerobin/install/win32/FlameRobinSetup.iss	2010-05-16 11:33:15 UTC (rev 1880)
+++ trunk/flamerobin/install/win32/FlameRobinSetup.iss	2010-05-17 06:37:55 UTC (rev 1881)
@@ -1,4 +1,4 @@
-;Copyright (c) 2004-2009 The FlameRobin Development Team
+;Copyright (c) 2004-2010 The FlameRobin Development Team
 ;
 ;Permission is hereby granted, free of charge, to any person obtaining
 ;a copy of this software and associated documentation files (the

Modified: trunk/flamerobin/src/gui/AboutBox.cpp
===================================================================
--- trunk/flamerobin/src/gui/AboutBox.cpp	2010-05-16 11:33:15 UTC (rev 1880)
+++ trunk/flamerobin/src/gui/AboutBox.cpp	2010-05-17 06:37:55 UTC (rev 1881)
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2004-2009 The FlameRobin Development Team
+  Copyright (c) 2004-2010 The FlameRobin Development Team
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -57,7 +57,7 @@
 	
     info.SetName(wxT("FlameRobin"));
 	
-    info.SetCopyright(_("Copyright (c) 2004-2009 FlameRobin Development Team"));
+    info.SetCopyright(_("Copyright (c) 2004-2010 FlameRobin Development Team"));
 	
     wxString ver;
 #ifdef FR_VERSION_SVN
@@ -135,7 +135,7 @@
     msg += wxT("\n\n");
     msg += ib;
     msg += wxT("\n\n");
-    msg += _("Copyright (c) 2004-2009  FlameRobin Development Team");
+    msg += _("Copyright (c) 2004-2010  FlameRobin Development Team");
     msg += wxT("\n");
     msg += _("http://www.flamerobin.org");
 

Modified: trunk/flamerobin/src/gui/FRLayoutConfig.cpp
===================================================================
--- trunk/flamerobin/src/gui/FRLayoutConfig.cpp	2010-05-16 11:33:15 UTC (rev 1880)
+++ trunk/flamerobin/src/gui/FRLayoutConfig.cpp	2010-05-17 06:37:55 UTC (rev 1881)
@@ -21,7 +21,7 @@
   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-  $Id: StyleGuide.cpp 1836 2009-02-14 11:22:13Z mghie $
+  $Id$
 
 */
 
@@ -38,6 +38,7 @@
     #include "wx/wx.h"
 #endif
 
+#include <algorithm>
 #include "gui/FRLayoutConfig.h"
 //-----------------------------------------------------------------------------
 class RgbHsvConversion // used by StyleGuidFR::getReadonlyColour()


Property changes on: trunk/flamerobin/src/gui/FRLayoutConfig.cpp
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision

Modified: trunk/flamerobin/src/gui/FRLayoutConfig.h
===================================================================
--- trunk/flamerobin/src/gui/FRLayoutConfig.h	2010-05-16 11:33:15 UTC (rev 1880)
+++ trunk/flamerobin/src/gui/FRLayoutConfig.h	2010-05-17 06:37:55 UTC (rev 1881)
@@ -21,7 +21,7 @@
   SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-  $Id: FRLayoutConfig.h 1836 2009-02-14 11:22:13Z mghie $
+  $Id$
 
 */
 


Property changes on: trunk/flamerobin/src/gui/FRLayoutConfig.h
___________________________________________________________________
Added: svn:keywords
   + Author Date Id Revision

Modified: trunk/flamerobin/src/sql/StatementBuilder.cpp
===================================================================
--- trunk/flamerobin/src/sql/StatementBuilder.cpp	2010-05-16 11:33:15 UTC (rev 1880)
+++ trunk/flamerobin/src/sql/StatementBuilder.cpp	2010-05-17 06:37:55 UTC (rev 1881)
@@ -105,7 +105,7 @@
 {
     completedLinesM += currentLineM;
     completedLinesM += wxTextBuffer::GetEOL();
-    currentLineM = wxString(' ', indentLevelM * indentCharsM);
+    currentLineM = wxString(wxChar(' '), indentLevelM * indentCharsM);
 }
 //-----------------------------------------------------------------------------
 void StatementBuilder::reset()