static wxFile::Access() added

[wxWidgets.git] / src / common / list.cpp

diff --git a/src/common/list.cpp b/src/common/list.cpp
index b4d2ab7410b407b7629f5018d6bc4229b84e08e9..8622d286bc0f25cbbfc084cdc7f9cb2b12cc65b1 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -24,6 +24,7 @@
 #include "wx/defs.h"
 #include "wx/list.h"
 #include "wx/utils.h"
 #include "wx/defs.h"
 #include "wx/list.h"
 #include "wx/utils.h"

+#include <wx/intl.h>

 #endif
 
 // Sun CC compatibility (interference with xview/pkg.h, apparently...)
 #endif
 
 // Sun CC compatibility (interference with xview/pkg.h, apparently...)


@@ -210,40 +211,6 @@ wxList::~wxList (void)
     }
 }
 
     }
 }
 

-#ifdef USE_STORABLE_CLASSES
-wxList::wxList( istream &stream, char *WXUNUSED(data) )
-{
-  char buf[200];
-  unsigned int num;
-  stream.read( (char*)(&num), sizeof(num) );
-  for (unsigned int i = 0; i < num; i++)
-  {
-    int len;
-    stream.read( (char*)(&len), sizeof(len) );
-    stream.read( (char*)(&buf), len );
-    buf[len] = 0;
-    Append( wxCreateStoredObject( buf, stream, NULL ) );
-  };
-};
-
-void wxList::StoreObject( ostream &stream )
-{
-  unsigned int num = Number();
-  stream.write( (char*)(&num), sizeof(num) );
-  wxNode *node = First();
-  while (node)
-  {
-    wxObject *obj = (wxObject*) node->Data();
-    wxClassInfo *obj_info = obj->GetClassInfo();
-    int len = strlen(obj_info->className);
-    stream.write( (char*)(&len), sizeof(len) );
-    stream.write( obj_info->className, len );
-    obj->StoreObject( stream );
-    node = node->Next();
-  };
-};
-#endif
-  

 wxNode *wxList::Append(wxObject *object)
 {
     wxNode *node = new wxNode(this, last_node, NULL, object);
 wxNode *wxList::Append(wxObject *object)
 {
     wxNode *node = new wxNode(this, last_node, NULL, object);


@@ -286,7 +253,7 @@ wxNode *wxList::Find (const char *key) const
   {
       if (!current->key.string)
        {
   {
       if (!current->key.string)
        {

-         wxFatalError ("wxList: string key not present, probably did not Append correctly!");
+         wxFatalError (_("wxList: string key not present, probably did not Append correctly!"));

          break;
        }
       if (strcmp (current->key.string, key) == 0)
          break;
        }
       if (strcmp (current->key.string, key) == 0)