Added wxDataViewBitmapCell

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

diff --git a/src/common/imagbmp.cpp b/src/common/imagbmp.cpp
index 6e4168e0f006041308876fcaeac15d0fd31ed75f..9cf6d614f9a3dd2084d5204df4b5499179be0c1c 100644 (file)
--- a/src/common/imagbmp.cpp
+++ b/src/common/imagbmp.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        imagbmp.cpp
+// Name:        src/common/imagbmp.cpp

 // Purpose:     wxImage BMP,ICO and CUR handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$
 // Purpose:     wxImage BMP,ICO and CUR handlers
 // Author:      Robert Roebling, Chris Elliott
 // RCS-ID:      $Id$


@@ -7,30 +7,30 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "imagbmp.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#include "wx/defs.h"
-

 #if wxUSE_IMAGE
 
 #include "wx/imagbmp.h"
 #if wxUSE_IMAGE
 
 #include "wx/imagbmp.h"

-#include "wx/bitmap.h"
-#include "wx/debug.h"
-#include "wx/log.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #ifdef __WXMSW__
+        #include "wx/msw/wrapwin.h"
+    #endif
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/bitmap.h"
+    #include "wx/palette.h"
+    #include "wx/intl.h"
+#endif
+

 #include "wx/filefn.h"
 #include "wx/wfstream.h"
 #include "wx/filefn.h"
 #include "wx/wfstream.h"

-#include "wx/intl.h"
-#include "wx/module.h"

 #include "wx/quantize.h"
 
 // For memcpy
 #include "wx/quantize.h"
 
 // For memcpy


@@ -42,10 +42,6 @@
 #endif
 #endif
 
 #endif
 #endif
 

-#ifdef __WXMSW__
-#include "wx/msw/wrapwin.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxBMPHandler
 //-----------------------------------------------------------------------------


@@ -927,7 +923,7 @@ bool wxBMPHandler::LoadDib(wxImage *image, wxInputStream& stream,
                     verbose, IsBmp, true) )
     {
         if (verbose)
                     verbose, IsBmp, true) )
     {
         if (verbose)

-            wxLogError( _("Error in reading image DIB .") );
+            wxLogError( _("Error in reading image DIB.") );

         return false;
     }
 
         return false;
     }
 


@@ -1023,7 +1019,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
         return false;
     }
 
         return false;
     }
 

-    int images = 1; // only generate one image
+    const int images = 1; // only generate one image

 
     // VS: This is a hack of sort - since ICO and CUR files are almost
     //     identical, we have all the meat in wxICOHandler and check for
 
     // VS: This is a hack of sort - since ICO and CUR files are almost
     //     identical, we have all the meat in wxICOHandler and check for


@@ -1051,7 +1047,7 @@ bool wxICOHandler::SaveFile(wxImage *image,
 
     // for each iamage write a description ICONDIRENTRY:
     ICONDIRENTRY icondirentry;
 
     // for each iamage write a description ICONDIRENTRY:
     ICONDIRENTRY icondirentry;

-    for (int i = 0; i < images; i++)
+    for (int img = 0; img < images; img++)

     {
         wxImage mask;
 
     {
         wxImage mask;