[Dotgnu-pnet-commits] pnetlib/System.Windows.Forms S.cs,1.2,1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms
In directory subversions:/tmp/cvs-serv17568/System.Windows.Forms

Modified Files:
        S.cs 
Log Message:


Don't look for resources in "mscorlib.dll", because our Forms implementation
may be running on a CLR that doesn't have our mscorlib.


Index: S.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/S.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** S.cs        3 Oct 2003 07:52:03 -0000       1.2
--- S.cs        12 Oct 2003 22:50:18 -0000      1.3
***************
*** 34,44 ****
  #if CONFIG_RUNTIME_INFRA
  
!       // Cached copy of the resources for this assembly and mscorlib.
  #if ECMA_COMPAT
        private static ECMAResourceManager ourResources = null;
-       private static ECMAResourceManager runtimeResources = null;
  #else
        private static ResourceManager ourResources = null;
-       private static ResourceManager runtimeResources = null;
  #endif
  
--- 34,44 ----
  #if CONFIG_RUNTIME_INFRA
  
!       // Cached copy of the resources for this assembly.  We don't use
!       // the mscorlib resources, because we want this implementation
!       // of System.Drawing to be usable with other CLR's.
  #if ECMA_COMPAT
        private static ECMAResourceManager ourResources = null;
  #else
        private static ResourceManager ourResources = null;
  #endif
  
***************
*** 48,53 ****
                                lock(typeof(S))
                                {
-                                       String value;
- 
                                        // Try the resources in this assembly 
first.
                                        if(ourResources == null)
--- 48,51 ----
***************
*** 61,82 ****
                                        #endif
                                        }
!                                       value = ourResources.GetString(tag, 
null);
!                                       if(value != null)
!                                       {
!                                               return value;
!                                       }
! 
!                                       // Try the fallbacks in the runtime 
library.
!                                       if(runtimeResources == null)
!                                       {
!                                       #if ECMA_COMPAT
!                                               runtimeResources = new 
ECMAResourceManager
!                                                       ("runtime", 
(typeof(String)).Assembly);
!                                       #else
!                                               runtimeResources = new 
ResourceManager
!                                                       ("runtime", 
(typeof(String)).Assembly);
!                                       #endif
!                                       }
!                                       return runtimeResources.GetString(tag, 
null);
                                }
                        }
--- 59,63 ----
                                        #endif
                                        }
!                                       return ourResources.GetString(tag, 
null);
                                }
                        }