Merge pull request #142 from jgarzik/remove-gui-gen.
authorGavin Andresen <gavinandresen@gmail.com>
Tue, 3 May 2011 15:27:45 +0000 (08:27 -0700)
committerGavin Andresen <gavinandresen@gmail.com>
Tue, 3 May 2011 15:27:45 +0000 (08:27 -0700)
Remove GUI 'generate coins' option.

1  2 
ui.cpp

diff --cc ui.cpp
--- 1/ui.cpp
--- 2/ui.cpp
+++ b/ui.cpp
@@@ -2615,9 -2604,7 +2606,8 @@@ enu
  BEGIN_EVENT_TABLE(CMyTaskBarIcon, wxTaskBarIcon)
      EVT_TASKBAR_LEFT_DCLICK(CMyTaskBarIcon::OnLeftButtonDClick)
      EVT_MENU(ID_TASKBAR_RESTORE, CMyTaskBarIcon::OnMenuRestore)
 +    EVT_MENU(ID_TASKBAR_SEND, CMyTaskBarIcon::OnMenuSend)
      EVT_MENU(ID_TASKBAR_OPTIONS, CMyTaskBarIcon::OnMenuOptions)
-     EVT_MENU(ID_TASKBAR_GENERATE, CMyTaskBarIcon::OnMenuGenerate)
      EVT_UPDATE_UI(ID_TASKBAR_GENERATE, CMyTaskBarIcon::OnUpdateUIGenerate)
      EVT_MENU(ID_TASKBAR_EXIT, CMyTaskBarIcon::OnMenuExit)
  END_EVENT_TABLE()
@@@ -2716,9 -2691,7 +2701,8 @@@ wxMenu* CMyTaskBarIcon::CreatePopupMenu
  {
      wxMenu* pmenu = new wxMenu;
      pmenu->Append(ID_TASKBAR_RESTORE, _("&Open Bitcoin"));
 +    pmenu->Append(ID_TASKBAR_SEND, _("&Send Bitcoins"));
      pmenu->Append(ID_TASKBAR_OPTIONS, _("O&ptions..."));
-     pmenu->AppendCheckItem(ID_TASKBAR_GENERATE, _("&Generate Coins"))->Check(fGenerateBitcoins);
  #ifndef __WXMAC_OSX__ // Mac has built-in quit menu
      pmenu->AppendSeparator();
      pmenu->Append(ID_TASKBAR_EXIT, _("E&xit"));