cpp/openttd-patchpack/source Changeset - r16920:64027320d024

Changeset - r16920:64027320d024

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

alberth - 14 years ago 2010-12-30 13:16:31
alberth@openttd.org

(svn r21665) -Codechange: Make GetCallbackWnd a method of _thd.

5 files changed with 17 insertions and 12 deletions:

src/industry_gui.cpp

src/tilehighlight_type.h

src/viewport.cpp

src/window.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -482,7 +482,7 @@ public: @@
 					this->SetDirty();
 					if (GetCallbackWnd() == this &&
+					if (_thd.GetCallbackWnd() == this &&
 							((_game_mode != GM_EDITOR && _settings_game.construction.raw_industry_construction == 2 && indsp != NULL && indsp->IsRawIndustry()) ||
 							this->selected_type == INVALID_INDUSTRYTYPE ||
 							!this->enabled[this->selected_index])) {

src/tilehighlight_type.h

➞

Show inline comments

@@ @@ -75,6 +75,7 @@ struct TileHighlightData { @@
 	ViewportDragDropSelectionProcess select_proc; ///< The procedure that has to be called when the selection is done.
 	bool IsDraggingDiagonal();
 	Window *GetCallbackWnd();
 };
 #endif /* TILEHIGHLIGHT_TYPE_H */

src/viewport.cpp

➞

Show inline comments

@@ @@ -1871,7 +1871,7 @@ static void PlaceObject() @@
 	_tile_fract_coords.x = pt.x & TILE_UNIT_MASK;
 	_tile_fract_coords.y = pt.y & TILE_UNIT_MASK;
 	w = GetCallbackWnd();
+	w = _thd.GetCallbackWnd();
 	if (w != NULL) w->OnPlaceObject(pt, TileVirtXY(pt.x, pt.y));
+}
@@ @@ -2017,6 +2017,17 @@ bool TileHighlightData::IsDraggingDiagon @@
+}
 /**
  * Get the window that started the current highlighting.
  * @return The window that requested the current tile highlighting, or \c NULL if not available.
  */
 Window *TileHighlightData::GetCallbackWnd()
+{
 	return FindWindowById(this->window_class, this->window_number);
+}
 /**
  * Updates tile highlighting for all cases.
  * Uses _thd.selstart and _thd.selend and _thd.place_mode (set elsewhere) to determine _thd.pos and _thd.size
  * Also drawstyle is determined. Uses _thd.new.* as a buffer and calls SetSelectionTilesDirty() twice,

src/window.cpp

➞

Show inline comments

@@ @@ -1400,16 +1400,11 @@ static void DecreaseWindowCounters() @@
+	}
+}
 Window *GetCallbackWnd()
+{
 	return FindWindowById(_thd.window_class, _thd.window_number);
+}
 static void HandlePlacePresize()
+{
 	if (_special_mouse_mode != WSM_PRESIZE) return;
 	Window *w = GetCallbackWnd();
+	Window *w = _thd.GetCallbackWnd();
 	if (w == NULL) return;
 	Point pt = GetTileBelowCursor();
@@ @@ -1430,7 +1425,7 @@ static EventState HandleDragDrop() @@
 	if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED;
 	if (_left_button_down) return ES_HANDLED;
 	Window *w = GetCallbackWnd();
+	Window *w = _thd.GetCallbackWnd();
 	if (w != NULL) {
 		/* send an event in client coordinates. */
@@ @@ -1454,7 +1449,7 @@ static EventState HandleMouseDrag() @@
 	if (_special_mouse_mode != WSM_DRAGDROP) return ES_NOT_HANDLED;
 	if (!_left_button_down || (_cursor.delta.x == 0 && _cursor.delta.y == 0)) return ES_NOT_HANDLED;
 	Window *w = GetCallbackWnd();
+	Window *w = _thd.GetCallbackWnd();
 	if (w != NULL) {
 		/* Send an event in client coordinates. */

src/window_gui.h

➞

Show inline comments

@@ @@ -821,8 +821,6 @@ enum SpecialMouseMode { @@
 };
 extern SpecialMouseMode _special_mouse_mode;
 Window *GetCallbackWnd();
 void SetFocusedWindow(Window *w);
 void ScrollbarClickHandler(Window *w, NWidgetCore *nw, int x, int y);

0 comments (0 inline, 0 general)