From ebb64acec1fbfb0c00e45f53d11f50ae86cdebce Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Sun, 17 Jan 2010 17:00:08 +0000 Subject: [PATCH] [Expander]: * Use be_fixed_font in the Show Content TextView (fixes ticket #5272). * Minor cleanup in ExpanderThread.cpp git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35122 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/expander/ExpanderThread.cpp | 11 +++++++++++ src/apps/expander/ExpanderWindow.cpp | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/apps/expander/ExpanderThread.cpp b/src/apps/expander/ExpanderThread.cpp index 890ae076b9..7324b0a96b 100644 --- a/src/apps/expander/ExpanderThread.cpp +++ b/src/apps/expander/ExpanderThread.cpp @@ -29,12 +29,14 @@ ExpanderThread::ExpanderThread(BMessage * refs_message, BMessenger * messenger) // (drag&drop messages) } + ExpanderThread::~ExpanderThread() { delete fWindowMessenger; delete [] fExpanderOutputBuffer; } + status_t ExpanderThread::ThreadStartup() { @@ -83,6 +85,7 @@ ExpanderThread::ThreadStartup() return B_OK; } + status_t ExpanderThread::ExecuteUnit(void) { @@ -107,6 +110,7 @@ ExpanderThread::ExecuteUnit(void) return B_OK; } + status_t ExpanderThread::ThreadShutdown(void) { @@ -117,6 +121,7 @@ ExpanderThread::ThreadShutdown(void) return B_OK; } + void ExpanderThread::ThreadStartupFailed(status_t status) { @@ -125,6 +130,7 @@ ExpanderThread::ThreadStartupFailed(status_t status) Quit(); } + void ExpanderThread::ExecuteUnitFailed(status_t status) { @@ -139,6 +145,7 @@ ExpanderThread::ExecuteUnitFailed(status_t status) Quit(); } + void ExpanderThread::ThreadShutdownFailed(status_t status) { @@ -152,6 +159,7 @@ ExpanderThread::ProcessRefs(BMessage *msg) return B_OK; } + thread_id ExpanderThread::PipeCommand(int argc, const char **argv, int &in, int &out, int &err, const char **envp) { @@ -209,6 +217,7 @@ ExpanderThread::SuspendExternalExpander() return status; } + status_t ExpanderThread::ResumeExternalExpander() { @@ -221,6 +230,7 @@ ExpanderThread::ResumeExternalExpander() return status; } + status_t ExpanderThread::InterruptExternalExpander() { @@ -234,6 +244,7 @@ ExpanderThread::InterruptExternalExpander() return status; } + status_t ExpanderThread::WaitOnExternalExpander() { diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index 0bf5491801..b66e6d0ce3 100644 --- a/src/apps/expander/ExpanderWindow.cpp +++ b/src/apps/expander/ExpanderWindow.cpp @@ -75,6 +75,9 @@ ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref* ref, fListingText = new BTextView("listingText"); fListingText->SetText(""); fListingText->MakeEditable(false); + fListingText->SetStylable(false); + BFont font = be_fixed_font; + fListingText->SetFontAndColor(&font); BScrollView* scrollView = new BScrollView("", fListingText, B_INVALIDATE_AFTER_LAYOUT, false, true);