SF.net SVN: geany: [2696] trunk

[eht16 at users.sourceforge.net]

Revision: 2696
          http://geany.svn.sourceforge.net/geany/?rev=2696&view=rev
Author:   eht16
Date:     2008-06-15 10:57:57 -0700 (Sun, 15 Jun 2008)

Log Message:
-----------
Backport string casts from Scintilla CVS to avoid compiler warnings.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/scintilla/ScintillaGTK.cxx

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-15 17:55:19 UTC (rev 2695)
+++ trunk/ChangeLog	2008-06-15 17:57:57 UTC (rev 2696)
@@ -8,6 +8,8 @@
    Fix old usage of build.env.
    Make configure-only options only available when actually configure
    is used.
+ * scintilla/ScintillaGTK.cxx:
+   Backport string casts from Scintilla CVS to avoid compiler warnings.
 
 
 2008-06-11  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/scintilla/ScintillaGTK.cxx
===================================================================
--- trunk/scintilla/ScintillaGTK.cxx	2008-06-15 17:55:19 UTC (rev 2695)
+++ trunk/scintilla/ScintillaGTK.cxx	2008-06-15 17:57:57 UTC (rev 2696)
@@ -314,15 +314,15 @@
 GdkAtom ScintillaGTK::atomDROPFILES_DND = 0;
 
 static const GtkTargetEntry clipboardCopyTargets[] = {
-	{ "UTF8_STRING", 0, TARGET_UTF8_STRING },
-	{ "STRING", 0, TARGET_STRING },
+	{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING },
+	{ (gchar *) "STRING", 0, TARGET_STRING },
 };
 static const gint nClipboardCopyTargets = sizeof(clipboardCopyTargets) / sizeof(clipboardCopyTargets[0]);
 
 static const GtkTargetEntry clipboardPasteTargets[] = {
-	{ "text/uri-list", 0, TARGET_URI },
-	{ "UTF8_STRING", 0, TARGET_UTF8_STRING },
-	{ "STRING", 0, TARGET_STRING },
+	{ (gchar *) "text/uri-list", 0, TARGET_URI },
+	{ (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING },
+	{ (gchar *) "STRING", 0, TARGET_STRING },
 };
 static const gint nClipboardPasteTargets = sizeof(clipboardPasteTargets) / sizeof(clipboardPasteTargets[0]);
 


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