diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2011-05-27 12:44:56 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2011-05-27 12:44:56 +0200 |
commit | a452d9ee2dea7e606ec102b0a1a411da4e5e5a91 (patch) | |
tree | c4f3e89c9e2e6ba2f5696629955a10ca235c96a2 | |
parent | 1d418728b0f8d9f2e9d1f9c83e76bb3c82613d97 (diff) | |
parent | af531f0449eae49e0e048218c9dccb3b3a771704 (diff) |
Merge remote branch 'bluematt/dpifix'
-rw-r--r-- | src/ui.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ui.cpp b/src/ui.cpp index ccb8cef8c2..cca473d82b 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -1863,8 +1863,10 @@ CSendDialog::CSendDialog(wxWindow* parent, const wxString& strAddress) : CSendDi iconSend.CopyFromBitmap(wxBitmap(send16noshadow_xpm)); SetIcon(iconSend); } +#ifdef __WXMSW__ else SetIcon(wxICON(bitcoin)); +#endif // Fixup the tab order m_buttonPaste->MoveAfterInTabOrder(m_buttonCancel); @@ -2360,8 +2362,10 @@ CAddressBookDialog::CAddressBookDialog(wxWindow* parent, const wxString& strInit iconAddressBook.CopyFromBitmap(wxBitmap(addressbook16_xpm)); SetIcon(iconAddressBook); } +#ifdef __WXMSW__ else SetIcon(wxICON(bitcoin)); +#endif // Init column headers m_listCtrlSending->InsertColumn(0, _("Name"), wxLIST_FORMAT_LEFT, 200); |