Found the RIGHT place to make the __unix__ fix.

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

diff --git a/include/wx/stream.h b/include/wx/stream.h
index 3013273cba314892e795fb16b2e8087d5cb30b74..13bd256293def7095c4f2027bfee2ab17183b9d7 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -106,7 +106,7 @@ class WXDLLEXPORT wxInputStream {
   wxInputStream& operator>>(int& i);
   wxInputStream& operator>>(long& i);
   wxInputStream& operator>>(float& i);
   wxInputStream& operator>>(int& i);
   wxInputStream& operator>>(long& i);
   wxInputStream& operator>>(float& i);

-#if USE_SERIAL
+#if wxUSE_SERIAL

   wxInputStream& operator>>(wxObject *& obj);
 #endif
 
   wxInputStream& operator>>(wxObject *& obj);
 #endif
 


@@ -160,7 +160,7 @@ class WXDLLEXPORT wxOutputStream {
   wxOutputStream& operator<<(int i);
   wxOutputStream& operator<<(long i);
   wxOutputStream& operator<<(double f);
   wxOutputStream& operator<<(int i);
   wxOutputStream& operator<<(long i);
   wxOutputStream& operator<<(double f);

-#if USE_SERIAL
+#if wxUSE_SERIAL

   wxOutputStream& operator<<(wxObject& obj);
 #endif
 
   wxOutputStream& operator<<(wxObject& obj);
 #endif
 


@@ -190,7 +190,7 @@ class WXDLLEXPORT wxOutputStream {
   wxStreamBuffer *m_o_streambuf;
 };
 
   wxStreamBuffer *m_o_streambuf;
 };
 

-class wxStream: public virtual wxInputStream,
+class WXDLLEXPORT wxStream: public virtual wxInputStream,

                public virtual wxOutputStream
 {
  public:
                public virtual wxOutputStream
 {
  public: