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

Browse source
This commit is contained in:
jules 2007-12-11 20:06:53 +00:00
parent a862fc6997
commit fe3524b443
3 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/juce_appframework/gui/components/controls/juce_TextEditor.cpp
View file

@ -219,9 +219,19 @@ public:
String s;
s.preallocateStorage (getTotalLength());
for (int i = 0; i < atoms.size(); ++i)
s += getAtom(i)->atomText;
tchar* endOfString = (tchar*) &(s[0]);
for (int i = 0; i < atoms.size(); ++i)
{
const TextAtom* const atom = getAtom(i);
memcpy (endOfString, &(atom->atomText[0]), atom->numChars * sizeof (tchar));
endOfString += atom->numChars;
}
*endOfString = 0;
jassert ((endOfString - (tchar*) &(s[0])) <= getTotalLength());
return s;
}

7
src/juce_appframework/gui/components/juce_Component.cpp
View file

@ -250,7 +250,10 @@ void Component::setVisible (bool shouldBeVisible)
jassert (peer != 0);
if (peer != 0)
{
peer->setVisible (shouldBeVisible);
internalHierarchyChanged();
}
}
}
}
@ -876,8 +879,8 @@ void Component::setBounds (int x, int y, int w, int h)
const bool wasMoved = (getX() != x || getY() != y);
#ifdef JUCE_DEBUG
// It's a very bad idea to try to resize a component during its paint() method!
jassert (! (flags.isInsidePaintCall && wasResized));
// It's a very bad idea to try to resize a window during its paint() method!
jassert (! (flags.isInsidePaintCall && wasResized && isOnDesktop()));
#endif
if (wasMoved || wasResized)

3
src/juce_core/io/network/juce_Socket.cpp
View file

@ -270,7 +270,10 @@ static bool connectSocket (int volatile& handle,
#endif
{
if (waitForReadiness (handle, false, timeOutMillisecs) != 1)
{
setSocketBlockingState (handle, true);
return false;
}
}
}