removed separate wxSYS_ICONTITLE_FONT; made it the same as wxSYS_DEFAULT_GUI_FONT

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

diff --git a/include/wx/zipstrm.h b/include/wx/zipstrm.h
index 665f270f45a723df46211c69b1a67a4cda0cd6cc..f6b276b6ec64b2a1908dc3be763f68392278d7de 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -9,7 +9,7 @@
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "zipstrm.h"
 #endif
 
 #pragma interface "zipstrm.h"
 #endif
 


@@ -26,7 +26,7 @@
 //--------------------------------------------------------------------------------
 
 
 //--------------------------------------------------------------------------------
 
 

-class WXDLLEXPORT_BASE wxZipInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxZipInputStream : public wxInputStream

 {
 public:
     wxZipInputStream(const wxString& archive, const wxString& file);
 {
 public:
     wxZipInputStream(const wxString& archive, const wxString& file);