FreeBSD linking fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1164,7 +1164,7 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
|
|||||||
{
|
{
|
||||||
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
|
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
|
||||||
_T("wxThePrintPaperDatabase should not be 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),
|
wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
|
||||||
_T("wxThePrintPaperDatabase should not be 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());
|
||||||
|
|
||||||
|
@@ -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(wxList, wxObject)
|
||||||
IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
|
IMPLEMENT_SERIAL_CLASS(wxHashTable, wxObject)
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user