Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-15 15:49:36 +02:00
Code Issues Releases Wiki Activity

Make it possible to const'ify xpm.

Browse Source
This commit is contained in:
Henric Jungheim 2018-01-14 04:32:03 -07:00 committed by Paul Licameli
parent aaecf213b8
commit d8da4015ef
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/Cursors.h
View File

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

2
src/MixerBoard.cpp
View File

@ -1404,7 +1404,7 @@ int MixerBoard::FindMixerTrackCluster(const PlayableTrack* pTrack,
void MixerBoard::LoadMusicalInstruments() void MixerBoard::LoadMusicalInstruments()
{ {
const struct Data { const char **bitmap; wxString name; } table[] = { const struct Data { const char * const *bitmap; wxString name; } table[] = {
{acoustic_guitar_gtr_xpm, wxT("acoustic_guitar_gtr")}, {acoustic_guitar_gtr_xpm, wxT("acoustic_guitar_gtr")},
{acoustic_piano_pno_xpm, wxT("acoustic_piano_pno")}, {acoustic_piano_pno_xpm, wxT("acoustic_piano_pno")},
{back_vocal_bg_vox_xpm, wxT("back_vocal_bg_vox")}, {back_vocal_bg_vox_xpm, wxT("back_vocal_bg_vox")},

2
src/TrackPanel.cpp
View File

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

2
src/effects/Effect.cpp
View File

@ -3784,7 +3784,7 @@ void EffectUIHost::OnDefaults(wxCommandEvent & WXUNUSED(evt))
return; return;
} }
wxBitmap EffectUIHost::CreateBitmap(const char *xpm[], bool up, bool pusher) wxBitmap EffectUIHost::CreateBitmap(const char * const xpm[], bool up, bool pusher)
{ {
wxMemoryDC dc; wxMemoryDC dc;
wxBitmap pic(xpm); wxBitmap pic(xpm);

2
src/effects/Effect.h
View File

@ -638,7 +638,7 @@ private:
void OnDefaults(wxCommandEvent & evt); void OnDefaults(wxCommandEvent & evt);
void UpdateControls(); void UpdateControls();
wxBitmap CreateBitmap(const char *xpm[], bool up, bool pusher); wxBitmap CreateBitmap(const char * const xpm[], bool up, bool pusher);
void LoadUserPresets(); void LoadUserPresets();
void InitializeRealtime(); void InitializeRealtime();