diff --git a/build/macosx/platform_specific_code/juce_mac_Windowing.cpp b/build/macosx/platform_specific_code/juce_mac_Windowing.cpp
index eb7fc8bb9b..ee7a44c58f 100644
--- a/build/macosx/platform_specific_code/juce_mac_Windowing.cpp
+++ b/build/macosx/platform_specific_code/juce_mac_Windowing.cpp
@@ -1146,21 +1146,24 @@ public:
         switch (GetEventKind (theEvent))
         {
         case kEventRawKeyDown:
-            keysCurrentlyDown.addIfNotAlreadyThere ((void*) keyCode);
-            handleKeyUpOrDown();
-            lastTextCharacter = textCharacter;
-            handleKeyPress (keyCode, textCharacter);
-            break;
+            {
+                keysCurrentlyDown.addIfNotAlreadyThere ((void*) keyCode);
+                lastTextCharacter = textCharacter;
+
+                const bool used1 = handleKeyUpOrDown();
+                const bool used2 = handleKeyPress (keyCode, textCharacter);
+
+                return (used1 || used2) ? noErr : eventNotHandledErr;
+            }
 
         case kEventRawKeyUp:
             keysCurrentlyDown.removeValue ((void*) keyCode);
-            handleKeyUpOrDown();
             lastTextCharacter = 0;
-            break;
+            return handleKeyUpOrDown() ? noErr : eventNotHandledErr;
 
         case kEventRawKeyRepeat:
-            handleKeyPress (keyCode, lastTextCharacter);
-            break;
+            return handleKeyPress (keyCode, lastTextCharacter) ? noErr
+                                                               : eventNotHandledErr;
 
         case kEventRawKeyModifiersChanged:
             handleModifierKeysChange();
@@ -1182,9 +1185,7 @@ public:
         EventRef originalEvent;
         GetEventParameter (theEvent, kEventParamTextInputSendKeyboardEvent, typeEventRef, 0, sizeof (originalEvent), 0, &originalEvent);
 
-        handleKeyEvent (originalEvent, (juce_wchar) uc);
-
-        return noErr;
+        return handleKeyEvent (originalEvent, (juce_wchar) uc);
     }
 
     OSStatus handleMouseEvent (EventHandlerCallRef callRef, EventRef theEvent)
diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
index 29fc88b3c1..d0c40ca077 100644
--- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp
+++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp
@@ -1549,7 +1549,7 @@ private:
     }
 
     //==============================================================================
-    void doKeyUp (const WPARAM key)
+    bool doKeyUp (const WPARAM key)
     {
         updateKeyModifiers();
 
@@ -1573,12 +1573,13 @@ private:
                 handleModifierKeysChange();
         }
 
-        handleKeyUpOrDown();
+        return handleKeyUpOrDown();
     }
 
-    void doKeyDown (const WPARAM key)
+    bool doKeyDown (const WPARAM key)
     {
         updateKeyModifiers();
+        bool used = false;
 
         switch (key)
         {
@@ -1626,8 +1627,8 @@ private:
             case VK_F14:
             case VK_F15:
             case VK_F16:
-                handleKeyUpOrDown();
-                handleKeyPress (extendedKeyModifier | (int) key, 0);
+                used = handleKeyUpOrDown();
+                used = handleKeyPress (extendedKeyModifier | (int) key, 0) || used;
                 break;
 
             case VK_NUMPAD0:
@@ -1646,11 +1647,11 @@ private:
             case VK_DIVIDE:
             case VK_SEPARATOR:
             case VK_DECIMAL:
-                handleKeyUpOrDown();
+                used = handleKeyUpOrDown();
                 break;
 
             default:
-                handleKeyUpOrDown();
+                used = handleKeyUpOrDown();
 
                 if ((currentModifiers & (ModifierKeys::ctrlModifier | ModifierKeys::altModifier)) != 0)
                 {
@@ -1661,22 +1662,21 @@ private:
                     const UINT keyChar = MapVirtualKeyW (key, 2);
 #endif
 
-                    handleKeyPress ((int) LOWORD (keyChar), 0);
+                    used = handleKeyPress ((int) LOWORD (keyChar), 0) || used;
                 }
 
                 break;
         }
+
+        return used;
     }
 
-    void doKeyChar (int key, const LPARAM flags)
+    bool doKeyChar (int key, const LPARAM flags)
     {
         updateKeyModifiers();
 
-        if ((currentModifiers & ModifierKeys::ctrlModifier) != 0
-             && key <= 31)
-        {
-            return;
-        }
+        if ((currentModifiers & ModifierKeys::ctrlModifier) != 0 && key <= 31)
+            return false;
 
         const juce_wchar textChar = (juce_wchar) key;
         const int virtualScanCode = (flags >> 16) & 0xff;
@@ -1717,7 +1717,7 @@ private:
                 key = (int) keyChar;
         }
 
-        handleKeyPress (key, textChar);
+        return handleKeyPress (key, textChar);
     }
 
     bool doAppCommand (const LPARAM lParam)
@@ -1935,22 +1935,28 @@ private:
                     //==============================================================================
                     case WM_KEYDOWN:
                     case WM_SYSKEYDOWN:
-                        doKeyDown (wParam);
+                        if (doKeyDown (wParam))
+                            return 0;
+
                         break;
 
                     case WM_KEYUP:
                     case WM_SYSKEYUP:
-                        doKeyUp (wParam);
-                        return 0;
+                        if (doKeyUp (wParam))
+                            return 0;
+
+                        break;
+
+                    case WM_CHAR:
+                        if (doKeyChar ((int) wParam, lParam))
+                            return 0;
+
+                        break;
 
                     case WM_APPCOMMAND:
                         if (doAppCommand (lParam))
                             return TRUE;
-                        else
-                            break;
 
-                    case WM_CHAR:
-                        doKeyChar ((int) wParam, lParam);
                         break;
 
                     //==============================================================================
diff --git a/src/juce_appframework/gui/components/juce_Component.cpp b/src/juce_appframework/gui/components/juce_Component.cpp
index 88be25d115..0df37388e6 100644
--- a/src/juce_appframework/gui/components/juce_Component.cpp
+++ b/src/juce_appframework/gui/components/juce_Component.cpp
@@ -113,10 +113,6 @@ static uint32 nextComponentUID = 0;
 Component::Component() throw()
   : parentComponent_ (0),
     componentUID (++nextComponentUID),
-    compX_ (0),
-    compY_ (0),
-    compW_ (0),
-    compH_ (0),
     numDeepMouseListeners (0),
     childComponentList_ (16),
     lookAndFeel_ (0),
@@ -134,10 +130,6 @@ Component::Component (const String& name) throw()
   : componentName_ (name),
     parentComponent_ (0),
     componentUID (++nextComponentUID),
-    compX_ (0),
-    compY_ (0),
-    compW_ (0),
-    compH_ (0),
     numDeepMouseListeners (0),
     childComponentList_ (16),
     lookAndFeel_ (0),
@@ -232,7 +224,7 @@ void Component::setVisible (bool shouldBeVisible)
 
         flags.visibleFlag = shouldBeVisible;
 
-        internalRepaint (0, 0, compW_, compH_);
+        internalRepaint (0, 0, getWidth(), getHeight());
 
         sendFakeMouseMove();
 
@@ -495,8 +487,7 @@ void Component::addToDesktop (int desktopWindowStyleFlags, void* nativeWindowToA
 
             Desktop::getInstance().addDesktopComponent (this);
 
-            compX_ = x;
-            compY_ = y;
+            bounds_.setPosition (x, y);
             peer->setBounds (x, y, getWidth(), getHeight(), false);
 
             peer->setVisible (isVisible());
@@ -769,55 +760,40 @@ bool Component::isAlwaysOnTop() const throw()
 }
 
 //==============================================================================
-const Rectangle Component::getBounds() const throw()
-{
-    return Rectangle (compX_, compY_, compW_, compH_);
-}
-
-int Component::getRight() const throw()
-{
-    return compX_ + compW_;
-}
-
-int Component::getBottom() const throw()
-{
-    return compY_ + compH_;
-}
-
 int Component::proportionOfWidth (const float proportion) const throw()
 {
-    return roundDoubleToInt (proportion * compW_);
+    return roundDoubleToInt (proportion * bounds_.getWidth());
 }
 
 int Component::proportionOfHeight (const float proportion) const throw()
 {
-    return roundDoubleToInt (proportion * compH_);
+    return roundDoubleToInt (proportion * bounds_.getHeight());
 }
 
 int Component::getParentWidth() const throw()
 {
-    return (parentComponent_ != 0) ? parentComponent_->compW_
+    return (parentComponent_ != 0) ? parentComponent_->getWidth()
                                    : getParentMonitorArea().getWidth();
 }
 
 int Component::getParentHeight() const throw()
 {
-    return (parentComponent_ != 0) ? parentComponent_->compH_
+    return (parentComponent_ != 0) ? parentComponent_->getHeight()
                                    : getParentMonitorArea().getHeight();
 }
 
 int Component::getScreenX() const throw()
 {
-    return (parentComponent_ != 0) ? parentComponent_->getScreenX() + compX_
+    return (parentComponent_ != 0) ? parentComponent_->getScreenX() + getX()
                                    : (flags.hasHeavyweightPeerFlag ? getPeer()->getScreenX()
-                                                                   : compX_);
+                                                                   : getX());
 }
 
 int Component::getScreenY() const throw()
 {
-    return (parentComponent_ != 0) ? parentComponent_->getScreenY() + compY_
+    return (parentComponent_ != 0) ? parentComponent_->getScreenY() + getY()
                                    : (flags.hasHeavyweightPeerFlag ? getPeer()->getScreenY()
-                                                                   : compY_);
+                                                                   : getY());
 }
 
 void Component::relativePositionToGlobal (int& x, int& y) const throw()
@@ -832,8 +808,8 @@ void Component::relativePositionToGlobal (int& x, int& y) const throw()
             break;
         }
 
-        x += c->compX_;
-        y += c->compY_;
+        x += c->getX();
+        y += c->getY();
         c = c->parentComponent_;
     }
     while (c != 0);
@@ -850,8 +826,8 @@ void Component::globalPositionToRelative (int& x, int& y) const throw()
         if (parentComponent_ != 0)
             parentComponent_->globalPositionToRelative (x, y);
 
-        x -= compX_;
-        y -= compY_;
+        x -= getX();
+        y -= getY();
     }
 }
 
@@ -872,8 +848,8 @@ void Component::relativePositionToOtherComponent (const Component* const targetC
                 break;
             }
 
-            x += c->compX_;
-            y += c->compY_;
+            x += c->getX();
+            y += c->getY();
             c = c->parentComponent_;
         }
         while (c != 0);
@@ -892,8 +868,8 @@ void Component::setBounds (int x, int y, int w, int h)
     if (w < 0) w = 0;
     if (h < 0) h = 0;
 
-    const bool wasResized  = (compW_ != w || compH_ != h);
-    const bool wasMoved    = (compX_ != x || compY_ != y);
+    const bool wasResized  = (getWidth() != w || getHeight() != h);
+    const bool wasMoved    = (getX() != x || getY() != y);
 
     if (wasMoved || wasResized)
     {
@@ -906,10 +882,7 @@ void Component::setBounds (int x, int y, int w, int h)
                 repaintParent();
         }
 
-        compX_ = x;
-        compY_ = y;
-        compW_ = w;
-        compH_ = h;
+        bounds_.setBounds (x, y, w, h);
 
         if (wasResized)
             repaint();
@@ -1045,21 +1018,21 @@ void Component::setBoundsToFit (int x, int y, int width, int height,
 {
     // it's no good calling this method unless both the component and
     // target rectangle have a finite size.
-    jassert (compW_ > 0 && compH_ > 0 && width > 0 && height > 0);
+    jassert (getWidth() > 0 && getHeight() > 0 && width > 0 && height > 0);
 
-    if (compW_ > 0 && compH_ > 0
+    if (getWidth() > 0 && getHeight() > 0
          && width > 0 && height > 0)
     {
         int newW, newH;
 
-        if (onlyReduceInSize && compW_ <= width && compH_ <= height)
+        if (onlyReduceInSize && getWidth() <= width && getHeight() <= height)
         {
-            newW = compW_;
-            newH = compH_;
+            newW = getWidth();
+            newH = getHeight();
         }
         else
         {
-            const double imageRatio = compH_ / (double) compW_;
+            const double imageRatio = getHeight() / (double) getWidth();
             const double targetRatio = height / (double) width;
 
             if (imageRatio <= targetRatio)
@@ -1098,7 +1071,7 @@ bool Component::hitTest (int x, int y)
             Component* const c = getChildComponent (i);
 
             if (c->isVisible()
-                && c->getBounds().contains (x, y)
+                && c->bounds_.contains (x, y)
                 && c->hitTest (x - c->getX(),
                                y - c->getY()))
             {
@@ -1126,13 +1099,13 @@ void Component::getInterceptsMouseClicks (bool& allowsClicksOnThisComponent,
 
 bool Component::contains (const int x, const int y)
 {
-    if (x >= 0 && y >= 0 && x < compW_ && y < compH_
+    if (x >= 0 && y >= 0 && x < getWidth() && y < getHeight()
          && hitTest (x, y))
     {
         if (parentComponent_ != 0)
         {
-            return parentComponent_->contains (x + compX_,
-                                               y + compY_);
+            return parentComponent_->contains (x + getX(),
+                                               y + getY());
         }
         else if (flags.hasHeavyweightPeerFlag)
         {
@@ -1155,8 +1128,8 @@ bool Component::reallyContains (int x, int y, const bool returnTrueIfWithinAChil
 
     while (p->parentComponent_ != 0)
     {
-        x += p->compX_;
-        y += p->compY_;
+        x += p->getX();
+        y += p->getY();
 
         p = p->parentComponent_;
     }
@@ -1169,15 +1142,15 @@ bool Component::reallyContains (int x, int y, const bool returnTrueIfWithinAChil
 Component* Component::getComponentAt (const int x, const int y)
 {
     if (flags.visibleFlag
-         && x >= 0 && y >= 0 && x < compW_ && y < compH_
+         && x >= 0 && y >= 0 && x < getWidth() && y < getHeight()
          && hitTest (x, y))
     {
         for (int i = childComponentList_.size(); --i >= 0;)
         {
             Component* const child = childComponentList_.getUnchecked(i);
 
-            Component* const c = child->getComponentAt (x - child->compX_,
-                                                        y - child->compY_);
+            Component* const c = child->getComponentAt (x - child->getX(),
+                                                        y - child->getY());
 
             if (c != 0)
                 return c;
@@ -1632,12 +1605,12 @@ void Component::setRepaintsOnMouseActivity (const bool shouldRepaint) throw()
 void Component::repaintParent() throw()
 {
     if (flags.visibleFlag)
-        internalRepaint (0, 0, compW_, compH_);
+        internalRepaint (0, 0, getWidth(), getHeight());
 }
 
 void Component::repaint() throw()
 {
-    repaint (0, 0, compW_, compH_);
+    repaint (0, 0, getWidth(), getHeight());
 }
 
 void Component::repaint (const int x, const int y,
@@ -1661,8 +1634,8 @@ void Component::internalRepaint (int x, int y, int w, int h)
         x = 0;
     }
 
-    if (x + w > compW_)
-        w = compW_ - x;
+    if (x + w > getWidth())
+        w = getWidth() - x;
 
     if (w > 0)
     {
@@ -1672,15 +1645,15 @@ void Component::internalRepaint (int x, int y, int w, int h)
             y = 0;
         }
 
-        if (y + h > compH_)
-            h = compH_ - y;
+        if (y + h > getHeight())
+            h = getHeight() - y;
 
         if (h > 0)
         {
             if (parentComponent_ != 0)
             {
-                x += compX_;
-                y += compY_;
+                x += getX();
+                y += getY();
 
                 if (parentComponent_->flags.visibleFlag)
                     parentComponent_->internalRepaint (x, y, w, h);
@@ -1730,7 +1703,7 @@ void Component::paintEntireComponent (Graphics& originalContext)
                 if (bufferedImage_ == 0)
                 {
                     bufferedImage_ = new Image (flags.opaqueFlag ? Image::RGB : Image::ARGB,
-                                                compW_, compH_, ! flags.opaqueFlag);
+                                                getWidth(), getHeight(), ! flags.opaqueFlag);
 
                     Graphics imG (*bufferedImage_);
                     paint (imG);
@@ -1757,19 +1730,21 @@ void Component::paintEntireComponent (Graphics& originalContext)
         {
             g->saveState();
 
-            if (g->reduceClipRegion (child->getX(), child->getY(), child->getWidth(), child->getHeight()))
+            if (g->reduceClipRegion (child->getX(), child->getY(),
+                                     child->getWidth(), child->getHeight()))
             {
                 for (int j = i + 1; j < childComponentList_.size(); ++j)
                 {
-                    Component* const sibling = childComponentList_.getUnchecked (j);
+                    const Component* const sibling = childComponentList_.getUnchecked (j);
 
                     if (sibling->flags.opaqueFlag && sibling->isVisible())
-                        g->excludeClipRegion (sibling->getX(), sibling->getY(), sibling->getWidth(), sibling->getHeight());
+                        g->excludeClipRegion (sibling->getX(), sibling->getY(), 
+                                              sibling->getWidth(), sibling->getHeight());
                 }
 
                 if (! g->isClipEmpty())
                 {
-                    g->setOrigin (child->compX_, child->compY_);
+                    g->setOrigin (child->getX(), child->getY());
 
                     child->paintEntireComponent (*g);
                 }
@@ -1949,11 +1924,11 @@ void Component::colourChanged()
 //==============================================================================
 const Rectangle Component::getUnclippedArea() const
 {
-    int x = 0, y = 0, w = compW_, h = compH_;
+    int x = 0, y = 0, w = getWidth(), h = getHeight();
 
     Component* p = parentComponent_;
-    int px = compX_;
-    int py = compY_;
+    int px = getX();
+    int py = getY();
 
     while (p != 0)
     {
@@ -1977,7 +1952,7 @@ void Component::clipObscuredRegions (Graphics& g, const Rectangle& clipRect,
 
         if (c->isVisible())
         {
-            Rectangle newClip (clipRect.getIntersection (c->getBounds()));
+            Rectangle newClip (clipRect.getIntersection (c->bounds_));
 
             if (! newClip.isEmpty())
             {
@@ -1990,10 +1965,10 @@ void Component::clipObscuredRegions (Graphics& g, const Rectangle& clipRect,
                 }
                 else
                 {
-                    newClip.translate (-c->compX_, -c->compY_);
+                    newClip.translate (-c->getX(), -c->getY());
                     c->clipObscuredRegions (g, newClip,
-                                            c->compX_ + deltaX,
-                                            c->compY_ + deltaY);
+                                            c->getX() + deltaX,
+                                            c->getY() + deltaY);
                 }
             }
         }
@@ -2041,19 +2016,19 @@ void Component::subtractObscuredRegions (RectangleList& result,
         {
             if (c->isOpaque())
             {
-                Rectangle childBounds (c->getBounds().getIntersection (clipRect));
+                Rectangle childBounds (c->bounds_.getIntersection (clipRect));
                 childBounds.translate (deltaX, deltaY);
 
                 result.subtract (childBounds);
             }
             else
             {
-                Rectangle newClip (clipRect.getIntersection (c->getBounds()));
-                newClip.translate (-c->compX_, -c->compY_);
+                Rectangle newClip (clipRect.getIntersection (c->bounds_));
+                newClip.translate (-c->getX(), -c->getY());
 
                 c->subtractObscuredRegions (result,
-                                            c->compX_ + deltaX,
-                                            c->compY_ + deltaY,
+                                            c->getX() + deltaX,
+                                            c->getY() + deltaY,
                                             newClip,
                                             compToAvoid);
             }
@@ -3481,26 +3456,6 @@ void Component::removeKeyListener (KeyListener* const listenerToRemove) throw()
         keyListeners_->removeValue (listenerToRemove);
 }
 
-void Component::internalKeyPress (const int key, const juce_wchar textCharacter)
-{
-    const KeyPress keyPress (key,
-                             ModifierKeys::getCurrentModifiers().getRawFlags()
-                                & ModifierKeys::allKeyboardModifiers,
-                             textCharacter);
-
-    if (isCurrentlyBlockedByAnotherModalComponent())
-    {
-        Component* const currentModalComp = getCurrentlyModalComponent();
-
-        if (currentModalComp != 0)
-            currentModalComp->keyPressed (keyPress);
-    }
-    else
-    {
-        keyPressed (keyPress);
-    }
-}
-
 void Component::keyPressed (const KeyPress& key)
 {
     const ComponentDeletionWatcher deletionChecker (this);
@@ -3529,11 +3484,6 @@ void Component::keyPressed (const KeyPress& key)
     }
 }
 
-void Component::internalKeyStateChanged()
-{
-    keyStateChanged();
-}
-
 void Component::keyStateChanged()
 {
     const ComponentDeletionWatcher deletionChecker (this);
@@ -3555,11 +3505,32 @@ void Component::keyStateChanged()
     }
 }
 
-void Component::internalModifierKeysChanged()
+bool Component::internalKeyPress (const int key, const juce_wchar textCharacter)
 {
-    sendFakeMouseMove();
+    const KeyPress keyPress (key,
+                             ModifierKeys::getCurrentModifiers().getRawFlags()
+                                & ModifierKeys::allKeyboardModifiers,
+                             textCharacter);
 
-    modifierKeysChanged (ModifierKeys::getCurrentModifiers());
+    if (isCurrentlyBlockedByAnotherModalComponent())
+    {
+        Component* const currentModalComp = getCurrentlyModalComponent();
+
+        if (currentModalComp != 0)
+            currentModalComp->keyPressed (keyPress);
+    }
+    else
+    {
+        keyPressed (keyPress);
+    }
+
+    return true;
+}
+
+bool Component::internalKeyStateChanged()
+{
+    keyStateChanged();
+    return true;
 }
 
 void Component::modifierKeysChanged (const ModifierKeys& modifiers)
@@ -3568,6 +3539,13 @@ void Component::modifierKeysChanged (const ModifierKeys& modifiers)
         parentComponent_->modifierKeysChanged (modifiers);
 }
 
+void Component::internalModifierKeysChanged()
+{
+    sendFakeMouseMove();
+
+    modifierKeysChanged (ModifierKeys::getCurrentModifiers());
+}
+
 //==============================================================================
 bool Component::filesDropped (const StringArray&, int, int)
 {
diff --git a/src/juce_appframework/gui/components/juce_Component.h b/src/juce_appframework/gui/components/juce_Component.h
index 0d93d3ea4c..96cbd0a361 100644
--- a/src/juce_appframework/gui/components/juce_Component.h
+++ b/src/juce_appframework/gui/components/juce_Component.h
@@ -296,7 +296,7 @@ public:
 
         @see getScreenX
     */
-    inline int getX() const throw()                         { return compX_; }
+    inline int getX() const throw()                         { return bounds_.getX(); }
 
     /** Returns the y co-ordinate of the top of this component.
 
@@ -304,31 +304,31 @@ public:
 
         @see getScreenY
     */
-    inline int getY() const throw()                         { return compY_; }
+    inline int getY() const throw()                         { return bounds_.getY(); }
 
     /** Returns the component's width in pixels. */
-    inline int getWidth() const throw()                     { return compW_; }
+    inline int getWidth() const throw()                     { return bounds_.getWidth(); }
 
     /** Returns the component's height in pixels. */
-    inline int getHeight() const throw()                    { return compH_; }
+    inline int getHeight() const throw()                    { return bounds_.getHeight(); }
 
     /** Returns the x co-ordinate of the component's right-hand edge.
 
         This is a distance in pixels from the left edge of the component's parent.
     */
-    int getRight() const throw();
+    int getRight() const throw()                            { return bounds_.getRight(); }
 
     /** Returns the y co-ordinate of the bottom edge of this component.
 
         This is a distance in pixels from the top edge of the component's parent.
     */
-    int getBottom() const throw();
+    int getBottom() const throw()                           { return bounds_.getBottom(); }
 
     /** Returns this component's bounding box.
 
         The rectangle returned is relative to the top-left of the component's parent.
     */
-    const Rectangle getBounds() const throw();
+    const Rectangle& getBounds() const throw()              { return bounds_; }
 
     /** Returns the region of this component that's not obscured by other, opaque components.
 
@@ -1978,7 +1978,7 @@ private:
     String componentName_;
     Component* parentComponent_;
     uint32 componentUID;
-    int compX_, compY_, compW_, compH_;
+    Rectangle bounds_;
     unsigned short numDeepMouseListeners;
     Array <Component*> childComponentList_;
     LookAndFeel* lookAndFeel_;
@@ -2031,8 +2031,8 @@ private:
     void internalFocusLoss (const FocusChangeType cause);
     void internalChildFocusChange (FocusChangeType cause);
     void internalModalInputAttempt();
-    void internalKeyPress (const int key, const juce_wchar textCharacter);
-    void internalKeyStateChanged();
+    bool internalKeyPress (const int key, const juce_wchar textCharacter);
+    bool internalKeyStateChanged();
     void internalModifierKeysChanged();
     void internalChildrenChanged();
     void internalHierarchyChanged();
diff --git a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp
index f80a32a9bf..aa2f9d4c5c 100644
--- a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp
+++ b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp
@@ -343,10 +343,10 @@ void ComponentPeer::sendFakeMouseMove() throw()
          && component->flags.hasHeavyweightPeerFlag
          && ! ModifierKeys::getCurrentModifiers().isAnyMouseButtonDown())
     {
-        getBounds (component->compX_,
-                   component->compY_,
-                   component->compW_,
-                   component->compH_);
+        int realX, realY, realW, realH;
+        getBounds (realX, realY, realW, realH);
+
+        component->bounds_.setBounds (realX, realY, realW, realH);
 
         int x, y;
         component->getMouseXYRelative (x, y);
@@ -403,25 +403,23 @@ void ComponentPeer::handlePaint (LowLevelGraphicsContext& contextToPaintTo)
 #endif
 }
 
-void ComponentPeer::handleKeyPress (const int keyCode,
+bool ComponentPeer::handleKeyPress (const int keyCode,
                                     const juce_wchar textCharacter)
 {
     updateCurrentModifiers();
 
-    if (Component::currentlyFocusedComponent->isValidComponent())
-        Component::currentlyFocusedComponent->internalKeyPress (keyCode, textCharacter);
-    else
-        component->internalKeyPress (keyCode, textCharacter);
+    return (Component::currentlyFocusedComponent->isValidComponent()
+                ? Component::currentlyFocusedComponent : component)
+              ->internalKeyPress (keyCode, textCharacter);
 }
 
-void ComponentPeer::handleKeyUpOrDown()
+bool ComponentPeer::handleKeyUpOrDown()
 {
     updateCurrentModifiers();
 
-    if (Component::currentlyFocusedComponent->isValidComponent())
-        Component::currentlyFocusedComponent->internalKeyStateChanged();
-    else
-        component->internalKeyStateChanged();
+    return (Component::currentlyFocusedComponent->isValidComponent() 
+                ? Component::currentlyFocusedComponent : component)
+              ->internalKeyStateChanged();
 }
 
 void ComponentPeer::handleModifierKeysChange()
@@ -468,15 +466,12 @@ void ComponentPeer::handleMovedOrResized()
         int realX, realY, realW, realH;
         getBounds (realX, realY, realW, realH);
 
-        const bool wasMoved   = (component->compX_ != realX || component->compY_ != realY);
-        const bool wasResized = (component->compW_ != realW || component->compH_ != realH);
+        const bool wasMoved   = (component->getX() != realX || component->getY() != realY);
+        const bool wasResized = (component->getWidth() != realW || component->getHeight() != realH);
 
         if (wasMoved || wasResized)
         {
-            component->compX_ = realX;
-            component->compY_ = realY;
-            component->compW_ = realW;
-            component->compH_ = realH;
+            component->bounds_.setBounds (realX, realY, realW, realH);
 
             if (wasResized)
                 component->repaint();
diff --git a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h
index 5651c1e356..7aae0e1780 100644
--- a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h
+++ b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h
@@ -255,12 +255,15 @@ public:
     /** Called when a key is pressed.
 
         For keycode info, see the KeyPress class.
+        Returns true if the keystroke was used. 
     */
-    void handleKeyPress (const int keyCode,
+    bool handleKeyPress (const int keyCode,
                          const juce_wchar textCharacter);
 
-    /** Called whenever a key is pressed or released. */
-    void handleKeyUpOrDown();
+    /** Called whenever a key is pressed or released. 
+        Returns true if the keystroke was used.
+    */
+    bool handleKeyUpOrDown();
 
     /** Called whenever a modifier key is pressed or released. */
     void handleModifierKeysChange();