(svn r16211) -Codechange: Moving StationListWidgets out of the window class, completing StationViewWidgets.

src/station_gui.cpp

@@ -79,13 +79,8 @@ static void StationsWndShowStationRating(int left, int right, int y, CargoID typ
 
 typedef GUIList<const Station*> GUIStationList;
 
-/**
- * The list of stations per company.
- */
-class CompanyStationsWindow : public Window
-{
-	/** Enum for CompanyStations, referring to _company_stations_widgets */
-	enum StationListWidgets {
+/** Enum for CompanyStations, referring to _company_stations_widgets */
+enum StationListWidgets {
 	SLW_CLOSEBOX =  0,  ///< Close window button
 	SLW_CAPTION,        ///< Window caption
 	SLW_STICKY,         ///< Sticky button
@@ -110,8 +105,13 @@ class CompanyStationsWindow : public Window
 	SLW_PAN_SORT_RIGHT, ///< Panel right of sorting options
 
 	SLW_CARGOSTART,     ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets)
-	};
+};
 
+/**
+ * The list of stations per company.
+ */
+class CompanyStationsWindow : public Window
+{
 protected:
 	/* Runtime saved values */
 	static Listing last_sorting;

src/station_gui.h

@@ -11,7 +11,9 @@
 enum StationViewWidgets {
 	SVW_CLOSEBOX   =  0, ///< Close 'X' button
 	SVW_CAPTION    =  1, ///< Caption of the window
+	SVW_STICKYBOX  =  2, ///< Sticky button
 	SVW_WAITING    =  3, ///< List of waiting cargo
+	SVW_SCROLLBAR  =  4, ///< Scrollbar
 	SVW_ACCEPTLIST =  5, ///< List of accepted cargos
 	SVW_RATINGLIST =  5, ///< Ratings of cargos
 	SVW_LOCATION   =  6, ///< 'Location' button