strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vcl: move debug function from window.cxx to debug.cxx

Browse source 
Change-Id: I9c3debcdda4b6ee943792e8799d436b097df2982
This commit is contained in:
Chris Sherlock 2014-05-20 00:32:25 +10:00
parent 48fb7d096a
commit f797e6c467
3 changed files with 49 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
vcl/Library_vcl.mk
View file

@ -109,6 +109,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/window/legacyaccessibility \
vcl/source/window/clipping \
vcl/source/window/stacking \
vcl/source/window/debug \
vcl/source/window/btndlg \
vcl/source/window/builder \
vcl/source/window/cmdevt \

48
vcl/source/window/debug.cxx Normal file
View file

@ -0,0 +1,48 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <vcl/window.hxx>
#include <vcl/outdev.hxx>
#include "window.h"
#ifdef DBG_UTIL
const char* ImplDbgCheckWindow( const void* pObj )
{
DBG_TESTSOLARMUTEX();
const Window* pWindow = (Window*)pObj;
if ( (pWindow->GetType() < WINDOW_FIRST) || (pWindow->GetType() > WINDOW_LAST) )
return "Window data overwrite";
// check window-chain
Window* pChild = pWindow->mpWindowImpl->mpFirstChild;
while ( pChild )
{
if ( pChild->mpWindowImpl->mpParent != pWindow )
return "Child-Window-Parent wrong";
pChild = pChild->mpWindowImpl->mpNext;
}
return NULL;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

24
vcl/source/window/window.cxx
View file

@ -298,30 +298,6 @@ Window::Window( Window* pParent, const ResId& rResId )
Show();
}
#ifdef DBG_UTIL
const char* ImplDbgCheckWindow( const void* pObj )
{
DBG_TESTSOLARMUTEX();
const Window* pWindow = (Window*)pObj;
if ( (pWindow->GetType() < WINDOW_FIRST) || (pWindow->GetType() > WINDOW_LAST) )
return "Window data overwrite";
// check window-chain
Window* pChild = pWindow->mpWindowImpl->mpFirstChild;
while ( pChild )
{
if ( pChild->mpWindowImpl->mpParent != pWindow )
return "Child-Window-Parent wrong";
pChild = pChild->mpWindowImpl->mpNext;
}
return NULL;
}
#endif
bool Window::AcquireGraphics() const
{
DBG_TESTSOLARMUTEX();