FreeBSD linking fix

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 0b621274e9ddccc7e7f8e364cea232e295fbda67..387b2c7f935602576e404155c9cfc91fd94b0339 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1164,7 +1164,7 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
                   _T("wxThePrintPaperDatabase should not be NULL. "
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
                   _T("wxThePrintPaperDatabase should not be NULL. "

-                    "Do not create global print dialog data objects.") );
+                     "Do not create global print dialog data objects.") );

 
     wxSize sz = GetPaperSize();
 
 
     wxSize sz = GetPaperSize();
 


@@ -1180,7 +1180,7 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
                   _T("wxThePrintPaperDatabase should not be NULL. "
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
                   _T("wxThePrintPaperDatabase should not be NULL. "

-                    "Do not create global print dialog data objects.") );
+                     "Do not create global print dialog data objects.") );

 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 

diff --git a/src/common/serbase.cpp b/src/common/serbase.cpp
index cf00ab21d534be9d4dc1d0a18b460ab96d6e7bdf..85388cf0d77d3fe98012a4848bd71b23463ee4ea 100644 (file)
--- a/src/common/serbase.cpp
+++ b/src/common/serbase.cpp
@@ -30,8 +30,9 @@
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 
 // wxObject_Serialize
 // ----------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

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

+
+#if !USE_SHARED_LIBRARY

 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
 #endif
 IMPLEMENT_SERIAL_CLASS(wxList, wxObject)
 IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
 #endif