[ndoc-commits] CVS: ndoc/src/Gui HeaderGroupBox.cs, 1.3, 1.3.4.1 MainForm.cs, 1.82.4.1, 1.82.4.2

[Gert D. <dri...@us...>]

Update of /cvsroot/ndoc/ndoc/src/Gui
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20788

Modified Files:
      Tag: ndoc_1_3_patches
	HeaderGroupBox.cs MainForm.cs 
Log Message:
Fixed warnings using csc 2.x.

Index: HeaderGroupBox.cs
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Gui/HeaderGroupBox.cs,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -d -r1.3 -r1.3.4.1
*** HeaderGroupBox.cs	31 Mar 2004 02:06:44 -0000	1.3
--- HeaderGroupBox.cs	18 Aug 2008 10:08:17 -0000	1.3.4.1
***************
*** 27,31 ****
  		[Category("Appearance")]
  		[Description("Adds some extra spacing around the header")]
! 		public int Padding
  		{
  			get { return padding; }
--- 27,35 ----
  		[Category("Appearance")]
  		[Description("Adds some extra spacing around the header")]
! 		public
! #if NET_2_0
! 		new
! #endif
! 		int Padding
  		{
  			get { return padding; }

Index: MainForm.cs
===================================================================
RCS file: /cvsroot/ndoc/ndoc/src/Gui/MainForm.cs,v
retrieving revision 1.82.4.1
retrieving revision 1.82.4.2
diff -C2 -d -r1.82.4.1 -r1.82.4.2
*** MainForm.cs	25 Mar 2005 02:09:29 -0000	1.82.4.1
--- MainForm.cs	18 Aug 2008 10:08:17 -0000	1.82.4.2
***************
*** 2070,2074 ****
          /// <param name="e">A <see cref="EventArgs" /> that contains the event data.</param>
          private void menuViewLicense_Click(object sender, System.EventArgs e) {
!             Uri uri = new Uri(Assembly.GetExecutingAssembly().CodeBase, true);
              // first try to locate license file in directory in which NDocGui is
              // located
--- 2070,2074 ----
          /// <param name="e">A <see cref="EventArgs" /> that contains the event data.</param>
          private void menuViewLicense_Click(object sender, System.EventArgs e) {
!             Uri uri = new Uri(Assembly.GetExecutingAssembly().CodeBase);
              // first try to locate license file in directory in which NDocGui is
              // located
***************
*** 2189,2207 ****
  			get
  			{
!                 Uri uri = new Uri(Assembly.GetExecutingAssembly().CodeBase, true);
!                 // first try to locate help file in directory in which NDocGui is
!                 // located
!                 string path = Path.Combine( 
!                     Path.GetDirectoryName(uri.AbsolutePath),
!                     "NDocUsersGuide.chm");
!                 if (!File.Exists(path)) {
!                     // if not found, try to look in NDoc main directory, which is 3 
!                     // levels up (from <ndoc root>/bin/<framework>/<framework version> 
!                     // to <ndoc root>/doc/help)
!                     path = Path.Combine(Path.GetDirectoryName(uri.AbsolutePath), 
!                         string.Format(CultureInfo.InvariantCulture, "..{0}..{0}..{0}doc{0}help{0}NDocUsersGuide.chm", 
!                         Path.DirectorySeparatorChar));
!                 }
!                 return path;
  			}
  		}
--- 2189,2207 ----
  			get
  			{
! 				Uri uri = new Uri(Assembly.GetExecutingAssembly().CodeBase);
! 				// first try to locate help file in directory in which NDocGui is
! 				// located
! 				string path = Path.Combine( 
! 				Path.GetDirectoryName(uri.AbsolutePath),
! 				"NDocUsersGuide.chm");
! 				if (!File.Exists(path)) {
! 					// if not found, try to look in NDoc main directory, which is 3 
! 					// levels up (from <ndoc root>/bin/<framework>/<framework version> 
! 					// to <ndoc root>/doc/help)
! 					path = Path.Combine(Path.GetDirectoryName(uri.AbsolutePath), 
! 						string.Format(CultureInfo.InvariantCulture, "..{0}..{0}..{0}doc{0}help{0}NDocUsersGuide.chm", 
! 						Path.DirectorySeparatorChar));
! 				}
! 				return path;
  			}
  		}