don't inherit font from the parent by default

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

diff --git a/src/common/imagpcx.cpp b/src/common/imagpcx.cpp
index 1b9874db40fefc3e6db88ce116eea19a51baeba7..cc45398eaf461c2025e9cafa1d663586016a5b77 100644 (file)
--- a/src/common/imagpcx.cpp
+++ b/src/common/imagpcx.cpp
@@ -8,7 +8,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "imagpcx.h"
 #endif
 
@@ -21,9 +21,10 @@
 
 #ifndef WX_PRECOMP
 #  include "wx/defs.h"
+#  include "wx/palette.h"
 #endif
 
-#if wxUSE_IMAGE && wxUSE_STREAMS && wxUSE_PCX
+#if wxUSE_IMAGE && wxUSE_PCX
 
 #include "wx/imagpcx.h"
 #include "wx/wfstream.h"
@@ -35,6 +36,14 @@
 #include "wx/list.h"
 #include "wx/object.h"
 
+//-----------------------------------------------------------------------------
+// wxPCXHandler
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
+
+#if wxUSE_STREAMS
+
 //-----------------------------------------------------------------------------
 // RLE encoding and decoding
 //-----------------------------------------------------------------------------
@@ -429,8 +438,6 @@ int SavePCX(wxImage *image, wxOutputStream& stream)
 // wxPCXHandler
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxPCXHandler,wxImageHandler)
-
 bool wxPCXHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbose, int WXUNUSED(index) )
 {
     int error;
@@ -490,11 +497,11 @@ bool wxPCXHandler::DoCanRead( wxInputStream& stream )
     if ( !stream )
         return FALSE;
 
-    stream.SeekI(-1, wxFromCurrent);
-
     // not very safe, but this is all we can get from PCX header :-(
     return c == 10;
 }
 
-#endif // wxUSE_STREAMS && wxUSE_PCX
+#endif // wxUSE_STREAMS
+
+#endif // wxUSE_IMAGE && wxUSE_PCX