moved OLE files group under MSW files -- this is more logical

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

diff --git a/src/common/image.cpp b/src/common/image.cpp
index 3e922fad22a8300f29bd981bd7a405e46b067837..e43c7da643d454df744ab5d66613ef3123e6528d 100644 (file)
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -63,6 +63,8 @@ public:
 #endif // wxUSE_PALETTE
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;
 #endif // wxUSE_PALETTE
     wxArrayString   m_optionNames;
     wxArrayString   m_optionValues;

+
+    DECLARE_NO_COPY_CLASS(wxImageRefData)

 };
 
 wxImageRefData::wxImageRefData()
 };
 
 wxImageRefData::wxImageRefData()


@@ -1005,13 +1007,11 @@ int wxImage::GetImageCount( const wxString &name, long type )
 {
 #if wxUSE_STREAMS
   wxFileInputStream stream(name);
 {
 #if wxUSE_STREAMS
   wxFileInputStream stream(name);

-  if (!stream.Ok())
-      return 0;
-  else
+  if (stream.Ok())

       return GetImageCount(stream, type);
       return GetImageCount(stream, type);

-#else
-  return 0;

 #endif
 #endif

+
+  return 0;

 }
 
 #if wxUSE_STREAMS
 }
 
 #if wxUSE_STREAMS


@@ -1213,51 +1213,51 @@ bool wxImage::RemoveHandler( const wxString& name )
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {
 
 wxImageHandler *wxImage::FindHandler( const wxString& name )
 {

-    wxNode *node = sm_handlers.First();
+    wxNode *node = sm_handlers.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler*)node->Data();
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();

         if (handler->GetName().Cmp(name) == 0) return handler;
 
         if (handler->GetName().Cmp(name) == 0) return handler;
 

-        node = node->Next();
+        node = node->GetNext();

     }
     return 0;
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {
     }
     return 0;
 }
 
 wxImageHandler *wxImage::FindHandler( const wxString& extension, long bitmapType )
 {

-    wxNode *node = sm_handlers.First();
+    wxNode *node = sm_handlers.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler*)node->Data();
+        wxImageHandler *handler = (wxImageHandler*)node->GetData();

         if ( (handler->GetExtension().Cmp(extension) == 0) &&
             (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;
         if ( (handler->GetExtension().Cmp(extension) == 0) &&
             (bitmapType == -1 || handler->GetType() == bitmapType) )
             return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return 0;
 }
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {
     }
     return 0;
 }
 
 wxImageHandler *wxImage::FindHandler( long bitmapType )
 {

-    wxNode *node = sm_handlers.First();
+    wxNode *node = sm_handlers.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();

         if (handler->GetType() == bitmapType) return handler;
         if (handler->GetType() == bitmapType) return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return 0;
 }
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {
     }
     return 0;
 }
 
 wxImageHandler *wxImage::FindHandlerMime( const wxString& mimetype )
 {

-    wxNode *node = sm_handlers.First();
+    wxNode *node = sm_handlers.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();

         if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;
         if (handler->GetMimeType().IsSameAs(mimetype, FALSE)) return handler;

-        node = node->Next();
+        node = node->GetNext();

     }
     return 0;
 }
     }
     return 0;
 }


@@ -1267,19 +1267,15 @@ void wxImage::InitStandardHandlers()
 #if wxUSE_STREAMS
     AddHandler(new wxBMPHandler);
 #endif // wxUSE_STREAMS
 #if wxUSE_STREAMS
     AddHandler(new wxBMPHandler);
 #endif // wxUSE_STREAMS

-
-#if wxUSE_XPM && !defined(__WXGTK__) && !defined(__WXMOTIF__)
-    AddHandler(new wxXPMHandler);
-#endif

 }
 
 void wxImage::CleanUpHandlers()
 {
 }
 
 void wxImage::CleanUpHandlers()
 {

-    wxNode *node = sm_handlers.First();
+    wxNode *node = sm_handlers.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxImageHandler *handler = (wxImageHandler *)node->Data();
-        wxNode *next = node->Next();
+        wxImageHandler *handler = (wxImageHandler *)node->GetData();
+        wxNode *next = node->GetNext();

         delete handler;
         delete node;
         node = next;
         delete handler;
         delete node;
         node = next;