fixed DLL linking of wxMessageOutput class

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

diff --git a/include/wx/msgout.h b/include/wx/msgout.h
index 636435746404c4ec1c320dd03d83a26be6c45375..ba377c079cb98fccf0c49f79221b9ae22d0b4878 100755 (executable)
--- a/include/wx/msgout.h
+++ b/include/wx/msgout.h
@@ -40,7 +40,11 @@ public:
     WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
 
 protected:
     WX_DEFINE_VARARG_FUNC_VOID(Printf, DoPrintf)
 
 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
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 
     // sets the global wxMessageOutput instance; returns the previous one
     static wxMessageOutput* Set(wxMessageOutput* msgout);
 

+protected:
+    virtual void DoPrintf(const wxChar* format, ...) ATTRIBUTE_PRINTF_2;
+    virtual void Output(const wxString& str) = 0;
+

 private:
     static wxMessageOutput* ms_msgOut;
 };
 private:
     static wxMessageOutput* ms_msgOut;
 };

diff --git a/src/common/msgout.cpp b/src/common/msgout.cpp
index 12136d2886e416213ac98c0a746ea1f6bdde8adc..44ec5e15971b37c613cf6396450c1c35a25fe637 100755 (executable)
--- a/src/common/msgout.cpp
+++ b/src/common/msgout.cpp
@@ -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_start(args, format);
 {
     va_list args;
     va_start(args, format);