[Dotgnu-pnet-commits] pnetlib/System.Drawing S.cs, 1.1, 1.2 System.Drawing.build, 1.5, 1.6

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing
In directory subversions:/tmp/cvs-serv378/System.Drawing

Modified Files:
        S.cs System.Drawing.build 
Log Message:


Add the string resources for "System.Drawing".


Index: System.Drawing.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/System.Drawing.build,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** System.Drawing.build        19 Sep 2003 05:23:09 -0000      1.5
--- System.Drawing.build        12 Oct 2003 21:58:46 -0000      1.6
***************
*** 22,31 ****
                        </references>
  
- <!--
                        <resources>
                                <includes if="${CONFIG_RUNTIME_INFRA}"
                                        
name="../resources/en_US/System.Drawing/System.Drawing.resources"/>
                        </resources>
- -->
  
                        <arg compiler="cscc" value="-Wno-empty-input"/>
--- 22,29 ----

Index: S.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/S.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** S.cs        7 Jun 2003 22:40:57 -0000       1.1
--- S.cs        12 Oct 2003 21:58:46 -0000      1.2
***************
*** 34,44 ****
  #if CONFIG_RUNTIME_INFRA
  
!       // Cached copy of the resources for this assembly and mscorlib.
  #if ECMA_COMPAT
        private static ECMAResourceManager drawingResources = null;
-       private static ECMAResourceManager runtimeResources = null;
  #else
        private static ResourceManager drawingResources = 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 drawingResources = null;
  #else
        private static ResourceManager drawingResources = null;
  #endif
  
***************
*** 48,53 ****
                                lock(typeof(S))
                                {
-                                       String value;
- 
                                        // Try the resources in the 
"System.Drawing" assembly first.
                                        if(drawingResources == null)
--- 48,51 ----
***************
*** 61,82 ****
                                        #endif
                                        }
!                                       value = drawingResources.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 drawingResources.GetString(tag, 
null);
                                }
                        }