From 80f99f09d666edb0445e48f9ba85162a094edd62 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Sun, 29 Nov 2009 03:49:12 +0000 Subject: [PATCH] Let's not override WriteText in Linux for the moment. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2272 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/ConsoleLogger.h | 2 ++ pcsx2/gui/pxLogTextCtrl.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pcsx2/gui/ConsoleLogger.h b/pcsx2/gui/ConsoleLogger.h index 0597e34134..1dbe11a7c7 100644 --- a/pcsx2/gui/ConsoleLogger.h +++ b/pcsx2/gui/ConsoleLogger.h @@ -108,7 +108,9 @@ public: bool HasWriteLock() const { return m_FreezeWrites; } void ConcludeIssue( int lines ); +#ifdef __WXMSW__ virtual void WriteText(const wxString& text); +#endif protected: virtual void OnThumbTrack(wxScrollWinEvent& event); diff --git a/pcsx2/gui/pxLogTextCtrl.cpp b/pcsx2/gui/pxLogTextCtrl.cpp index 6f5519b4dd..5f03784ad4 100644 --- a/pcsx2/gui/pxLogTextCtrl.cpp +++ b/pcsx2/gui/pxLogTextCtrl.cpp @@ -69,11 +69,13 @@ pxLogTextCtrl::pxLogTextCtrl( wxWindow* parent ) Connect( wxEVT_SIZE, wxSizeEventHandler(pxLogTextCtrl::OnResize) ); } +#ifdef __WXMSW__ void pxLogTextCtrl::WriteText(const wxString& text) { // Don't need the update message -- saves some overhead. DoWriteText( text, SetValue_SelectionOnly ); } +#endif void pxLogTextCtrl::OnResize( wxSizeEvent& evt ) {