mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

Minor tweaks to MidiMessage, Label. Removed some intel compiler warnings.

Browse source
This commit is contained in:
Julian Storer 2011-01-20 14:23:46 +00:00
parent 7bfa419f17
commit 0a9cbd36c4
24 changed files with 207 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/gui/components/controls/juce_Label.cpp
View file

@ -230,18 +230,17 @@ void Label::showEditor()
}
}
void Label::editorShown (TextEditor* /*editorComponent*/)
void Label::editorShown (TextEditor*)
{
}
void Label::editorAboutToBeHidden (TextEditor* /*editorComponent*/)
void Label::editorAboutToBeHidden (TextEditor*)
{
}
bool Label::updateFromTextEditorContents()
bool Label::updateFromTextEditorContents (TextEditor& ed)
{
jassert (editor != 0);
const String newText (editor->getText());
const String newText (ed.getText());
if (textValue.toString() != newText)
{
@ -266,12 +265,13 @@ void Label::hideEditor (const bool discardCurrentEditorContents)
{
WeakReference<Component> deletionChecker (this);
editorAboutToBeHidden (editor);
ScopedPointer<TextEditor> outgoingEditor (editor);
editorAboutToBeHidden (outgoingEditor);
const bool changed = (! discardCurrentEditorContents)
&& updateFromTextEditorContents();
editor = 0;
&& updateFromTextEditorContents (*outgoingEditor);
outgoingEditor = 0;
repaint();
if (changed)
@ -441,9 +441,8 @@ void Label::textEditorReturnKeyPressed (TextEditor& ed)
if (editor != 0)
{
jassert (&ed == editor);
(void) ed;
const bool changed = updateFromTextEditorContents();
const bool changed = updateFromTextEditorContents (ed);
hideEditor (true);
if (changed)