[Smartwin-cvs] SmartWin/include/smartwin/aspects AspectBorder.h, NONE, 1.1 AspectSizable.h, 1.23, 1.24

[Conrado P. <con...@us...>]

Update of /cvsroot/smartwin/SmartWin/include/smartwin/aspects
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv7770/include/smartwin/aspects

Modified Files:
	AspectSizable.h 
Added Files:
	AspectBorder.h 
Log Message:
AspectBorder added, getBounds bug fixed, some MingW issues fixed

Index: AspectSizable.h
===================================================================
RCS file: /cvsroot/smartwin/SmartWin/include/smartwin/aspects/AspectSizable.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- AspectSizable.h	5 May 2006 17:14:38 -0000	1.23
+++ AspectSizable.h	23 Jun 2006 22:38:13 -0000	1.24
@@ -505,27 +505,36 @@
 template< class EventHandlerClass, class WidgetType, class MessageMapType >
 Rectangle AspectSizable< EventHandlerClass, WidgetType, MessageMapType >::getBounds() const
 {
+	int width, height;
 	RECT rc;
-	::GetWindowRect( const_cast < WidgetType * >( static_cast< const WidgetType * >( this ) )->handle(), & rc );
-	return Rectangle( rc.left, rc.top,      // Window size, pos
-					  rc.right - rc.left,
-					  rc.bottom - rc.top );
+	POINT pt;
+	HWND hwnd = const_cast < WidgetType * >( static_cast< const WidgetType * >( this ) )->handle();
+	::GetWindowRect( hwnd, & rc );
+	width = rc.right - rc.left;
+	height = rc.bottom - rc.top;
+	pt.x = rc.left;
+	pt.y = rc.top;
+	Widget* parent = static_cast< const WidgetType * >( this )->getParent();
+	if( parent )
+	{
+		//if it's a child, adjust coordinates relative to parent
+		::ScreenToClient( parent->handle(), &pt );
+	}
+	return Rectangle( pt.x, pt.y, width, height );
 }
 
 template< class EventHandlerClass, class WidgetType, class MessageMapType >
 Point AspectSizable< EventHandlerClass, WidgetType, MessageMapType >::getSize() const
 {
-	RECT rc;
-	::GetWindowRect( const_cast < WidgetType * >( static_cast< const WidgetType * >( this ) )->handle(), & rc );
-	return Point( rc.right - rc.left, rc.bottom - rc.top );
+  Rectangle rc = this->getBounds();
+	return Point( rc.size.x, rc.size.y );
 }
 
 template< class EventHandlerClass, class WidgetType, class MessageMapType >
 Point AspectSizable< EventHandlerClass, WidgetType, MessageMapType >::getPosition() const
 {
-	RECT rc;
-	::GetWindowRect( const_cast < WidgetType * >( static_cast< const WidgetType * >( this ) )->handle(), & rc );
-	return Point( rc.left, rc.top );
+	Rectangle rc = this->getBounds();
+	return Point( rc.pos.x, rc.pos.y );
 }
 
 template< class EventHandlerClass, class WidgetType, class MessageMapType >

--- NEW FILE: AspectBorder.h ---
// $Revision: 1.1 $
/*
  Copyright ( c ) 2005, Thomas Hansen
  All rights reserved.

  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:

	  * Redistributions of source code must retain the above copyright notice,
		this list of conditions and the following disclaimer.
	  * Redistributions in binary form must reproduce the above copyright notice,
		this list of conditions and the following disclaimer in the documentation
		and/or other materials provided with the distribution.
	  * Neither the name of the SmartWin ++ nor the names of its contributors
		may be used to endorse or promote products derived from this software
		without specific prior written permission.

  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  ( INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION ) HOWEVER CAUSED AND
  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  OR TORT ( INCLUDING NEGLIGENCE OR OTHERWISE ) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef AspectBorder_h
#define AspectBorder_h

namespace SmartWin
{
// begin namespace SmartWin

/// Aspect class used by Widgets that have borders which can have multiple styles.
/** \ingroup AspectClasses
  * E.g. the WidgetDataGrid have a "border" Aspect therefore it realizes the AspectBorder
  * through inheritance.
  */
template< class WidgetType >
class AspectBorder
{
public:
	/// Set or remove the simple border (solid line)
	void setBorder( bool value = true );

	/// Set or remove the sunken border (like in text box widgets)
	void setSunkenBorder( bool value = true );

	/// Set or remove the smooth sunken border (generally used in read only text boxes)
	void setSmoothSunkenBorder( bool value = true );

	/// Set or remove the raised border (like in buttons)
	void setRaisedBorder( bool value = true );
};

///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Implementation of class
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
template< class WidgetType >
void AspectBorder< WidgetType >::setBorder( bool value )
{
	static_cast< WidgetType * >( this )->addRemoveStyle( WS_BORDER, value );
}

template< class WidgetType >
void AspectBorder< WidgetType >::setSunkenBorder( bool value )
{
	static_cast< WidgetType * >( this )->addRemoveExStyle( WS_EX_CLIENTEDGE, value );
}

template< class WidgetType >
void AspectBorder< WidgetType >::setSmoothSunkenBorder( bool value )
{
	static_cast< WidgetType * >( this )->addRemoveExStyle( WS_EX_STATICEDGE, value );
}

template< class WidgetType >
void AspectBorder< WidgetType >::setRaisedBorder( bool value )
{
	static_cast< WidgetType * >( this )->addRemoveStyle( WS_THICKFRAME, value );
}

// end namespace SmartWin
}

#endif