Applied patch #1175374 ("FluidSynth MIDI driver"), with a few documentation

changes. There are a few things that could use a bit more work, and I've
only tested it on my Linux box. I have verified that ScummVM still compiles
when it's disabled, though, so it shouldn't break anything too badly.

svn-id: r17512

1 files changed, 29 insertions, 5 deletions

diff --git a/gui/browser.h b/gui/browser.h
index 97b573f1ee..46b3512fe7 100644
--- a/gui/browser.h
+++ b/gui/browser.h
@@ -34,14 +34,16 @@ namespace GUI {
 class ListWidget;
 class StaticTextWidget;
 
-class BrowserDialog : public Dialog {
+// TODO: Common parent class for DirBrowserDialog and FileBrowserDialog
+
+class DirBrowserDialog : public Dialog {
 	typedef Common::String String;
 	typedef Common::StringList StringList;
 public:
-	BrowserDialog(const char *title);
+	DirBrowserDialog(const char *title);
 
 #ifdef MACOSX
-	~BrowserDialog();
+	~DirBrowserDialog();
 	virtual int runModal();
 #else
 	virtual void open();
@@ -50,13 +52,12 @@ public:
 
 	const FilesystemNode	&getResult() { return _choice; }
 
-
 protected:
 #ifdef MACOSX
 	CFStringRef		_titleRef;
 #else
 	ListWidget		*_fileList;
-	StaticTextWidget*_currentPath;
+	StaticTextWidget	*_currentPath;
 	FilesystemNode	_node;
 	FSList			_nodeContent;
 #endif
@@ -67,6 +68,29 @@ protected:
 #endif
 };
 
+// TODO: MACOSX version
+
+class FileBrowserDialog : public Dialog {
+	typedef Common::String String;
+	typedef Common::StringList StringList;
+public:
+	FileBrowserDialog(const char *title);
+
+	virtual void open();
+	virtual void handleCommand(CommandSender *sender, uint32 cmd, uint32 data);
+
+	const FilesystemNode &getResult() { return _choice; }
+
+protected:
+	ListWidget *_fileList;
+	StaticTextWidget *_currentPath;
+	FilesystemNode _node;
+	FSList _nodeContent;
+	FilesystemNode _choice;
+
+	void updateListing();
+};
+
 } // End of namespace GUI
 
 #endif