Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make wxMessageOutput::Output() public to avoid having to call Printf("%s", s)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-22 17:17:01 +00:00
parent 87ae8abf07
commit 8a9464893a
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/msgout.h
View File

@@ -51,6 +51,10 @@ public:
(wxFormatString(f1))); (wxFormatString(f1)));
#endif #endif
// called by DoPrintf() to output formatted string but can also be called
// directly if no formatting is needed
virtual void Output(const wxString& str) = 0;
protected: protected:
// NB: this is pure virtual so that it can be implemented in dllexported // NB: this is pure virtual so that it can be implemented in dllexported
// wxMessagOutput class // wxMessagOutput class
@@ -60,9 +64,6 @@ protected:
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
virtual void DoPrintfUtf8(const char *format, ...) = 0; virtual void DoPrintfUtf8(const char *format, ...) = 0;
#endif #endif
// called by DoPrintf() to output formatted string
virtual void Output(const wxString& str) = 0;
}; };
#ifdef __VISUALC__ #ifdef __VISUALC__
@@ -90,7 +91,6 @@ protected:
#if wxUSE_UNICODE_UTF8 #if wxUSE_UNICODE_UTF8
virtual void DoPrintfUtf8(const char *format, ...); virtual void DoPrintfUtf8(const char *format, ...);
#endif #endif
virtual void Output(const wxString& str) = 0;
private: private:
static wxMessageOutput* ms_msgOut; static wxMessageOutput* ms_msgOut;
@@ -109,9 +109,9 @@ class WXDLLIMPEXP_BASE wxMessageOutputStderr : public wxMessageOutput
public: public:
wxMessageOutputStderr() { } wxMessageOutputStderr() { }
protected:
virtual void Output(const wxString& str); virtual void Output(const wxString& str);
protected:
// return the string with "\n" appended if it doesn't already terminate // return the string with "\n" appended if it doesn't already terminate
// with it (in which case it's returned unchanged) // with it (in which case it's returned unchanged)
wxString AppendLineFeedIfNeeded(const wxString& str); wxString AppendLineFeedIfNeeded(const wxString& str);
@@ -134,7 +134,6 @@ public:
wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR) wxMessageOutputBest(wxMessageOutputFlags flags = wxMSGOUT_PREFER_STDERR)
: m_flags(flags) { } : m_flags(flags) { }
protected:
virtual void Output(const wxString& str); virtual void Output(const wxString& str);
private: private:
@@ -152,7 +151,6 @@ class WXDLLIMPEXP_CORE wxMessageOutputMessageBox : public wxMessageOutput
public: public:
wxMessageOutputMessageBox() { } wxMessageOutputMessageBox() { }
protected:
virtual void Output(const wxString& str); virtual void Output(const wxString& str);
}; };
@@ -167,7 +165,6 @@ class WXDLLIMPEXP_BASE wxMessageOutputDebug : public wxMessageOutputStderr
public: public:
wxMessageOutputDebug() { } wxMessageOutputDebug() { }
protected:
virtual void Output(const wxString& str); virtual void Output(const wxString& str);
}; };
@@ -180,7 +177,6 @@ class WXDLLIMPEXP_BASE wxMessageOutputLog : public wxMessageOutput
public: public:
wxMessageOutputLog() { } wxMessageOutputLog() { }
protected:
virtual void Output(const wxString& str); virtual void Output(const wxString& str);
}; };