瀏覽代碼

Fix uninit vars in gui

Ben Payne 10 年之前
父節點
當前提交
2fc1ac4816

+ 5 - 0
Engine/source/gui/containers/guiRolloutCtrl.cpp

@@ -56,6 +56,10 @@ IMPLEMENT_CALLBACK( GuiRolloutCtrl, onCollapsed, void, (), (),
 //-----------------------------------------------------------------------------
 
 GuiRolloutCtrl::GuiRolloutCtrl()
+ : mHeader(0,0,0,0),
+   mExpanded(0,0,0,0),
+   mChildRect(0,0,0,0),
+   mMargin(0,0,0,0)
 {
    mExpanded.set(0,0,200,60);
    mCaption             = StringTable->EmptyString();
@@ -70,6 +74,7 @@ GuiRolloutCtrl::GuiRolloutCtrl()
    mIsContainer = true;
    mCanCollapse = true;
    mAutoCollapseSiblings = false;
+   mHasTexture = false;
    // Make sure we receive our ticks.
    setProcessTicks();
 }

+ 3 - 2
Engine/source/gui/containers/guiScrollCtrl.cpp

@@ -72,8 +72,9 @@ GuiScrollCtrl::GuiScrollCtrl()
    mAnimating( false ),
    mScrollAnimSpeed( -1 ),
    mScrollTargetPos( -1, -1 ),
-	mChildExt(0, 0),
-	mChildPos(0, 0)
+   mChildExt(0, 0),
+   mChildPos(0, 0),
+   mBaseThumbSize(0)
 {
    mIsContainer = true;
    setExtent(200,200);

+ 1 - 1
Engine/source/gui/containers/guiWindowCtrl.cpp

@@ -98,10 +98,10 @@ GuiWindowCtrl::GuiWindowCtrl()
    mMouseMovingWin = false;
    mMouseResizeWidth = false;
    mMouseResizeHeight = false;
-   setExtent(100, 200);
    mMinimizeIndex = -1;
    mTabIndex = -1;
    mBitmapBounds = NULL;
+   setExtent(100, 200);
 
    RectI closeRect(80, 2, 16, 16);
    mCloseButton = closeRect;

+ 3 - 0
Engine/source/gui/core/guiCanvas.cpp

@@ -94,9 +94,11 @@ extern InputModifiers convertModifierBits(const U32 in);
 //-----------------------------------------------------------------------------
 
 GuiCanvas::GuiCanvas(): GuiControl(),
+                        mCurUpdateRect(0, 0, 0, 0),
                         mCursorEnabled(true),
                         mForceMouseToGUI(false),
                         mAlwaysHandleMouseButtons(false),
+                        mCursorChanged(0),
                         mClampTorqueCursor(true),
                         mShowCursor(true),
                         mLastCursorEnabled(false),
@@ -120,6 +122,7 @@ GuiCanvas::GuiCanvas(): GuiControl(),
                         mLeftMouseLast(false),
                         mMiddleMouseLast(false),
                         mRightMouseLast(false),
+                        mMouseDownPoint(0.0f,0.0f),
                         mPlatformWindow(NULL),
                         mLastRenderMs(0),
                         mDisplayWindow(true)