From e046f753d9a711dbbdb1ea257253f1d8c4a93a76 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Tue, 11 Aug 2009 06:07:19 +0000 Subject: [PATCH] Switch Karaoke mode button, join button and split button to new icons.. Originally committed to SVN as r3385. --- aegisub/src/audio_box.cpp | 6 +++--- aegisub/src/audio_box.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/src/audio_box.cpp b/aegisub/src/audio_box.cpp index 7b1772221..fccc89b9b 100644 --- a/aegisub/src/audio_box.cpp +++ b/aegisub/src/audio_box.cpp @@ -200,12 +200,12 @@ wxPanel(parent,-1,wxDefaultPosition,wxDefaultSize,wxTAB_TRAVERSAL|wxBORDER_RAISE audioKaraoke->box = this; audioKaraoke->display = audioDisplay; audioDisplay->karaoke = audioKaraoke; - KaraokeButton = new wxToggleButton(this,Audio_Button_Karaoke,_("Karaoke"),wxDefaultPosition,wxSize(-1,-1)); + KaraokeButton = new wxBitmapToggleButton(this,Audio_Button_Karaoke,GETIMAGE(kara_mode_24),wxDefaultPosition,wxSize(33,30)); KaraokeButton->SetToolTip(_("Toggle karaoke mode")); karaokeSizer->Add(KaraokeButton,0,wxRIGHT|wxEXPAND,0); - JoinButton = new wxButton(this,Audio_Button_Join,_T(""),wxDefaultPosition,wxSize(-1,10)); + JoinButton = new wxBitmapButton(this,Audio_Button_Join,GETIMAGE(kara_join_24),wxDefaultPosition,wxSize(33,30)); karaokeSizer->Add(JoinButton,0,wxRIGHT|wxEXPAND,0); - SplitButton = new wxButton(this,Audio_Button_Split,_T(""),wxDefaultPosition,wxSize(-1,-1)); + SplitButton = new wxBitmapButton(this,Audio_Button_Split,GETIMAGE(kara_split_24),wxDefaultPosition,wxSize(33,30)); karaokeSizer->Add(SplitButton,0,wxRIGHT|wxEXPAND,5); karaokeSizer->Add(audioKaraoke,1,wxEXPAND,0); SetKaraokeButtons(); // labels, hints and enabled-ness for join/split buttons set here diff --git a/aegisub/src/audio_box.h b/aegisub/src/audio_box.h index e0b263625..832d74729 100644 --- a/aegisub/src/audio_box.h +++ b/aegisub/src/audio_box.h @@ -168,7 +168,7 @@ public: AudioKaraoke *audioKaraoke; /// DOCME - wxToggleButton *KaraokeButton; + wxBitmapToggleButton *KaraokeButton; /// DOCME FrameMain *frameMain;