centralized the handling of border styles; added borders support for wxListBox and...

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 59cae5bbe22d41289a14459ab6f2a9c1ca27b0b7..aa511c7359ade11b6e2024af64c8f95c149753e7 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /*
 /////////////////////////////////////////////////////////////////////////////
 
 /*


@@ -62,10 +62,6 @@ license is as follows:
 %
 */
 
 %
 */
 

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

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


@@ -102,9 +98,9 @@ bool wxXPMHandler::LoadFile(wxImage *image,
 
     wxImage img = decoder.ReadFile(stream);
     if ( !img.Ok() )
 
     wxImage img = decoder.ReadFile(stream);
     if ( !img.Ok() )

-        return FALSE;
+        return false;

     *image = img;
     *image = img;

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -140,7 +136,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 
     for ( k = MaxCixels; cols > k; k *= MaxCixels)
         chars_per_pixel++;
 

-    // 2. write the header:    
+    // 2. write the header:

     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {
     wxString sName;
     if ( image->HasOption(wxIMAGE_OPTION_FILENAME) )
     {


@@ -148,17 +144,17 @@ bool wxXPMHandler::SaveFile(wxImage * image,
                     NULL, &sName, NULL);
         sName << wxT("_xpm");
     }
                     NULL, &sName, NULL);
         sName << wxT("_xpm");
     }

-    
+

     if ( !sName.IsEmpty() )
         sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
     if ( !sName.IsEmpty() )
         sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;

-    else 
+    else

         sName = wxT("/* XPM */\nstatic char *xpm_data");
     stream.Write( (const char*) sName.ToAscii(), sName.Len() );
 
     char tmpbuf[200];
     // VS: 200b is safe upper bound for anything produced by sprintf below
     //     (<101 bytes the string, neither %i can expand into more than 10 chars)
         sName = wxT("/* XPM */\nstatic char *xpm_data");
     stream.Write( (const char*) sName.ToAscii(), sName.Len() );
 
     char tmpbuf[200];
     // VS: 200b is safe upper bound for anything produced by sprintf below
     //     (<101 bytes the string, neither %i can expand into more than 10 chars)

-    sprintf(tmpbuf, 
+    sprintf(tmpbuf,

                "[] = {\n"
                "/* columns rows colors chars-per-pixel */\n"
                "\"%i %i %i %i\",\n",
                "[] = {\n"
                "/* columns rows colors chars-per-pixel */\n"
                "\"%i %i %i %i\",\n",


@@ -180,7 +176,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
 
     // 2b. generate colour table:
     for (wxImageHistogram::iterator entry = histogram.begin();
 
     // 2b. generate colour table:
     for (wxImageHistogram::iterator entry = histogram.begin();

-         entry != histogram.end(); entry++ )
+         entry != histogram.end(); ++entry )

     {
         unsigned long index = entry->second.index;
         symbols[index] = symbols_data + index * (chars_per_pixel+1);
     {
         unsigned long index = entry->second.index;
         symbols[index] = symbols_data + index * (chars_per_pixel+1);


@@ -240,7 +236,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     delete[] symbols;
     delete[] symbols_data;
 
     delete[] symbols;
     delete[] symbols_data;
 

-    return TRUE;
+    return true;

 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)