diff --git a/build-unix.txt b/build-unix.txt index cb8c3ae11..7e0d8fe28 100644 --- a/build-unix.txt +++ b/build-unix.txt @@ -21,7 +21,8 @@ or Boost 1.37: sudo apt-get install libboost1.37-dev If using Boost 1.37, append -mt to the boost libraries in the makefile. -We're now using wxWidgets 2.9, which uses UTF-8. Don't try 2.8, it won't work. +We're using wxWidgets 2.9.0, which uses UTF-8. Don't try 2.8, it won't work. +The build hasn't been updated to work with wxWidgets 2.9.1 yet. You need to download wxWidgets from http://www.wxwidgets.org/downloads/ and build it yourself. See the build instructions and configure parameters diff --git a/rpc.cpp b/rpc.cpp index 422113a44..a7066ab3e 100644 --- a/rpc.cpp +++ b/rpc.cpp @@ -648,6 +648,8 @@ Value movecmd(const Array& params, bool fHelp) "move [minconf=1] [comment]\n" "Move from one account in your wallet to another."); + throw runtime_error("under construction"); + string strFrom = params[0].get_str(); string strTo = params[1].get_str(); int64 nAmount = AmountFromValue(params[2]); @@ -709,6 +711,8 @@ Value sendfrom(const Array& params, bool fHelp) "sendfrom [minconf=1] [comment] [comment-to]\n" " is a real and is rounded to the nearest 0.01"); + throw runtime_error("under construction"); + string strAccount = params[0].get_str(); string strAddress = params[1].get_str(); int64 nAmount = AmountFromValue(params[2]); diff --git a/serialize.h b/serialize.h index a3cfa9c06..5bf2fb63d 100644 --- a/serialize.h +++ b/serialize.h @@ -22,7 +22,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int VERSION = 31602; +static const int VERSION = 31700; static const char* pszSubVer = ""; diff --git a/setup.nsi b/setup.nsi index e999b6e1a..1cb005490 100644 --- a/setup.nsi +++ b/setup.nsi @@ -7,7 +7,7 @@ RequestExecutionLevel highest # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" -!define VERSION 0.3.15 +!define VERSION 0.3.17 !define COMPANY "Bitcoin project" !define URL http://www.bitcoin.org/ @@ -42,12 +42,12 @@ Var StartMenuGroup !insertmacro MUI_LANGUAGE English # Installer attributes -OutFile bitcoin-0.3.15-win32-setup.exe +OutFile bitcoin-0.3.17-win32-setup.exe InstallDir $PROGRAMFILES\Bitcoin CRCCheck on XPStyle on ShowInstDetails show -VIProductVersion 0.3.15.0 +VIProductVersion 0.3.17.0 VIAddVersionKey ProductName Bitcoin VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" diff --git a/ui.cpp b/ui.cpp index aafd4a7a8..321214fe5 100644 --- a/ui.cpp +++ b/ui.cpp @@ -1631,6 +1631,9 @@ COptionsDialog::COptionsDialog(wxWindow* parent) : COptionsDialogBase(parent) //m_listBox->Append(_("Test 2")); m_listBox->SetSelection(0); SelectPage(0); +#ifndef __WXMSW__ + SetSize(1.0 * GetSize().GetWidth(), 1.2 * GetSize().GetHeight()); +#endif #if defined(__WXGTK__) || defined(__WXMAC_OSX__) m_checkBoxStartOnSystemStartup->SetLabel(_("&Start Bitcoin on window system startup")); if (!mapArgs.count("-minimizetotray"))