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 4b8b4cf34687e6cb81c84ee361c9347644f90ffe..f6b276b6ec64b2a1908dc3be763f68392278d7de 100644 (file)
--- a/include/wx/zipstrm.h
+++ b/include/wx/zipstrm.h
@@ -9,7 +9,7 @@
 #ifndef __ZIPSTREAM_H__
 #define __ZIPSTREAM_H__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "zipstrm.h"
 #endif
 
@@ -26,7 +26,7 @@
 //--------------------------------------------------------------------------------
 
 
-class WXDLLEXPORT wxZipInputStream : public wxInputStream
+class WXDLLIMPEXP_BASE wxZipInputStream : public wxInputStream
 {
 public:
     wxZipInputStream(const wxString& archive, const wxString& file);
@@ -49,6 +49,8 @@ private:
     // this void* is handle of archive . I'm sorry it is void and not proper
     // type but I don't want to make unzip.h header public.
     void *m_Archive;
+
+    DECLARE_NO_COPY_CLASS(wxZipInputStream)
 };