controls can now be put in the toolbars (MSW only so far, preliminary version)

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

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index 55348602d1cb36aae0e9819583ef3b3461e0b890..b15fff887ec0a9dea92fc30f59dadbaa9a9b2c93 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -13,7 +13,7 @@
 */
 
 // For compilers that support precompilation, includes "wx.h".
 */
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #  pragma hdrstop
 
 #ifdef __BORLANDC__
 #  pragma hdrstop


@@ -23,7 +23,7 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_LIBGIF
+#if wxUSE_GIF

 
 #include "wx/image.h"
 #include "wx/gifdecod.h"
 
 #include "wx/image.h"
 #include "wx/gifdecod.h"


@@ -34,12 +34,12 @@
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxGIFHandler,wxImageHandler)
 #endif
 

-#if wxUSE_STREAMS
-

 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxGIFHandler
 //-----------------------------------------------------------------------------
 

+#if wxUSE_STREAMS
+

 bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     wxGIFDecoder *decod;
 bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose )
 {
     wxGIFDecoder *decod;


@@ -49,14 +49,14 @@ bool wxGIFHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose
     decod = new wxGIFDecoder(&stream, TRUE);
 
     if ((error = decod->ReadGIF()) != E_OK)
     decod = new wxGIFDecoder(&stream, TRUE);
 
     if ((error = decod->ReadGIF()) != E_OK)

-    {   
+    {

         if (verbose)
         {
             switch (error)
             {
         if (verbose)
         {
             switch (error)
             {

-                case E_FORMATO: wxLogError(_T("wxGIFHandler: error in image format")); break;
-                case E_MEMORIA: wxLogError(_T("wxGIFHandler: couldn't allocate memory")); break;
-                default:        wxLogError(_T("wxGIFHandler: unknown error !!!"));
+                case E_FORMATO: wxLogError(wxT("wxGIFHandler: error in image format")); break;
+                case E_MEMORIA: wxLogError(wxT("wxGIFHandler: couldn't allocate memory")); break;
+                default:        wxLogError(wxT("wxGIFHandler: unknown error !!!"));

             }
         }
         delete decod;
             }
         }
         delete decod;


@@ -74,12 +74,12 @@ bool wxGIFHandler::SaveFile( wxImage * WXUNUSED(image),
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)
                              wxOutputStream& WXUNUSED(stream), bool verbose )
 {
     if (verbose)

-        wxLogDebug(_T("wxGIFHandler is read-only!!"));
+        wxLogDebug(wxT("wxGIFHandler is read-only!!"));

 
     return FALSE;
 }
 
 
     return FALSE;
 }
 

-bool wxGIFHandler::CanRead( wxInputStream& stream )
+bool wxGIFHandler::DoCanRead( wxInputStream& stream )

 {
     wxGIFDecoder *decod;
     bool ok;
 {
     wxGIFDecoder *decod;
     bool ok;


@@ -91,8 +91,6 @@ bool wxGIFHandler::CanRead( wxInputStream& stream )
     return ok;
 }
 
     return ok;
 }
 

-#endif
-  // wxUSE_STREAMS
+#endif  // wxUSE_STREAMS

 
 

-#endif
-  // wxUSE_GIF
+#endif  // wxUSE_GIF