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

Merge branch 'tracerestrict' into tracerestrict-sx

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-08-01 17:15:35 +01:00
parent d99ebb4976 804cfad053
commit c562e7c6fb
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/stdafx.h
View File

@@ -514,4 +514,15 @@ static inline void free(const void *ptr)
#define IGNORE_UNINITIALIZED_WARNING_STOP #define IGNORE_UNINITIALIZED_WARNING_STOP
#endif #endif
/*
* Conditional define for the override keyword.
* Use of the override keyword can prevent various types of problems when the base method signature is changed, but derived overriding methods are not
* This is conditional to maintain compatibility with legacy compilers
*/
#if __cplusplus >= 201103L || defined(__STDCXX_VERSION__) || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
#define OVERRIDE override
#else
#define OVERRIDE
#endif
#endif /* STDAFX_H */ #endif /* STDAFX_H */

22
src/tracerestrict_gui.cpp
View File

@@ -594,7 +594,7 @@ public:
this->ReloadProgramme(); this->ReloadProgramme();
} }
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count) OVERRIDE
{ {
switch (widget) { switch (widget) {
case TR_WIDGET_INSTRUCTION_LIST: { case TR_WIDGET_INSTRUCTION_LIST: {
@@ -778,7 +778,7 @@ public:
} }
} }
virtual void OnQueryTextFinished(char *str) virtual void OnQueryTextFinished(char *str) OVERRIDE
{ {
if (StrEmpty(str)) { if (StrEmpty(str)) {
return; return;
@@ -801,7 +801,7 @@ public:
TraceRestrictDoCommandP(tile, track, TRDCT_MODIFY_ITEM, this->selected_instruction - 1, item, STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM); TraceRestrictDoCommandP(tile, track, TRDCT_MODIFY_ITEM, this->selected_instruction - 1, item, STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM);
} }
virtual void OnDropdownSelect(int widget, int index) virtual void OnDropdownSelect(int widget, int index) OVERRIDE
{ {
TraceRestrictItem item = GetSelected(); TraceRestrictItem item = GetSelected();
if (item == 0 || index < 0 || this->selected_instruction < 1) { if (item == 0 || index < 0 || this->selected_instruction < 1) {
@@ -875,7 +875,7 @@ public:
} }
} }
virtual void OnPlaceObject(Point pt, TileIndex tile) virtual void OnPlaceObject(Point pt, TileIndex tile) OVERRIDE
{ {
int widget = this->current_placement_widget; int widget = this->current_placement_widget;
this->current_placement_widget = -1; this->current_placement_widget = -1;
@@ -996,13 +996,13 @@ public:
TraceRestrictDoCommandP(this->tile, this->track, TRDCT_MODIFY_ITEM, this->selected_instruction - 1, item, STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM); TraceRestrictDoCommandP(this->tile, this->track, TRDCT_MODIFY_ITEM, this->selected_instruction - 1, item, STR_TRACE_RESTRICT_ERROR_CAN_T_MODIFY_ITEM);
} }
virtual void OnPlaceObjectAbort() virtual void OnPlaceObjectAbort() OVERRIDE
{ {
this->RaiseButtons(); this->RaiseButtons();
this->current_placement_widget = -1; this->current_placement_widget = -1;
} }
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) OVERRIDE
{ {
switch (widget) { switch (widget) {
case TR_WIDGET_INSTRUCTION_LIST: case TR_WIDGET_INSTRUCTION_LIST:
@@ -1012,18 +1012,18 @@ public:
} }
} }
virtual void OnResize() virtual void OnResize() OVERRIDE
{ {
/* Update the scroll bar */ /* Update the scroll bar */
this->vscroll->SetCapacityFromWidget(this, TR_WIDGET_INSTRUCTION_LIST); this->vscroll->SetCapacityFromWidget(this, TR_WIDGET_INSTRUCTION_LIST);
} }
virtual void OnPaint() virtual void OnPaint() OVERRIDE
{ {
this->DrawWidgets(); this->DrawWidgets();
} }
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const OVERRIDE
{ {
if (widget != TR_WIDGET_INSTRUCTION_LIST) return; if (widget != TR_WIDGET_INSTRUCTION_LIST) return;
@@ -1059,14 +1059,14 @@ public:
} }
} }
virtual void OnInvalidateData(int data, bool gui_scope) virtual void OnInvalidateData(int data, bool gui_scope) OVERRIDE
{ {
if (gui_scope) { if (gui_scope) {
this->ReloadProgramme(); this->ReloadProgramme();
} }
} }
virtual void SetStringParameters(int widget) const virtual void SetStringParameters(int widget) const OVERRIDE
{ {
switch (widget) { switch (widget) {
case TR_WIDGET_VALUE_INT: { case TR_WIDGET_VALUE_INT: {