Correct the drawing of check tools with a drop down button in wxAuiToolBar.

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 59cae5bbe22d41289a14459ab6f2a9c1ca27b0b7..de2530e84c73960d194a3f114648feabc1efc349 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik
 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vaclav Slavik

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

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


@@ -62,29 +62,25 @@ 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"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#  pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_XPM
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#  include "wx/defs.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/utils.h"

 #endif
 
 #endif
 

-#if wxUSE_XPM
-

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

-#include "wx/log.h"
-#include "wx/intl.h"
-#include "wx/utils.h"

 #include "wx/xpmdecod.h"
 #include "wx/xpmdecod.h"

+#include "wx/filename.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 


@@ -101,64 +97,48 @@ bool wxXPMHandler::LoadFile(wxImage *image,
     wxXPMDecoder decoder;
 
     wxImage img = decoder.ReadFile(stream);
     wxXPMDecoder decoder;
 
     wxImage img = decoder.ReadFile(stream);

-    if ( !img.Ok() )
-        return FALSE;
+    if ( !img.IsOk() )
+        return false;

     *image = img;
     *image = img;

-    return TRUE;
-}
-
-
-static char hexArray[] = "0123456789ABCDEF";
-
-static void DecToHex(int dec, char *buf)
-{
-    int firstDigit = (int)(dec/16.0);
-    int secondDigit = (int)(dec - (firstDigit*16.0));
-    buf[0] = hexArray[firstDigit];
-    buf[1] = hexArray[secondDigit];
-    buf[2] = 0;
+    return true;

 }
 
 }
 

-

 bool wxXPMHandler::SaveFile(wxImage * image,
                             wxOutputStream& stream, bool WXUNUSED(verbose))
 {
 bool wxXPMHandler::SaveFile(wxImage * image,
                             wxOutputStream& stream, bool WXUNUSED(verbose))
 {

-    wxString tmp;
-    char tmp_c;
-

     // 1. count colours:
     #define MaxCixels  92
     static const char Cixel[MaxCixels+1] =
                          " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk"
                          "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";
     // 1. count colours:
     #define MaxCixels  92
     static const char Cixel[MaxCixels+1] =
                          " .XoO+@#$%&*=-;:>,<1234567890qwertyuipasdfghjk"
                          "lzxcvbnmMNBVCZASDFGHJKLPIUYTREWQ!~^/()_`'][{}|";

-    int chars_per_pixel;
-    int cols;

     int i, j, k;
 
     int i, j, k;
 

-    cols = image->CountColours();
-    chars_per_pixel = 1;
+    wxImageHistogram histogram;
+    int cols = int(image->ComputeHistogram(histogram));
+
+    int chars_per_pixel = 1;

     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) )
     {

-        wxSplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
-                    NULL, &sName, NULL);
+        wxFileName::SplitPath(image->GetOption(wxIMAGE_OPTION_FILENAME),
+                              NULL, &sName, NULL);

         sName << wxT("_xpm");
     }
         sName << wxT("_xpm");
     }

-    
-    if ( !sName.IsEmpty() )
-        sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
-    else 
-        sName = wxT("/* XPM */\nstatic char *xpm_data");
+
+    if ( !sName.empty() )
+        sName = wxString(wxT("/* XPM */\nstatic const char *")) + sName;
+    else
+        sName = wxT("/* XPM */\nstatic const 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)
     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",


@@ -166,9 +146,6 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     stream.Write(tmpbuf, strlen(tmpbuf));
 
     // 3. create color symbols table:
     stream.Write(tmpbuf, strlen(tmpbuf));
 
     // 3. create color symbols table:

-    wxImageHistogram histogram;
-    image->ComputeHistogram(histogram);
-

     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     char **symbols = new char*[cols];
 
     char *symbols_data = new char[cols * (chars_per_pixel+1)];
     char **symbols = new char*[cols];
 


@@ -180,18 +157,16 @@ 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);
         char *sym = symbols[index];
 
     {
         unsigned long index = entry->second.index;
         symbols[index] = symbols_data + index * (chars_per_pixel+1);
         char *sym = symbols[index];
 

-        k = index % MaxCixels;
-        sym[0] = Cixel[k];
-        for (j = 1; j < chars_per_pixel; j++)
+        for (j = 0; j < chars_per_pixel; j++)

         {
         {

-            k = ((index - k) / MaxCixels) % MaxCixels;
-            sym[j] = Cixel[k];
+            sym[j] = Cixel[index % MaxCixels];
+            index /= MaxCixels;

         }
         sym[j] = '\0';
 
         }
         sym[j] = '\0';
 


@@ -203,23 +178,20 @@ bool wxXPMHandler::SaveFile(wxImage * image,
             sprintf( tmpbuf, "\"%s c None\",\n", sym);
         else
         {
             sprintf( tmpbuf, "\"%s c None\",\n", sym);
         else
         {

-            char rbuf[3];
-            DecToHex( (unsigned char)(key >> 16), rbuf );
-            char gbuf[3];
-            DecToHex( (unsigned char)(key >> 8), gbuf );
-            char bbuf[3];
-            DecToHex( (unsigned char)(key), bbuf );
-            sprintf( tmpbuf, "\"%s c #%s%s%s\",\n", sym, rbuf, gbuf, bbuf );
+            wxByte r = wxByte(key >> 16);
+            wxByte g = wxByte(key >> 8);
+            wxByte b = wxByte(key);
+            sprintf(tmpbuf, "\"%s c #%02X%02X%02X\",\n", sym, r, g, b);

         }
         stream.Write( tmpbuf, strlen(tmpbuf) );
     }
 
         }
         stream.Write( tmpbuf, strlen(tmpbuf) );
     }
 

-    tmp = wxT("/* pixels */\n");
-    stream.Write( (const char*) tmp.ToAscii(), tmp.Length() );
+    stream.Write("/* pixels */\n", 13);

 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)
     {
 
     unsigned char *data = image->GetData();
     for (j = 0; j < image->GetHeight(); j++)
     {

+        char tmp_c;

         tmp_c = '\"'; stream.Write(&tmp_c, 1);
         for (i = 0; i < image->GetWidth(); i++, data += 3)
         {
         tmp_c = '\"'; stream.Write(&tmp_c, 1);
         for (i = 0; i < image->GetWidth(); i++, data += 3)
         {


@@ -233,20 +205,20 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         }
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }
         }
         tmp_c = '\n'; stream.Write(&tmp_c, 1);
     }

-    tmp = wxT("};\n");
-    stream.Write( (const char*) tmp.ToAscii(), 3 );
+    stream.Write("};\n", 3 );

 
     // Clean up:
     delete[] symbols;
     delete[] symbols_data;
 
 
     // Clean up:
     delete[] symbols;
     delete[] symbols_data;
 

-    return TRUE;
+    return true;

 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);
 }
 
 bool wxXPMHandler::DoCanRead(wxInputStream& stream)
 {
     wxXPMDecoder decoder;
     return decoder.CanRead(stream);

+         // it's ok to modify the stream position here

 }
 
 #endif  // wxUSE_STREAMS
 }
 
 #endif  // wxUSE_STREAMS