summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2009-04-10 11:02:09 +0000
committeralberth <alberth@openttd.org>2009-04-10 11:02:09 +0000
commit9acb1dc3f2111af3d20b853e6fe0d8123a9c3374 (patch)
treea947e3f67356911f849ad6778906c24b4a795230
parent69ad98ecd53a11a322ad06db4df7662d778f5e52 (diff)
downloadopenttd-9acb1dc3f2111af3d20b853e6fe0d8123a9c3374.tar.xz
(svn r16011) -Codechange: Extracting widget number enums from the window classes.
-rw-r--r--src/music_gui.cpp78
1 files changed, 37 insertions, 41 deletions
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index 536ad3196..9eaeeb782 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -192,25 +192,23 @@ void MusicLoop()
}
}
+enum MusicTrackSelectionWidgets {
+ MTSW_CLOSE,
+ MTSW_CAPTION,
+ MTSW_BACKGROUND,
+ MTSW_LIST_LEFT,
+ MTSW_LIST_RIGHT,
+ MTSW_ALL,
+ MTSW_OLD,
+ MTSW_NEW,
+ MTSW_EZY,
+ MTSW_CUSTOM1,
+ MTSW_CUSTOM2,
+ MTSW_CLEAR,
+ MTSW_SAVE,
+};
+
struct MusicTrackSelectionWindow : public Window {
-private:
- enum MusicTrackSelectionWidgets {
- MTSW_CLOSE,
- MTSW_CAPTION,
- MTSW_BACKGROUND,
- MTSW_LIST_LEFT,
- MTSW_LIST_RIGHT,
- MTSW_ALL,
- MTSW_OLD,
- MTSW_NEW,
- MTSW_EZY,
- MTSW_CUSTOM1,
- MTSW_CUSTOM2,
- MTSW_CLEAR,
- MTSW_SAVE,
- };
-
-public:
MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
{
this->FindWindowPlacementAndResize(desc);
@@ -350,30 +348,28 @@ static void ShowMusicTrackSelection()
AllocateWindowDescFront<MusicTrackSelectionWindow>(&_music_track_selection_desc, 0);
}
+enum MusicWidgets {
+ MW_CLOSE,
+ MW_CAPTION,
+ MW_PREV,
+ MW_NEXT,
+ MW_STOP,
+ MW_PLAY,
+ MW_SLIDERS,
+ MW_GAUGE,
+ MW_BACKGROUND,
+ MW_INFO,
+ MW_SHUFFLE,
+ MW_PROGRAMME,
+ MW_ALL,
+ MW_OLD,
+ MW_NEW,
+ MW_EZY,
+ MW_CUSTOM1,
+ MW_CUSTOM2,
+};
+
struct MusicWindow : public Window {
-private:
- enum MusicWidgets {
- MW_CLOSE,
- MW_CAPTION,
- MW_PREV,
- MW_NEXT,
- MW_STOP,
- MW_PLAY,
- MW_SLIDERS,
- MW_GAUGE,
- MW_BACKGROUND,
- MW_INFO,
- MW_SHUFFLE,
- MW_PROGRAMME,
- MW_ALL,
- MW_OLD,
- MW_NEW,
- MW_EZY,
- MW_CUSTOM1,
- MW_CUSTOM2,
- };
-
-public:
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window(desc, number)
{
this->FindWindowPlacementAndResize(desc);