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

This commit is contained in:
alberth
2009-04-10 11:02:09 +00:00
parent 3ea6a6be53
commit 328fc1fc71

View File

@@ -192,9 +192,7 @@ void MusicLoop()
} }
} }
struct MusicTrackSelectionWindow : public Window { enum MusicTrackSelectionWidgets {
private:
enum MusicTrackSelectionWidgets {
MTSW_CLOSE, MTSW_CLOSE,
MTSW_CAPTION, MTSW_CAPTION,
MTSW_BACKGROUND, MTSW_BACKGROUND,
@@ -208,9 +206,9 @@ private:
MTSW_CUSTOM2, MTSW_CUSTOM2,
MTSW_CLEAR, MTSW_CLEAR,
MTSW_SAVE, 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,9 +348,7 @@ static void ShowMusicTrackSelection()
AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0); AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
} }
struct MusicWindow : public Window { enum MusicWidgets {
private:
enum MusicWidgets {
MW_CLOSE, MW_CLOSE,
MW_CAPTION, MW_CAPTION,
MW_PREV, MW_PREV,
@@ -371,9 +367,9 @@ private:
MW_EZY, MW_EZY,
MW_CUSTOM1, MW_CUSTOM1,
MW_CUSTOM2, 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);