2005-01-27 Francisco Figueiredo Jr. <[email protected]>

    * Npgsql/NpgsqlParameter.cs,
      Npgsql/NpgsqlConnection.cs,
      Npgsql/NpgsqlCommand.cs,
      Npgsql/NpgsqlParameterCollection.cs,
      Makefile: Fixed problem when compiling Npgsql with Mono on windows with cygwin. Thanks Atsushi Enomoto(atsushi at ximian dot com) for heads up and Rafael Teixeira(monoman at gmail dot com) for fix.



svn path=/trunk/mcs/; revision=39635

mcs/class/Npgsql/ChangeLog

@@ -1,3 +1,11 @@
+2005-01-27  Francisco Figueiredo Jr.  <[email protected]>
+
+    * Npgsql/NpgsqlParameter.cs,
+    Npgsql/NpgsqlConnection.cs,
+    Npgsql/NpgsqlCommand.cs,
+    Npgsql/NpgsqlParameterCollection.cs,
+    Makefile: Fixed problem when compiling Npgsql with Mono on windows with cygwin. Thanks Atsushi Enomoto(atsushi at ximian dot com) for heads up and Rafael Teixeira(monoman at gmail dot com) for fix.
+
 2005-01-24  Atsushi Enomoto  <[email protected]>
 
 	* Makefile : quick csc build fix (tested on mcs as well).

mcs/class/Npgsql/Makefile

@@ -9,7 +9,6 @@ LIBRARY_SNK = Npgsql/Npgsql.snk
 LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
 		/r:System.Data.dll  \
 		/r:Mono.Security.dll \
-		/d:__MonoCS__ \
 		@Npgsql.dll.resources
 
 TEST_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \

mcs/class/Npgsql/Npgsql/NpgsqlCommand.cs

@@ -32,7 +32,7 @@ using System.Collections;
 
 using NpgsqlTypes;
 
-#if !__MonoCS__
+#if WITHDESIGN
 using Npgsql.Design;
 #endif
 
@@ -42,10 +42,9 @@ namespace Npgsql
     /// Represents a SQL statement or function (stored procedure) to execute
     /// against a PostgreSQL database. This class cannot be inherited.
     /// </summary>
-    #if !__MonoCS__
+    #if WITHDESIGN
     [System.Drawing.ToolboxBitmapAttribute(typeof(NpgsqlCommand)), ToolboxItem(true)]
     #endif
-    
     public sealed class NpgsqlCommand : Component, IDbCommand, ICloneable
     {
         // Logging related values
@@ -259,7 +258,7 @@ namespace Npgsql
         /// Gets the <see cref="Npgsql.NpgsqlParameterCollection">NpgsqlParameterCollection</see>.
         /// </summary>
         /// <value>The parameters of the SQL statement or function (stored procedure). The default is an empty collection.</value>
-        #if !__MonoCS__
+        #if WITHDESIGN
         [Category("Data"), DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
         #endif
         
@@ -292,7 +291,7 @@ namespace Npgsql
         /// </summary>
         /// <value>The <see cref="Npgsql.NpgsqlTransaction">NpgsqlTransaction</see>.
         /// The default value is a null reference.</value>
-        #if !__MonoCS__
+        #if WITHDESIGN
         [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         #endif
         
@@ -322,7 +321,7 @@ namespace Npgsql
         /// method of the <see cref="System.Data.Common.DbDataAdapter">DbDataAdapter</see>.
         /// </summary>
         /// <value>One of the <see cref="System.Data.UpdateRowSource">UpdateRowSource</see> values.</value>
-        #if !__MonoCS__
+        #if WITHDESIGN
         [Category("Behavior"), DefaultValue(UpdateRowSource.Both)]
         #endif
         

mcs/class/Npgsql/Npgsql/NpgsqlConnection.cs

@@ -36,7 +36,7 @@ using Mono.Security.Protocol.Tls;
 
 using NpgsqlTypes;
 
-#if !__MonoCS__
+#if WITHDESIGN
 using Npgsql.Design;
 #endif
 
@@ -59,7 +59,7 @@ namespace Npgsql
     /// This class represents a connection to a
     /// PostgreSQL server.
     /// </summary>
-    #if !__MonoCS__
+    #if WITHDESIGN
     [System.Drawing.ToolboxBitmapAttribute(typeof(NpgsqlConnection))]
     #endif
     
@@ -158,7 +158,7 @@ namespace Npgsql
         /// the initial connection. The default value is an empty string.
         /// </value>
         
-        #if !__MonoCS__
+        #if WITHDESIGN
         [RefreshProperties(RefreshProperties.All), DefaultValue(""), RecommendedAsConfigurable(true)]
         [NpgsqlSysDescription("Description_ConnectionString", typeof(NpgsqlConnection)), Category("Data")]
         [Editor(typeof(ConnectionStringEditor), typeof(System.Drawing.Design.UITypeEditor))]
@@ -219,7 +219,7 @@ namespace Npgsql
         /// </summary>
         /// <value>The time (in seconds) to wait for a connection to open. The default value is 15 seconds.</value>
         
-        #if !__MonoCS__
+        #if WITHDESIGN
         [NpgsqlSysDescription("Description_ConnectionTimeout", typeof(NpgsqlConnection))]
         #endif
         
@@ -235,7 +235,7 @@ namespace Npgsql
         /// </summary>
         /// <value>The name of the current database or the name of the database to be
         /// used after a connection is opened. The default value is the empty string.</value>
-        #if !__MonoCS__
+        #if WITHDESIGN
         [NpgsqlSysDescription("Description_Database", typeof(NpgsqlConnection))]
         #endif
         

mcs/class/Npgsql/Npgsql/NpgsqlParameter.cs

@@ -29,7 +29,7 @@ using System.Data;
 using System.ComponentModel;
 using NpgsqlTypes;
 
-#if !__MonoCS__
+#if WITHDESIGN
 using Npgsql.Design;
 #endif
 
@@ -39,7 +39,7 @@ namespace Npgsql
     ///<summary>
     /// This class represents a parameter to a command that will be sent to server
     ///</summary>
-    #if !__MonoCS__
+    #if WITHDESIGN
     [TypeConverter(typeof(NpgsqlParameterConverter))]
     #endif
     
@@ -384,7 +384,7 @@ namespace Npgsql
         /// </summary>
         /// <value><b>true</b> if null values are accepted; otherwise, <b>false</b>. The default is <b>false</b>.</value>
         
-        #if !__MonoCS__
+        #if WITHDESIGN
         [EditorBrowsable(EditorBrowsableState.Advanced), Browsable(false), DefaultValue(false), DesignOnly(true)]
         #endif
         

mcs/class/Npgsql/Npgsql/NpgsqlParameterCollection.cs

@@ -33,7 +33,7 @@ using System.Collections;
 using System.ComponentModel;
 using NpgsqlTypes;
 
-#if !__MonoCS__
+#if WITHDESIGN
 using Npgsql.Design;
 #endif
 
@@ -45,7 +45,7 @@ namespace Npgsql
     /// This class cannot be inherited.
     /// </summary>
     
-    #if !__MonoCS__
+    #if WITHDESIGN
     [ListBindable(false)]
     [Editor(typeof(NpgsqlParametersEditor), typeof(System.Drawing.Design.UITypeEditor))]
     #endif
@@ -77,7 +77,7 @@ namespace Npgsql
         /// <param name="parameterName">The name of the <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> to retrieve.</param>
         /// <value>The <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> with the specified name, or a null reference if the parameter is not found.</value>
         
-        #if !__MonoCS__
+        #if WITHDESIGN
         [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         #endif
         
@@ -100,7 +100,7 @@ namespace Npgsql
         /// <param name="index">The zero-based index of the <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> to retrieve.</param>
         /// <value>The <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> at the specified index.</value>
         
-        #if !__MonoCS__
+        #if WITHDESIGN
         [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         #endif
         
@@ -391,7 +391,7 @@ namespace Npgsql
         /// </summary>
         /// <value>The number of <see cref="Npgsql.NpgsqlParameter">NpgsqlParameter</see> objects in the collection.</value>
         
-        #if !__MonoCS__
+        #if WITHDESIGN
         [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
         #endif