1
0
Fork 0

(svn r16011) -Codechange: Extracting widget number enums from the window classes.

release/1.0
alberth 2009-04-10 11:02:09 +00:00
parent 69ad98ecd5
commit 9acb1dc3f2
1 changed files with 37 additions and 41 deletions

View File

@ -192,25 +192,23 @@ void MusicLoop()
} }
} }
struct MusicTrackSelectionWindow : public Window { enum MusicTrackSelectionWidgets {
private: MTSW_CLOSE,
enum MusicTrackSelectionWidgets { MTSW_CAPTION,
MTSW_CLOSE, MTSW_BACKGROUND,
MTSW_CAPTION, MTSW_LIST_LEFT,
MTSW_BACKGROUND, MTSW_LIST_RIGHT,
MTSW_LIST_LEFT, MTSW_ALL,
MTSW_LIST_RIGHT, MTSW_OLD,
MTSW_ALL, MTSW_NEW,
MTSW_OLD, MTSW_EZY,
MTSW_NEW, MTSW_CUSTOM1,
MTSW_EZY, MTSW_CUSTOM2,
MTSW_CUSTOM1, MTSW_CLEAR,
MTSW_CUSTOM2, MTSW_SAVE,
MTSW_CLEAR, };
MTSW_SAVE,
};
public: struct MusicTrackSelectionWindow : public Window {
MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number) MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
{ {
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);
@ -350,30 +348,28 @@ static void ShowMusicTrackSelection()
AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0); AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
} }
struct MusicWindow : public Window { enum MusicWidgets {
private: MW_CLOSE,
enum MusicWidgets { MW_CAPTION,
MW_CLOSE, MW_PREV,
MW_CAPTION, MW_NEXT,
MW_PREV, MW_STOP,
MW_NEXT, MW_PLAY,
MW_STOP, MW_SLIDERS,
MW_PLAY, MW_GAUGE,
MW_SLIDERS, MW_BACKGROUND,
MW_GAUGE, MW_INFO,
MW_BACKGROUND, MW_SHUFFLE,
MW_INFO, MW_PROGRAMME,
MW_SHUFFLE, MW_ALL,
MW_PROGRAMME, MW_OLD,
MW_ALL, MW_NEW,
MW_OLD, MW_EZY,
MW_NEW, MW_CUSTOM1,
MW_EZY, MW_CUSTOM2,
MW_CUSTOM1, };
MW_CUSTOM2,
};
public: struct MusicWindow : public Window {
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number) MusicWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
{ {
this->FindWindowPlacementAndResize(desc); this->FindWindowPlacementAndResize(desc);