[Scummvm-cvs-logs] scummvm-tools master -> 516ff25a1453d02fc9d8a3df64d8ffc8a60e8c27

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
516ff25a14 TOOLS: Fix extra input page for compression tools


Commit: 516ff25a1453d02fc9d8a3df64d8ffc8a60e8c27
    https://github.com/scummvm/scummvm-tools/commit/516ff25a1453d02fc9d8a3df64d8ffc8a60e8c27
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2013-03-01T13:04:24-08:00

Commit Message:
TOOLS: Fix extra input page for compression tools

The help string was too long (it included all the compression options
which are irrelevant for this page) and as a result the widgets to select
the input file were outside the window and the input selection could
not be done.

Changed paths:
    NEWS
    gui/gui_tools.cpp



diff --git a/NEWS b/NEWS
index c7becdb..ce42f4d 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,9 @@ For a more comprehensive changelog of the latest experimental code, see:
    the .idx file. This ensures that no sound starts at offset 0, since that is
    interpreted as the sound missing. This fixes the first line of speech when
    Rincewind wakes up at the beginning of Discworld 1.
+ - Fix too long help string for compression tools in the extra input file
+   selection which made the file selection impossible because the widgets
+   were outside the window.
 
 1.4.0 (2011-11-11)
  - Updated the compress_sci tool to add support for compressing the AUDIO001.002
diff --git a/gui/gui_tools.cpp b/gui/gui_tools.cpp
index f7a273f..8b98693 100644
--- a/gui/gui_tools.cpp
+++ b/gui/gui_tools.cpp
@@ -110,7 +110,10 @@ wxString ToolGUI::getName() const {
 }
 
 wxString ToolGUI::getHelp() const {
-	return wxString(_backend->getHelp().c_str(), wxConvUTF8);
+	// Here we want the single line help from the tool, not the extended
+	// help CompressionTool might for example give (and which would not
+	// fit in the window).
+	return wxString(_backend->Tool::getHelp().c_str(), wxConvUTF8);
 }
 
 wxString ToolGUI::getShortHelp() const {