Win16 compilation fixes

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

diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index 803893ec9c7696751b27eb0a03a197d77736da40..5bc0943b9e6d0807b88d0c292d64d2a7e7edf56c 100644 (file)
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -13,8 +13,6 @@
 #pragma implementation "serbase.h"
 #endif
 
 #pragma implementation "serbase.h"
 #endif
 

-#ifdef wxUSE_SERIAL
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -26,15 +24,16 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_SERIAL
+

 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxObject_Serialize,wxObject)

+

 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)

-#endif

 
 void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 {
 
 void WXSERIAL(wxList)::StoreObject(wxObjectOutputStream& s)
 {


@@ -121,4 +120,4 @@ void WXSERIAL(wxHashTable)::LoadObject(wxObjectInputStream& s)
     table->hash_table[i] = (wxList *)s.GetChild();
 }
 
     table->hash_table[i] = (wxList *)s.GetChild();
 }
 

-#endif
+#endif // wxUSE_SERIAL