commit f2c204ccca3b93b318cda3aebf29592aa30385e4
Merge: f3afff09 e10af521
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Sep 8 19:10:40 2013 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Sep 8 19:10:40 2013 +0000
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2639
codeblocks/setup-res.rc | 2 --
src/i_oplmusic.c | 6 +++---
src/midifile.c | 2 +-
textscreen/txt_fileselect.c | 25 ++++++++++++++++++++++-
textscreen/txt_window.h | 50 +++++++++++++++++++++++++++++----------------
5 files changed, 60 insertions(+), 25 deletions(-)
diff --cc codeblocks/setup-res.rc
index 6199cfd6,18dd120e..38f70c8d
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@@ -1,10 -1,8 +1,8 @@@
1 ICON "../data/setup.ico"
- CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
-
1 VERSIONINFO
-PRODUCTVERSION 1,7,0,0
-FILEVERSION 1,7,0,0
+PRODUCTVERSION 1,99,0,0
+FILEVERSION 1,99,0,0
FILETYPE 1
{
BLOCK "StringFileInfo"
diff --cc textscreen/txt_window.h
index bfae2a9a,19440941..8b1e1fb9
--- a/textscreen/txt_window.h
+++ b/textscreen/txt_window.h
@@@ -176,16 -191,6 +191,15 @@@ void TXT_SetMouseListener(txt_window_t
TxtWindowMousePress mouse_listener,
void *user_data);
-#endif /* #ifndef TXT_WINDOW_H */
+/**
+ * Open a window displaying a message.
+ *
+ * @param title Title of the window.
+ * @param message The message to display in the window.
+ * @return The new window.
+ */
+
+txt_window_t *TXT_MessageBox(char *title, char *message, ...);
- #endif /* #ifndef TXT_WINDOW_T */
-
++#endif /* #ifndef TXT_WINDOW_H */