cpp/openttd-patchpack/source Changeset - r20632:a581af2bcbeb

Changeset - r20632:a581af2bcbeb

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

michi_cc - 11 years ago 2013-08-05 20:36:32
michi_cc@openttd.org

(svn r25670) -Codechange: Pass UCS-4 characters to the edit box key handler.

4 files changed with 4 insertions and 4 deletions:

src/textbuf.cpp

src/textbuf_type.h

src/window.cpp

src/window_gui.h

0 comments (0 inline, 0 general)

src/textbuf.cpp

➞

Show inline comments

@@ @@ -362,7 +362,7 @@ bool Textbuf::HandleCaret() @@
 	return false;
+}
-HandleKeyPressResult Textbuf::HandleKeyPress(uint16 key, uint16 keycode)
+HandleKeyPressResult Textbuf::HandleKeyPress(WChar key, uint16 keycode)
+{
 	bool edited = false;

src/textbuf_type.h

➞

Show inline comments

@@ @@ -56,7 +56,7 @@ struct Textbuf { @@
 	bool DeleteChar(uint16 keycode);
 	bool MovePos(uint16 keycode);
-	HandleKeyPressResult HandleKeyPress(uint16 key, uint16 keycode);
+	HandleKeyPressResult HandleKeyPress(WChar key, uint16 keycode);
 	bool HandleCaret();
 	void UpdateSize();

src/window.cpp

➞

Show inline comments

@@ @@ -2378,7 +2378,7 @@ static bool MaybeBringWindowToFront(Wind @@
  * @return #ES_HANDLED if the key press has been handled and no other
  *         window should receive the event.
  */
-EventState Window::HandleEditBoxKey(int wid, uint16 key, uint16 keycode)
+EventState Window::HandleEditBoxKey(int wid, WChar key, uint16 keycode)
+{
 	QueryString *query = this->GetQueryString(wid);
 	if (query == NULL) return ES_NOT_HANDLED;

src/window_gui.h

➞

Show inline comments

@@ @@ -488,7 +488,7 @@ public: @@
 	void UnfocusFocusedWidget();
 	bool SetFocusedWidget(int widget_index);
-	EventState HandleEditBoxKey(int wid, uint16 key, uint16 keycode);
+	EventState HandleEditBoxKey(int wid, WChar key, uint16 keycode);
 	void HandleButtonClick(byte widget);
 	int GetRowFromWidget(int clickpos, int widget, int padding, int line_height = -1) const;

0 comments (0 inline, 0 general)