Removed deprecation warnings in OGL and Gizmos

[wxWidgets.git] / wxPython / src / filesys.i

diff --git a/wxPython/src/filesys.i b/wxPython/src/filesys.i
index 9380577a212a15ff716c9b5a177ce67f22bc6333..69d782e325eb999377c5210ce22c5f43d42d1c8d 100644 (file)
--- a/wxPython/src/filesys.i
+++ b/wxPython/src/filesys.i
@@ -14,6 +14,7 @@
 
 %{
 #include "helpers.h"
 
 %{
 #include "helpers.h"

+#include "pyistream.h"

 #include <wx/filesys.h>
 #include <wx/fs_inet.h>
 #include <wx/fs_mem.h>
 #include <wx/filesys.h>
 #include <wx/fs_inet.h>
 #include <wx/fs_mem.h>


@@ -32,7 +33,6 @@
 %import streams.i
 
 %pragma(python) code = "import wx"
 %import streams.i
 
 %pragma(python) code = "import wx"

-%pragma(python) code = "import string"

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 


@@ -86,7 +86,7 @@ public:
         return wxFileSystemHandler::GetRightLocation(location);
     }
 
         return wxFileSystemHandler::GetRightLocation(location);
     }
 

-    wxString GetMimeTypeFromExt(const wxString& location){
+    wxString GetMimeTypeFromExt(const wxString& location) {

         return wxFileSystemHandler::GetMimeTypeFromExt(location);
     }
 
         return wxFileSystemHandler::GetMimeTypeFromExt(location);
     }
 


@@ -140,6 +140,12 @@ public:
 
     static void AddHandler(wxFileSystemHandler *handler);
     static void CleanUpHandlers();
 
     static void AddHandler(wxFileSystemHandler *handler);
     static void CleanUpHandlers();

+
+//     // Returns the native path for a file URL
+//     static wxFileName URLToFileName(const wxString& url);
+
+//     // Returns the file URL for a native path
+//     static wxString FileNameToURL(const wxFileName& filename);

 };
 
 //---------------------------------------------------------------------------
 };
 
 //---------------------------------------------------------------------------


@@ -193,15 +199,11 @@ void __wxMemoryFSHandler_AddFile_wxBitmap(const wxString& filename,
     wxMemoryFSHandler::AddFile(filename, bitmap, type);
 }
 
     wxMemoryFSHandler::AddFile(filename, bitmap, type);
 }
 

-//  void __wxMemoryFSHandler_AddFile_wxString(const wxString& filename,
-//                                            const wxString& textdata) {
-//      wxMemoryFSHandler::AddFile(filename, textdata);
-//  }
-

 void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
                                       PyObject* data) {
 
     wxMemoryFSHandler::AddFile(filename,
 void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
                                       PyObject* data) {
 
     wxMemoryFSHandler::AddFile(filename,

+                               // TODO:  Verify data type

                                (void*)PyString_AsString(data),
                                (size_t)PyString_Size(data));
 }
                                (void*)PyString_AsString(data),
                                (size_t)PyString_Size(data));
 }


@@ -212,9 +214,9 @@ void __wxMemoryFSHandler_AddFile_Data(const wxString& filename,
 %pragma(python) code = "
 import types
 def wxMemoryFSHandler_AddFile(filename, a, b=''):
 %pragma(python) code = "
 import types
 def wxMemoryFSHandler_AddFile(filename, a, b=''):

-    if isinstance(a, wxImage):
+    if wx.wxPy_isinstance(a, (wxImage, wxImagePtr)):

         __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)
         __wxMemoryFSHandler_AddFile_wxImage(filename, a, b)

-    elif isinstance(a, wxBitmap):
+    elif wx.wxPy_isinstance(a, (wxBitmap, wxBitmapPtr)):

         __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b)
     elif type(a) == types.StringType:
         #__wxMemoryFSHandler_AddFile_wxString(filename, a)
         __wxMemoryFSHandler_AddFile_wxBitmap(filename, a, b)
     elif type(a) == types.StringType:
         #__wxMemoryFSHandler_AddFile_wxString(filename, a)