Applied patch 1586499: wxCoordRound function

[wxWidgets.git] / include / wx / imagpnm.h

diff --git a/include/wx/imagpnm.h b/include/wx/imagpnm.h
index 2d1222ed3b177ec5b3dc1de716568fd505b34250..b9e46eea3f794ced06d033b456d447544bc9af3b 100644 (file)
--- a/include/wx/imagpnm.h
+++ b/include/wx/imagpnm.h
@@ -10,10 +10,6 @@
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 
 #ifndef _WX_IMAGPNM_H_
 #define _WX_IMAGPNM_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "imagpnm.h"
-#endif
-

 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------
 #include "wx/image.h"
 
 //-----------------------------------------------------------------------------


@@ -33,8 +29,9 @@ public:
     }
 
 #if wxUSE_STREAMS
     }
 
 #if wxUSE_STREAMS

-    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=TRUE, int index=-1 );
-    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=TRUE );
+    virtual bool LoadFile( wxImage *image, wxInputStream& stream, bool verbose=true, int index=-1 );
+    virtual bool SaveFile( wxImage *image, wxOutputStream& stream, bool verbose=true );
+protected:

     virtual bool DoCanRead( wxInputStream& stream );
 #endif
 
     virtual bool DoCanRead( wxInputStream& stream );
 #endif