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

first pass of wxUniv merge - nothing works, most parts don't even compile

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-06-26 20:59:19 +00:00
parent aeb313f31c
commit 1e6feb95a7
409 changed files with 42065 additions and 6675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/generic/logg.cpp
View File

@@ -46,6 +46,8 @@
#include "wx/button.h"
#endif // WX_PRECOMP
#if wxUSE_LOGGUI || wxUSE_LOGWINDOW
#include "wx/file.h"
#include "wx/textfile.h"
#include "wx/statline.h"
@@ -198,28 +200,6 @@ void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
}
}
// ----------------------------------------------------------------------------
// wxLogTextCtrl implementation
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
{
m_pTextCtrl = pTextCtrl;
}
void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
wxString msg;
TimeStamp(&msg);
#ifdef __WXMAC__
msg << szString << wxT('\r');
#else
msg << szString << wxT('\n');
#endif
m_pTextCtrl->AppendText(msg);
}
// ----------------------------------------------------------------------------
// wxLogGui implementation (FIXME MT-unsafe)
// ----------------------------------------------------------------------------
@@ -266,7 +246,7 @@ void wxLogGui::Flush()
titleFormat = _("%s Information");
style = wxICON_INFORMATION;
}
wxString title;
title.Printf(titleFormat, appName.c_str());
@@ -1071,4 +1051,34 @@ static int OpenLogFile(wxFile& file, wxString *pFilename)
#endif // wxUSE_FILE
#endif // wxUSE_LOG
#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
#if wxUSE_TEXTCTRL
// ----------------------------------------------------------------------------
// wxLogTextCtrl implementation
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
{
m_pTextCtrl = pTextCtrl;
}
void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
wxString msg;
TimeStamp(&msg);
#ifdef __WXMAC__
// VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
// translation must be done in wxTextCtrl, not here! (FIXME)
msg << szString << wxT('\r');
#else
msg << szString << wxT('\n');
#endif
m_pTextCtrl->AppendText(msg);
}
#endif // wxUSE_TEXTCTRL