Skip to content

Commit d8da401

Browse files
henricjPaul-Licameli
authored andcommitted
Make it possible to const'ify xpm.
1 parent aaecf21 commit d8da401

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

images/Cursors.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@
5454

5555
#endif
5656

57-
std::unique_ptr<wxCursor> MakeCursor(int WXUNUSED(CursorId), const char * pXpm[36], int HotX, int HotY);
57+
std::unique_ptr<wxCursor> MakeCursor(int WXUNUSED(CursorId), const char * const pXpm[36], int HotX, int HotY);

src/MixerBoard.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ int MixerBoard::FindMixerTrackCluster(const PlayableTrack* pTrack,
14041404

14051405
void MixerBoard::LoadMusicalInstruments()
14061406
{
1407-
const struct Data { const char **bitmap; wxString name; } table[] = {
1407+
const struct Data { const char * const *bitmap; wxString name; } table[] = {
14081408
{acoustic_guitar_gtr_xpm, wxT("acoustic_guitar_gtr")},
14091409
{acoustic_piano_pno_xpm, wxT("acoustic_piano_pno")},
14101410
{back_vocal_bg_vox_xpm, wxT("back_vocal_bg_vox")},

src/TrackPanel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ END_EVENT_TABLE()
271271

272272
/// Makes a cursor from an XPM, uses CursorId as a fallback.
273273
/// TODO: Move this function to some other source file for reuse elsewhere.
274-
std::unique_ptr<wxCursor> MakeCursor( int WXUNUSED(CursorId), const char * pXpm[36], int HotX, int HotY )
274+
std::unique_ptr<wxCursor> MakeCursor( int WXUNUSED(CursorId), const char * const pXpm[36], int HotX, int HotY )
275275
{
276276
#ifdef CURSORS_SIZE32
277277
const int HotAdjust =0;

src/effects/Effect.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3784,7 +3784,7 @@ void EffectUIHost::OnDefaults(wxCommandEvent & WXUNUSED(evt))
37843784
return;
37853785
}
37863786

3787-
wxBitmap EffectUIHost::CreateBitmap(const char *xpm[], bool up, bool pusher)
3787+
wxBitmap EffectUIHost::CreateBitmap(const char * const xpm[], bool up, bool pusher)
37883788
{
37893789
wxMemoryDC dc;
37903790
wxBitmap pic(xpm);

src/effects/Effect.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ class EffectUIHost final : public wxDialogWrapper,
638638
void OnDefaults(wxCommandEvent & evt);
639639

640640
void UpdateControls();
641-
wxBitmap CreateBitmap(const char *xpm[], bool up, bool pusher);
641+
wxBitmap CreateBitmap(const char * const xpm[], bool up, bool pusher);
642642
void LoadUserPresets();
643643

644644
void InitializeRealtime();

0 commit comments

Comments
 (0)