minor fixes to wxLocale::GetSystemLanguage(), test code for it added to the console...

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

diff --git a/src/common/fs_mem.cpp b/src/common/fs_mem.cpp
index 1881dce9a82c5089dc7f74a35c2cc5bd2dcfb159..d1e3b301790b6600adabf329198423164b8c8c7c 100644 (file)
--- a/src/common/fs_mem.cpp
+++ b/src/common/fs_mem.cpp
@@ -17,7 +17,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#if (wxUSE_HTML || wxUSE_FS_INET || wxUSE_FS_ZIP) && wxUSE_STREAMS
+#if wxUSE_FILESYSTEM && wxUSE_STREAMS

 
 #ifndef WXPRECOMP
 #include "wx/wx.h"
 
 #ifndef WXPRECOMP
 #include "wx/wx.h"


@@ -112,9 +112,11 @@ wxFSFile* wxMemoryFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString
 
 
 
 
 
 

-wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags)
+wxString wxMemoryFSHandler::FindFirst(const wxString& WXUNUSED(spec),
+                                      int WXUNUSED(flags))

 {
 {

-    wxLogWarning(wxT("wxMemoryFSHandler::FindFirst not implemented"));
+    wxFAIL_MSG(wxT("wxMemoryFSHandler::FindFirst not implemented"));
+

     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 


@@ -122,12 +124,12 @@ wxString wxMemoryFSHandler::FindFirst(const wxString& spec, int flags)
 
 wxString wxMemoryFSHandler::FindNext()
 {
 
 wxString wxMemoryFSHandler::FindNext()
 {

-    wxLogWarning(wxT("wxMemoryFSHandler::FindNext not implemented"));
+    wxFAIL_MSG(wxT("wxMemoryFSHandler::FindNext not implemented"));
+

     return wxEmptyString;
 }
 
 
     return wxEmptyString;
 }
 
 

-

 bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 {
     if (m_Hash == NULL) 
 bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 {
     if (m_Hash == NULL) 


@@ -149,19 +151,21 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 
 
 
 
 

+#if wxUSE_GUI
+

 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
 {
     if (!CheckHash(filename)) return;
 
     
     wxMemoryOutputStream mems;
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, wxImage& image, long type)
 {
     if (!CheckHash(filename)) return;
 
     
     wxMemoryOutputStream mems;

-    if (image.Ok() && image.SaveFile(mems, type))
+    if (image.Ok() && image.SaveFile(mems, (int)type))

         m_Hash -> Put(filename, new MemFSHashObj(mems));
     else
     {
         wxString s;
         s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());
         m_Hash -> Put(filename, new MemFSHashObj(mems));
     else
     {
         wxString s;
         s.Printf(_("Failed to store image '%s' to memory VFS!"), filename.c_str());

-        printf("'%s'\n", s.c_str());
+        wxPrintf(wxT("'%s'\n"), s.c_str());

         wxLogError(s);
     }
 }
         wxLogError(s);
     }
 }


@@ -173,6 +177,7 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
     AddFile(filename, img, type);
 }
 
     AddFile(filename, img, type);
 }
 

+#endif

 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
 {
 
 /*static*/ void wxMemoryFSHandler::AddFile(const wxString& filename, const wxString& textdata)
 {


@@ -204,4 +209,4 @@ bool wxMemoryFSHandler::CheckHash(const wxString& filename)
 
 
 
 
 
 

-#endif // wxUSE_FS_ZIP
+#endif // wxUSE_FILESYSTEM && wxUSE_FS_ZIP