fixed DLL linking of wxMessageOutput class

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-18 09:34:35 +00:00
parent 7a4523c810
commit b553626907
2 changed files with 10 additions and 2 deletions

View File

@@ -40,7 +40,11 @@ public:
WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf) WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
protected: protected:
void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2; // NB: this is pure virtual so that it can be implemented in dllexported
// wxMessagOutput class
virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2 = 0;
// called by DoPrintf() to output formatted string
virtual void Output(const wxString& str) = 0; virtual void Output(const wxString& str) = 0;
}; };
@@ -62,6 +66,10 @@ public:
// sets the global wxMessageOutput instance; returns the previous one // sets the global wxMessageOutput instance; returns the previous one
static wxMessageOutput* Set(wxMessageOutput* msgout); static wxMessageOutput* Set(wxMessageOutput* msgout);
protected:
virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
virtual void Output(const wxString& str) = 0;
private: private:
static wxMessageOutput* ms_msgOut; static wxMessageOutput* ms_msgOut;
}; };

View File

@@ -76,7 +76,7 @@ wxMessageOutput* wxMessageOutput::Set(wxMessageOutput* msgout)
return old; return old;
} }
void wxMessageOutputBase::DoPrintf(const wxChar* format, ...) void wxMessageOutput::DoPrintf(const wxChar* format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);