dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r23553) -Fix: avoid naming conflict in widget enums

Browse Source
This commit is contained in:
truebrain
2011-12-16 18:33:02 +00:00
parent 6d0673f0c1
commit bcf00dbb8f
4 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/widgets/station_widget.h
View File

@@ -29,25 +29,25 @@ enum StationViewWidgets {
/** Widgets of the WC_STATION_LIST. */
enum StationListWidgets {
WID_SL_CAPTION, ///< Caption of the window.
WID_SL_LIST, ///< The main panel, list of stations.
WID_SL_SCROLLBAR, ///< Scrollbar next to the main panel.
WID_STL_CAPTION, ///< Caption of the window.
WID_STL_LIST, ///< The main panel, list of stations.
WID_STL_SCROLLBAR, ///< Scrollbar next to the main panel.
/* Vehicletypes need to be in order of StationFacility due to bit magic */
WID_SL_TRAIN, ///< 'TRAIN' button - list only facilities where is a railroad station.
WID_SL_TRUCK, ///< 'TRUCK' button - list only facilities where is a truck stop.
WID_SL_BUS, ///< 'BUS' button - list only facilities where is a bus stop.
WID_SL_AIRPLANE, ///< 'AIRPLANE' button - list only facilities where is an airport.
WID_SL_SHIP, ///< 'SHIP' button - list only facilities where is a dock.
WID_SL_FACILALL, ///< 'ALL' button - list all facilities.
WID_STL_TRAIN, ///< 'TRAIN' button - list only facilities where is a railroad station.
WID_STL_TRUCK, ///< 'TRUCK' button - list only facilities where is a truck stop.
WID_STL_BUS, ///< 'BUS' button - list only facilities where is a bus stop.
WID_STL_AIRPLANE, ///< 'AIRPLANE' button - list only facilities where is an airport.
WID_STL_SHIP, ///< 'SHIP' button - list only facilities where is a dock.
WID_STL_FACILALL, ///< 'ALL' button - list all facilities.
WID_SL_NOCARGOWAITING, ///< 'NO' button - list stations where no cargo is waiting.
WID_SL_CARGOALL, ///< 'ALL' button - list all stations.
WID_STL_NOCARGOWAITING, ///< 'NO' button - list stations where no cargo is waiting.
WID_STL_CARGOALL, ///< 'ALL' button - list all stations.
WID_SL_SORTBY, ///< 'Sort by' button - reverse sort direction.
WID_SL_SORTDROPBTN, ///< Dropdown button.
WID_STL_SORTBY, ///< 'Sort by' button - reverse sort direction.
WID_STL_SORTDROPBTN, ///< Dropdown button.
WID_SL_CARGOSTART, ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets).
WID_STL_CARGOSTART, ///< Widget numbers used for list of cargo types (not present in _company_stations_widgets).
};
/** Widgets of the WC_SELECT_STATION. */

32
src/widgets/timetable_widget.h
View File

@@ -13,22 +13,22 @@
#define WIDGETS_TIMETABLE_WIDGET_H
/** Widgets of the WC_VEHICLE_TIMETABLE. */
enum TimetableViewWidgets {
WID_TV_CAPTION, ///< Caption of the window.
WID_TV_ORDER_VIEW, ///< Order view.
WID_TV_TIMETABLE_PANEL, ///< Timetable panel.
WID_TV_ARRIVAL_DEPARTURE_PANEL, ///< Panel with the expected/scheduled arrivals.
WID_TV_SCROLLBAR, ///< Scrollbar for the panel.
WID_TV_SUMMARY_PANEL, ///< Summary panel.
WID_TV_START_DATE, ///< Start date button.
WID_TV_CHANGE_TIME, ///< Change time button.
WID_TV_CLEAR_TIME, ///< Clear time button.
WID_TV_RESET_LATENESS, ///< Reset lateness button.
WID_TV_AUTOFILL, ///< Autofill button.
WID_TV_EXPECTED, ///< Toggle between expected and scheduled arrivals.
WID_TV_SHARED_ORDER_LIST, ///< Show the shared order list.
WID_TV_ARRIVAL_DEPARTURE_SELECTION, ///< Disable/hide the arrival departure panel.
WID_TV_EXPECTED_SELECTION, ///< Disable/hide the expected selection button.
enum VehicleTimetableWidgets {
WID_VT_CAPTION, ///< Caption of the window.
WID_VT_ORDER_VIEW, ///< Order view.
WID_VT_TIMETABLE_PANEL, ///< Timetable panel.
WID_VT_ARRIVAL_DEPARTURE_PANEL, ///< Panel with the expected/scheduled arrivals.
WID_VT_SCROLLBAR, ///< Scrollbar for the panel.
WID_VT_SUMMARY_PANEL, ///< Summary panel.
WID_VT_START_DATE, ///< Start date button.
WID_VT_CHANGE_TIME, ///< Change time button.
WID_VT_CLEAR_TIME, ///< Clear time button.
WID_VT_RESET_LATENESS, ///< Reset lateness button.
WID_VT_AUTOFILL, ///< Autofill button.
WID_VT_EXPECTED, ///< Toggle between expected and scheduled arrivals.
WID_VT_SHARED_ORDER_LIST, ///< Show the shared order list.
WID_VT_ARRIVAL_DEPARTURE_SELECTION, ///< Disable/hide the arrival departure panel.
WID_VT_EXPECTED_SELECTION, ///< Disable/hide the expected selection button.
};
#endif /* WIDGETS_TIMETABLE_WIDGET_H */