openttd updated to 1.5.0-beta2
--HG-- branch : openttd
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
/* $Id: osk_gui.cpp 25678 2013-08-05 20:37:02Z michi_cc $ */
|
||||
/* $Id: osk_gui.cpp 26538 2014-04-28 21:06:51Z rubidium $ */
|
||||
|
||||
/*
|
||||
* This file is part of OpenTTD.
|
||||
@@ -23,6 +23,8 @@
|
||||
#include "table/sprites.h"
|
||||
#include "table/strings.h"
|
||||
|
||||
#include "safeguards.h"
|
||||
|
||||
char _keyboard_opt[2][OSK_KEYBOARD_ENTRIES * 4 + 1];
|
||||
static WChar _keyboard[2][OSK_KEYBOARD_ENTRIES];
|
||||
|
||||
@@ -57,7 +59,7 @@ struct OskWindow : public Window {
|
||||
this->querystrings[WID_OSK_TEXT] = this->qs;
|
||||
|
||||
/* make a copy in case we need to reset later */
|
||||
this->orig_str_buf = strdup(this->qs->text.buf);
|
||||
this->orig_str_buf = stredup(this->qs->text.buf);
|
||||
|
||||
this->InitNested(0);
|
||||
this->SetFocusedWidget(WID_OSK_TEXT);
|
||||
@@ -206,7 +208,7 @@ struct OskWindow : public Window {
|
||||
|
||||
virtual void OnFocusLost()
|
||||
{
|
||||
_video_driver->EditBoxLostFocus();
|
||||
VideoDriver::GetInstance()->EditBoxLostFocus();
|
||||
delete this;
|
||||
}
|
||||
};
|
||||
@@ -428,7 +430,7 @@ void UpdateOSKOriginalText(const Window *parent, int button)
|
||||
if (osk == NULL || osk->parent != parent || osk->text_btn != button) return;
|
||||
|
||||
free(osk->orig_str_buf);
|
||||
osk->orig_str_buf = strdup(osk->qs->text.buf);
|
||||
osk->orig_str_buf = stredup(osk->qs->text.buf);
|
||||
|
||||
osk->SetDirty();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user