Fix setting the clipping region for a DC when the region is an

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

diff --git a/src/common/imagxpm.cpp b/src/common/imagxpm.cpp
index 5e8db820c959131a90a6d5e2b95b604b6b88c831..3db566fcb741be9ef7a95f4ace6c5269a3e3d359 100644 (file)
--- a/src/common/imagxpm.cpp
+++ b/src/common/imagxpm.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$
 // Purpose:     wxXPMHandler
 // Author:      Vaclav Slavik, Robert Roebling
 // RCS-ID:      $Id$


@@ -62,28 +62,23 @@ 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"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)
 #include "wx/xpmdecod.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxXPMHandler,wxImageHandler)


@@ -149,7 +144,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
         sName << wxT("_xpm");
     }
 
         sName << wxT("_xpm");
     }
 

-    if ( !sName.IsEmpty() )
+    if ( !sName.empty() )

         sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
     else
         sName = wxT("/* XPM */\nstatic char *xpm_data");
         sName = wxString(wxT("/* XPM */\nstatic char *")) + sName;
     else
         sName = wxT("/* XPM */\nstatic char *xpm_data");


@@ -215,7 +210,7 @@ bool wxXPMHandler::SaveFile(wxImage * image,
     }
 
     tmp = wxT("/* pixels */\n");
     }
 
     tmp = wxT("/* pixels */\n");

-    stream.Write( (const char*) tmp.ToAscii(), tmp.Length() );
+    stream.Write( (const char*) tmp.ToAscii(), tmp.length() );

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