- Changed I_GetFromClipboard() to return an FString.
SVN r1414 (trunk)
This commit is contained in:
parent
be165578ea
commit
025e36ee41
8 changed files with 32 additions and 27 deletions
|
|
@ -596,7 +596,7 @@ void I_PutInClipboard (const char *str)
|
|||
#endif
|
||||
}
|
||||
|
||||
char *I_GetFromClipboard ()
|
||||
FString I_GetFromClipboard ()
|
||||
{
|
||||
#ifndef NO_GTK
|
||||
if (GtkAvailable)
|
||||
|
|
@ -607,12 +607,12 @@ char *I_GetFromClipboard ()
|
|||
gchar *text = gtk_clipboard_wait_for_text(clipboard);
|
||||
if (text != NULL)
|
||||
{
|
||||
char *copy = copystring(text);
|
||||
FString copy(text);
|
||||
g_free(text);
|
||||
return copy;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return NULL;
|
||||
return "";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue