From ead812e6dad741df08467e5d9691ed0180885923 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Tue, 4 Sep 2012 10:31:06 -0700
Subject: [PATCH] Use stock GTK+ buttons in the toolbar
---
src/spek-artwork.cc | 15 +++++++++++++++
src/spek-window.cc | 6 +++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/spek-artwork.cc b/src/spek-artwork.cc
index f72da48..d4907c6 100644
--- a/src/spek-artwork.cc
+++ b/src/spek-artwork.cc
@@ -36,6 +36,21 @@ wxBitmap SpekArtProvider::CreateBitmap(
if (id == ART_SPEK) {
#ifdef OS_UNIX
return wxArtProvider::GetBitmap(wxT("spek"), client, size);
+#endif
+ }
+ if (id == ART_OPEN) {
+#ifdef OS_UNIX
+ return wxArtProvider::GetBitmap(wxT("gtk-open"), client, size);
+#endif
+ }
+ if (id == ART_SAVE) {
+#ifdef OS_UNIX
+ return wxArtProvider::GetBitmap(wxT("gtk-save"), client, size);
+#endif
+ }
+ if (id == ART_ABOUT) {
+#ifdef OS_UNIX
+ return wxArtProvider::GetBitmap(wxT("gtk-about"), client, size);
#endif
}
return wxNullBitmap;
diff --git a/src/spek-window.cc b/src/spek-window.cc
index 3c81484..0b84557 100644
--- a/src/spek-window.cc
+++ b/src/spek-window.cc
@@ -111,13 +111,13 @@ SpekWindow::SpekWindow(const wxString& path) :
toolbar->AddTool(
wxID_OPEN,
wxEmptyString,
- wxArtProvider::GetBitmap(wxART_FILE_OPEN, wxART_TOOLBAR),
+ wxArtProvider::GetBitmap(ART_OPEN, wxART_TOOLBAR),
menu_file_open->GetItemLabelText()
);
toolbar->AddTool(
wxID_SAVE,
wxEmptyString,
- wxArtProvider::GetBitmap(wxART_FILE_SAVE, wxART_TOOLBAR),
+ wxArtProvider::GetBitmap(ART_SAVE, wxART_TOOLBAR),
menu_file_save->GetItemLabelText()
);
#if wxCHECK_VERSION(2, 9, 1)
@@ -125,7 +125,7 @@ SpekWindow::SpekWindow(const wxString& path) :
toolbar->AddTool(
wxID_ABOUT,
wxEmptyString,
- wxArtProvider::GetBitmap(wxART_HELP, wxART_TOOLBAR),
+ wxArtProvider::GetBitmap(ART_ABOUT, wxART_TOOLBAR),
menu_help_about->GetItemLabelText()
);
#endif