Merge pull request #992 from gavinandresen/remove_wxBitcoin

Remove wxWidgets .exe during setup

diff --combined share/setup.nsi
index bffef9c,af37e7d..3d528ce
--- 1/share/setup.nsi
--- 2/share/setup.nsi
+++ b/share/setup.nsi
@@@ -75,6 -75,10 +75,10 @@@ Section -Main SEC000
      File /r /x *.exe /x *.o ../src\*.*\r
      SetOutPath $INSTDIR\r
      WriteRegStr HKCU "${REGKEY}\Components" Main 1\r
+ \r
+     # Remove old wxwidgets-based-bitcoin executable and locales:\r
+     Delete /REBOOTOK $INSTDIR\bitcoin.exe\r
+     RMDir /r /REBOOTOK $INSTDIR\locale\r
  SectionEnd\r
  \r
  Section -post SEC0001\r
@@@ -94,12 -98,10 +98,12 @@@
      WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString $INSTDIR\uninstall.exe\r
      WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1\r
      WriteRegDWORD HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1\r
 -    WriteRegStr HKCR "bitcoin" "URL Protocol" ""\r
 -    WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"\r
 -    WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe\r
 -    WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "$$1"'\r
 +\r
 +    # bitcoin: URI handling disabled for 0.6.0\r
 +    #    WriteRegStr HKCR "bitcoin" "URL Protocol" ""\r
 +    #    WriteRegStr HKCR "bitcoin" "" "URL:Bitcoin"\r
 +    #    WriteRegStr HKCR "bitcoin\DefaultIcon" "" $INSTDIR\bitcoin-qt.exe\r
 +    #    WriteRegStr HKCR "bitcoin\shell\open\command" "" '"$INSTDIR\bitcoin-qt.exe" "$$1"'\r
  SectionEnd\r
  \r
  # Macro for selecting uninstaller sections\r