From b2515db681d3ae1cb588260265579676a8d968fc Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Thu, 9 Aug 2007 13:30:12 +0000
Subject: [PATCH]

---
 .../gui/components/controls/juce_TextEditor.cpp        | 10 ++++++----
 .../filebrowser/juce_FileBrowserComponent.cpp          |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp b/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
index d8aec5aab4..3aa2c77fbd 100644
--- a/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
+++ b/src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
@@ -746,7 +746,7 @@ public:
                             const Font& font_,
                             const Colour& colour_,
                             const int oldCaretPos_,
-                            const int newCaretPos_)
+                            const int newCaretPos_) throw()
         : owner (owner_),
           text (text_),
           insertIndex (insertIndex_),
@@ -795,7 +795,7 @@ public:
                             const int endIndex_,
                             const int oldCaretPos_,
                             const int newCaretPos_,
-                            const VoidArray& removedSections_)
+                            const VoidArray& removedSections_) throw()
         : owner (owner_),
           startIndex (startIndex_),
           endIndex (endIndex_),
@@ -1873,7 +1873,8 @@ bool TextEditor::keyPressed (const KeyPress& key)
 
         cut();
     }
-    else if (key == KeyPress (T('c'), ModifierKeys::commandModifier, 0))
+    else if (key == KeyPress (T('c'), ModifierKeys::commandModifier, 0)
+              || key == KeyPress (KeyPress::insertKey, ModifierKeys::ctrlModifier, 0))
     {
         newTransaction();
         copy();
@@ -1884,7 +1885,8 @@ bool TextEditor::keyPressed (const KeyPress& key)
         copy();
         cut();
     }
-    else if (key == KeyPress (T('v'), ModifierKeys::commandModifier, 0))
+    else if (key == KeyPress (T('v'), ModifierKeys::commandModifier, 0)
+              || key == KeyPress (KeyPress::insertKey, ModifierKeys::shiftModifier, 0))
     {
         newTransaction();
         paste();
diff --git a/src/juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.cpp b/src/juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.cpp
index 954c5c7be3..ae48ad54dd 100644
--- a/src/juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.cpp
+++ b/src/juce_appframework/gui/components/filebrowser/juce_FileBrowserComponent.cpp
@@ -103,7 +103,7 @@ FileBrowserComponent::FileBrowserComponent (FileChooserMode mode_,
 
     fileListComponent->addListener (this);
 
-    addAndMakeVisible (currentPathBox = new ComboBox (T("path")));
+    addAndMakeVisible (currentPathBox = new ComboBox ("path"));
     currentPathBox->setEditableText (true);
 
     StringArray rootNames, rootPaths;
@@ -127,12 +127,12 @@ FileBrowserComponent::FileBrowserComponent (FileChooserMode mode_,
     filenameBox->addListener (this);
     filenameBox->setReadOnly (filenameTextBoxIsReadOnly);
 
-    Label* label = new Label (T("f"), (mode == chooseDirectoryMode) ? TRANS("folder:")
-                                                                    : TRANS("file:"));
+    Label* label = new Label ("f", (mode == chooseDirectoryMode) ? TRANS("folder:")
+                                                                 : TRANS("file:"));
     addAndMakeVisible (label);
     label->attachToComponent (filenameBox, true);
 
-    addAndMakeVisible (goUpButton = new DrawableButton (T("up"), DrawableButton::ImageOnButtonBackground));
+    addAndMakeVisible (goUpButton = new DrawableButton ("up", DrawableButton::ImageOnButtonBackground));
     Path arrowPath;
     arrowPath.addArrow (50.0f, 100.0f, 50.0f, 0.0, 40.0f, 100.0f, 50.0f);
     DrawablePath arrowImage;