aboutsummaryrefslogtreecommitdiff
path: root/src/bitcoinrpc.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2011-09-28 21:52:32 +0200
committerWladimir J. van der Laan <[email protected]>2011-09-28 21:52:32 +0200
commit002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0 (patch)
tree58a16a226571a80537bfa7e3b1147aa4d0ee8767 /src/bitcoinrpc.cpp
parentuse median filter for peer-reported reported number of blocks (diff)
parentMerge pull request #536 from TheBlueMatt/build-updates (diff)
downloaddiscoin-002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0.tar.xz
discoin-002a4dcad0c0f74b1063cf27f0a9550d5e56c3f0.zip
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts: .gitignore (used upstream version) bitcoin-qt.pro
Diffstat (limited to 'src/bitcoinrpc.cpp')
-rw-r--r--src/bitcoinrpc.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index f111ad2e1..5a1fab694 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -64,11 +64,7 @@ void PrintConsole(const std::string &format, ...)
buffer[limit-1] = 0;
}
printf("%s", buffer);
-#if defined(__WXMSW__) && defined(GUI)
- MyMessageBox(buffer, "Bitcoin", wxOK | wxICON_EXCLAMATION);
-#else
fprintf(stdout, "%s", buffer);
-#endif
}
@@ -2357,13 +2353,7 @@ int CommandLineRPC(int argc, char *argv[])
if (strPrint != "")
{
-#if defined(__WXMSW__) && defined(GUI)
- // Windows GUI apps can't print to command line,
- // so settle for a message box yuck
- MyMessageBox(strPrint, "Bitcoin", wxOK);
-#else
fprintf((nRet == 0 ? stdout : stderr), "%s\n", strPrint.c_str());
-#endif
}
return nRet;
}