From 39ba6d598e277e38ec521b9e5149b71921156a7d Mon Sep 17 00:00:00 2001 From: Tom Lint Date: Mon, 7 Oct 2013 12:10:17 +0200 Subject: [PATCH] Added file comments and TypeInfos Fixed spacing Fixed Button.h header include guard conflicting with Control.h --- include/System/Windows/Controls/Button.h | 6 +- include/System/Windows/Controls/Canvas.h | 18 +- .../System/Windows/Controls/ContentControl.h | 7 +- include/System/Windows/Controls/StackPanel.h | 2 + include/System/Windows/DependencyObject.h | 17 +- include/System/Windows/DependencyProperty.h | 4 +- include/System/Windows/UIElement.h | 4 +- src/libSystem.Windows/Border.cpp | 6 +- src/libSystem.Windows/Brush.cpp | 34 +- src/libSystem.Windows/BuildLog.htm | 486 ------------------ src/libSystem.Windows/ButtonBase.cpp | 40 +- src/libSystem.Windows/Canvas.cpp | 35 +- src/libSystem.Windows/Color.cpp | 35 +- src/libSystem.Windows/ContentControl.cpp | 50 +- src/libSystem.Windows/Control.cpp | 33 +- src/libSystem.Windows/CornerRadius.cpp | 9 +- src/libSystem.Windows/FrameworkElement.cpp | 7 +- src/libSystem.Windows/Grid.cpp | 11 + src/libSystem.Windows/GridLength.cpp | 7 + src/libSystem.Windows/Panel.cpp | 33 +- src/libSystem.Windows/RangeBase.cpp | 35 ++ src/libSystem.Windows/Rect.cpp | 39 +- src/libSystem.Windows/Size.cpp | 33 +- src/libSystem.Windows/SolidColorBrush.cpp | 34 +- src/libSystem.Windows/StackPanel.cpp | 8 + src/libSystem.Windows/TextBlock.cpp | 35 ++ src/libSystem.Windows/TextBox.cpp | 33 +- src/libSystem.Windows/Thickness.cpp | 34 +- src/libSystem.Windows/Thumb.cpp | 6 + src/libSystem.Windows/ToggleButton.cpp | 6 +- src/libSystem.Windows/UIElement.cpp | 33 +- 31 files changed, 591 insertions(+), 549 deletions(-) delete mode 100644 src/libSystem.Windows/BuildLog.htm diff --git a/include/System/Windows/Controls/Button.h b/include/System/Windows/Controls/Button.h index 4201c9f..9e868e7 100644 --- a/include/System/Windows/Controls/Button.h +++ b/include/System/Windows/Controls/Button.h @@ -4,8 +4,8 @@ * System::Windows::Controls::Button definition file * * Copyright (c) XFX Team. All rights reserved * *****************************************************************************/ -#ifndef _SYSTEM_WINDOWS_CONTROLS_CONTROL_ -#define _SYSTEM_WINDOWS_CONTROLS_CONTROL_ +#ifndef _SYSTEM_WINDOWS_CONTROLS_BUTTON_ +#define _SYSTEM_WINDOWS_CONTROLS_BUTTON_ #include @@ -38,4 +38,4 @@ namespace System } } -#endif //_SYSTEM_WINDOWS_CONTROLS_CONTROL_ +#endif //_SYSTEM_WINDOWS_CONTROLS_BUTTON_ diff --git a/include/System/Windows/Controls/Canvas.h b/include/System/Windows/Controls/Canvas.h index 1481333..01b6298 100644 --- a/include/System/Windows/Controls/Canvas.h +++ b/include/System/Windows/Controls/Canvas.h @@ -19,19 +19,19 @@ namespace System Size MeasureOverride(const Size constraint); public: - static const DependencyProperty LeftProperty; - static const DependencyProperty TopProperty; - static const DependencyProperty ZIndexProperty; + static const DependencyProperty LeftProperty; + static const DependencyProperty TopProperty; + static const DependencyProperty ZIndexProperty; Canvas(); - static int GetLeft(const UIElement& element); - static int GetTop(const UIElement& element); - static int GetZIndex(const UIElement& element); + static int GetLeft(UIElement * const element); + static int GetTop(UIElement * const element); + static int GetZIndex(UIElement * const element); static const Type& GetType(); - static void SetLeft(const UIElement& element, const int left); - static void SetTop(const UIElement& element, const int top); - static void SetZIndex(const UIElement& element, const int zIndex); + static void SetLeft(UIElement * const element, const int left); + static void SetTop(UIElement * const element, const int top); + static void SetZIndex(UIElement * const element, const int zIndex); bool operator==(const Canvas& right) const; bool operator!=(const Canvas& right) const; diff --git a/include/System/Windows/Controls/ContentControl.h b/include/System/Windows/Controls/ContentControl.h index 258525f..a1a60bf 100644 --- a/include/System/Windows/Controls/ContentControl.h +++ b/include/System/Windows/Controls/ContentControl.h @@ -7,6 +7,7 @@ #ifndef _SYSTEM_WINDOWS_CONTROLS_CONTENTCONTROL_ #define _SYSTEM_WINDOWS_CONTROLS_CONTENTCONTROL_ +#include #include #include @@ -22,14 +23,16 @@ namespace System class ContentControl : public Control { protected: - virtual void AddChild(Object* value); + virtual void AddChild(Object * const value); virtual void AddText(const String& text); - virtual void OnContentChanged(Object* oldContent, Object* newContent); + virtual void OnContentChanged(Object * oldContent, Object * newContent); virtual void OnContentStringFormatChanged(String& oldContentStringFormat, String& newContentStringFormat); public: Object* Content; + static const DependencyProperty ContentProperty; String ContentStringFormat; + static const DependencyProperty ContentStringFormatProperty; bool HasContent() const; ContentControl(); diff --git a/include/System/Windows/Controls/StackPanel.h b/include/System/Windows/Controls/StackPanel.h index dae17fa..31d46ed 100644 --- a/include/System/Windows/Controls/StackPanel.h +++ b/include/System/Windows/Controls/StackPanel.h @@ -21,6 +21,8 @@ namespace System Orientation_t Orientation; StackPanel(); + + static const Type& GetType(); }; } } diff --git a/include/System/Windows/DependencyObject.h b/include/System/Windows/DependencyObject.h index 46f017d..5a72ca6 100644 --- a/include/System/Windows/DependencyObject.h +++ b/include/System/Windows/DependencyObject.h @@ -46,18 +46,33 @@ namespace System template T GetValue(DependencyProperty p) const + { + return *dependencyProperties[p.Name]; + } + + template + T *GetValue(DependencyProperty p) const { return dependencyProperties[p.Name]; } template - void SetValue(DependencyProperty p, T value) + void SetValue(DependencyProperty p, const T value) { if (!dependencyProperties.ContainsKey(p.Name)) dependencyProperties.Add(p.Name, value); else dependencyProperties[p.Name] = value; } + + template + void SetValue(DependencyProperty p, T * const value) + { + if (!dependencyProperties.ContainsKey(p.Name)) + dependencyProperties.Add(p.Name, value) + else + dependencyProperties[p.Name] = value; + } }; } } diff --git a/include/System/Windows/DependencyProperty.h b/include/System/Windows/DependencyProperty.h index 2585b50..1fafa58 100644 --- a/include/System/Windows/DependencyProperty.h +++ b/include/System/Windows/DependencyProperty.h @@ -50,7 +50,7 @@ namespace System /** * Registers a dependency property with the specified property name, owner type, and property metadata for the property. * - @param propertyName + * @param propertyName * The name of the dependency property to register. * * @param type @@ -59,7 +59,7 @@ namespace System * @param * A PropertyMetadata instance. This can contain a System::Windows::PropertyChangedCallback implementation reference. * - @return + * @return * A dependency property identifier that should be used to set the value of a public static readonly field in your class. The identifier is then used both by your own code and any third-party user code to reference the dependency property later, for operations such as setting its value programmatically, or attaching a System::Windows::Data::Binding in code. */ static DependencyProperty Register(const String& propertyName, const Type& type, PropertyMetadata const * propertyMetadata); diff --git a/include/System/Windows/UIElement.h b/include/System/Windows/UIElement.h index 9b64bca..a3cdf65 100644 --- a/include/System/Windows/UIElement.h +++ b/include/System/Windows/UIElement.h @@ -57,8 +57,8 @@ namespace System bool operator!=(const UIElement& right) const; RoutedEventHandler GotFocus; - KeyEventHandler KeyDown; - KeyEventHandler KeyUp; + KeyEventHandler KeyDown; + KeyEventHandler KeyUp; RoutedEventHandler LostFocus; MouseEventHandler MouseEnter; MouseEventHandler MouseLeave; diff --git a/src/libSystem.Windows/Border.cpp b/src/libSystem.Windows/Border.cpp index efa3291..f64e5a8 100644 --- a/src/libSystem.Windows/Border.cpp +++ b/src/libSystem.Windows/Border.cpp @@ -26,6 +26,7 @@ // POSSIBILITY OF SUCH DAMAGE. #include +#include namespace System { @@ -33,6 +34,8 @@ namespace System { namespace Controls { + const Type BorderTypeInfo("Border", "System::Windows::Controls::Border", TypeCode::Object); + Border::Border() : BorderThickness(0), CornerRadius(0), Padding(0) { @@ -45,8 +48,9 @@ namespace System delete Child; } - int Border::GetType() + const Type& Border::GetType() { + return BorderTypeInfo; } } } diff --git a/src/libSystem.Windows/Brush.cpp b/src/libSystem.Windows/Brush.cpp index 3429893..ad391a5 100644 --- a/src/libSystem.Windows/Brush.cpp +++ b/src/libSystem.Windows/Brush.cpp @@ -1,4 +1,32 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include +#include namespace System { @@ -6,6 +34,8 @@ namespace System { namespace Media { + const Type BrushTypeInfo("Brush", "System::Windows::Media::Brush", TypeCode::Object); + Brush::Brush() { } @@ -14,9 +44,9 @@ namespace System { } - int Brush::GetType() + const Type& Brush::GetType() { - // TODO: implement + return BrushTypeInfo; } } } diff --git a/src/libSystem.Windows/BuildLog.htm b/src/libSystem.Windows/BuildLog.htm deleted file mode 100644 index 8a78161..0000000 --- a/src/libSystem.Windows/BuildLog.htm +++ /dev/null @@ -1,486 +0,0 @@ -Build started 17-1-2013 16:36:05. - 1>Project "C:\Users\Tom\Dropbox\XFX\src\libSystem.Windows\libSystem.Windows.vcxproj" on node 2 (rebuild target(s)). - 1>CoreClean: - make clean 2>&1 | sed -e 's/\(\w\+\):\([0-9]\+\):/\1(\2):/' - rm -f *.o *.exe *.dll *.xbe *.cxbe *.lib *.a - Rebuild: - make rebuild 2>&1 | sed -e 's/\(\w\+\):\([0-9]\+\):/\1(\2):/' - rm -f *.o *.exe *.dll *.xbe *.cxbe *.lib *.a - g++ -c Border.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Border.h:4, - from Border.cpp(28): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Border.h:4, - from Border.cpp(28): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Border.h:4, - from Border.cpp(28): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - Border.cpp: In memberfunctie ævirtual int System::Windows::Controls::Border::GetType() constÆ: - Border.cpp(50):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Brush.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - Brush.cpp: In memberfunctie ævirtual int System::Windows::Media::Brush::GetType() constÆ: - Brush.cpp(20):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c ButtonBase.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ../../include/System/Windows/Controls/Primitives/ButtonBase.h:3, - from ButtonBase.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ../../include/System/Windows/Controls/Primitives/ButtonBase.h:3, - from ButtonBase.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ../../include/System/Windows/Controls/Primitives/ButtonBase.h:3, - from ButtonBase.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c ClosingEventArgs.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - ClosingEventArgs.cpp: In memberfunctie ævirtual int System::ComponentModel::ClosingEventArgs::GetType() constÆ: - ClosingEventArgs.cpp(40):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Color.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - Color.cpp: In memberfunctie ævirtual int System::Windows::Media::Color::GetType() constÆ: - Color.cpp(57):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c ContentControl.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ContentControl.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ContentControl.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ContentControl.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - ContentControl.cpp: In memberfunctie ævirtual int System::Windows::Controls::ContentControl::GetType() constÆ: - ContentControl.cpp(23):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Control.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from Control.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from Control.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from Control.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - Control.cpp: In memberfunctie ævirtual int System::Windows::Controls::Control::GetType() constÆ: - Control.cpp(67):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c CornerRadius.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - CornerRadius.cpp: In memberfunctie ævirtual int System::Windows::CornerRadius::GetType() constÆ: - CornerRadius.cpp(76):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c FrameworkElement.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from FrameworkElement.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from FrameworkElement.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from FrameworkElement.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - FrameworkElement.cpp: In memberfunctie ævirtual System::Windows::Size System::Windows::FrameworkElement::ArrangeOverride(System::Windows::Size)Æ: - FrameworkElement.cpp(22):3: let op: no return statement in function returning non-void [-Wreturn-type] - FrameworkElement.cpp: In memberfunctie ævirtual int System::Windows::FrameworkElement::GetType() constÆ: - FrameworkElement.cpp(26):3: let op: no return statement in function returning non-void [-Wreturn-type] - FrameworkElement.cpp: In memberfunctie ævirtual System::Windows::Size System::Windows::FrameworkElement::MeasureOverride(System::Windows::Size)Æ: - FrameworkElement.cpp(30):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Grid.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from ../../include/System/Windows/Controls/Grid.h:3, - from Grid.cpp(2): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from ../../include/System/Windows/Controls/Grid.h:3, - from Grid.cpp(2): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from ../../include/System/Windows/Controls/Grid.h:3, - from Grid.cpp(2): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - Grid.cpp: In memberfunctie ævirtual System::Windows::Size System::Windows::Controls::Grid::ArrangeOverride(System::Windows::Size)Æ: - Grid.cpp(18):4: let op: no return statement in function returning non-void [-Wreturn-type] - Grid.cpp: In memberfunctie ævirtual System::Windows::Size System::Windows::Controls::Grid::MeasureOverride(System::Windows::Size)Æ: - Grid.cpp(22):4: let op: no return statement in function returning non-void [-Wreturn-type] - Grid.cpp: In memberfunctie ævirtual int System::Windows::Controls::Grid::GetType() constÆ: - Grid.cpp(58):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c MessageBox.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - MessageBox.cpp: In static member function æstatic System::Windows::MessageBoxResult_t System::Windows::MessageBox::Show(const System::String&, const System::String&, System::Windows::MessageBoxButton_t)Æ: - MessageBox.cpp(16):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Panel.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from Panel.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from Panel.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from Panel.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - Panel.cpp: In memberfunctie ævirtual int System::Windows::Controls::Panel::GetType() constÆ: - Panel.cpp(26):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Point.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - Point.cpp: In memberfunctie ævirtual int System::Windows::Point::GetType() constÆ: - Point.cpp(41):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c RangeBase.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/Primitives/RangeBase.h:3, - from RangeBase.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/Primitives/RangeBase.h:3, - from RangeBase.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/Primitives/RangeBase.h:3, - from RangeBase.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Size.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - Size.cpp: In memberfunctie ævirtual int System::Windows::Size::GetType() constÆ: - Size.cpp(48):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c SolidColorBrush.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - SolidColorBrush.cpp: In memberfunctie ævirtual int System::Windows::Media::SolidColorBrush::GetType() constÆ: - SolidColorBrush.cpp(22):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c StackPanel.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from ../../include/System/Windows/Controls/StackPanel.h:4, - from StackPanel.cpp(30): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from ../../include/System/Windows/Controls/StackPanel.h:4, - from StackPanel.cpp(30): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Panel.h:3, - from ../../include/System/Windows/Controls/StackPanel.h:4, - from StackPanel.cpp(30): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - StackPanel.cpp: In memberfunctie ævirtual System::Windows::Size System::Windows::Controls::StackPanel::MeasureOverride(System::Windows::Size)Æ: - StackPanel.cpp(73):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c SystemColors.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - g++ -c TextBlock.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/TextBlock.h:4, - from TextBlock.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/TextBlock.h:4, - from TextBlock.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/TextBlock.h:4, - from TextBlock.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c TextBox.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/TextBox.h:3, - from TextBox.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/TextBox.h:3, - from TextBox.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/TextBox.h:3, - from TextBox.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - TextBox.cpp: In memberfunctie ævirtual int System::Windows::Controls::TextBox::GetType() constÆ: - TextBox.cpp(34):4: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Thickness.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - Thickness.cpp: In memberfunctie ævirtual int System::Windows::Thickness::GetType() constÆ: - Thickness.cpp(46):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Thumb.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/Primitives/Thumb.h:3, - from Thumb.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/Primitives/Thumb.h:3, - from Thumb.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/Primitives/Thumb.h:3, - from Thumb.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - Thumb.cpp: In memberfunctie ævirtual int System::Windows::Controls::Primitives::Thumb::GetType() constÆ: - Thumb.cpp(23):5: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c ToggleButton.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ../../include/System/Windows/Controls/Primitives/ButtonBase.h:3, - from ../../include/System/Windows/Controls/Primitives/ToggleButton.h:3, - from ToggleButton.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ../../include/System/Windows/Controls/Primitives/ButtonBase.h:3, - from ../../include/System/Windows/Controls/Primitives/ToggleButton.h:3, - from ToggleButton.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Controls/Control.h:3, - from ../../include/System/Windows/Controls/ContentControl.h:4, - from ../../include/System/Windows/Controls/Primitives/ButtonBase.h:3, - from ../../include/System/Windows/Controls/Primitives/ToggleButton.h:3, - from ToggleButton.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - ToggleButton.cpp: In memberfunctie ævirtual int System::Windows::Controls::Primitives::ToggleButton::GetType() constÆ: - ToggleButton.cpp(23):5: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c UIElement.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from UIElement.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(15):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from UIElement.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from UIElement.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - UIElement.cpp: In memberfunctie ævirtual int System::Windows::UIElement::GetType() constÆ: - UIElement.cpp(14):3: let op: no return statement in function returning non-void [-Wreturn-type] - g++ -c Window.cpp -c -O2 -Wall -nostdlib -fno-builtin -fno-exceptions -fno-rtti -march=i386 -mmmx -msse -mfpmath=sse -DENABLE_XBOX -DDEBUG -I/openxdk/i386-pc-xbox/include -I/openxdk/include -I/openxdk/include/SDL -I../../include - In file included from ../../include/System/Event.h(4):0, - from ../../include/System/Windows/Window.h:3, - from Window.cpp(1): - ../../include/System/Collections/Generic/List.h: In memberfunctie æint System::Collections::Generic::List::GetType() constÆ: - ../../include/System/Collections/Generic/List.h(193):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Collections/Generic/Dictionary.h(14):0, - from ../../include/System/Windows/DependencyObject.h:3, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Window.h:8, - from Window.cpp(1): - ../../include/System/Collections/Generic/KeyValuePair.h: In memberfunctie æint System::Collections::Generic::KeyValuePair::GetType() constÆ: - ../../include/System/Collections/Generic/KeyValuePair.h(38):5: let op: no return statement in function returning non-void [-Wreturn-type] - In file included from ../../include/System/Windows/DependencyObject.h(3):0, - from ../../include/System/Windows/UIElement.h:3, - from ../../include/System/Windows/FrameworkElement.h:4, - from ../../include/System/Windows/Window.h:8, - from Window.cpp(1): - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æint System::Collections::Generic::Dictionary::GetType() constÆ: - ../../include/System/Collections/Generic/Dictionary.h(359):4: let op: no return statement in function returning non-void [-Wreturn-type] - ../../include/System/Collections/Generic/Dictionary.h: In memberfunctie æbool System::Collections::Generic::Dictionary::DictionaryEnumerator::MoveNext()Æ: - ../../include/System/Collections/Generic/Dictionary.h(618):4: let op: no return statement in function returning non-void [-Wreturn-type] - Window.cpp: In memberfunctie ævirtual int System::Windows::Window::GetType() constÆ: - Window.cpp(47):3: let op: no return statement in function returning non-void [-Wreturn-type] - ar rcu libSystem.Windows.a Border.o Brush.o ButtonBase.o ClosingEventArgs.o Color.o ContentControl.o Control.o CornerRadius.o FrameworkElement.o Grid.o MessageBox.o Panel.o Point.o RangeBase.o Size.o SolidColorBrush.o StackPanel.o SystemColors.o TextBlock.o TextBox.o Thickness.o Thumb.o ToggleButton.o UIElement.o Window.o - ranlib libSystem.Windows.a - 1>Done Building Project "C:\Users\Tom\Dropbox\XFX\src\libSystem.Windows\libSystem.Windows.vcxproj" (rebuild target(s)). - -Build succeeded. - -Time Elapsed 00:00:07.60 diff --git a/src/libSystem.Windows/ButtonBase.cpp b/src/libSystem.Windows/ButtonBase.cpp index 4b7de5b..29f9409 100644 --- a/src/libSystem.Windows/ButtonBase.cpp +++ b/src/libSystem.Windows/ButtonBase.cpp @@ -1,4 +1,32 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include +#include namespace System { @@ -8,12 +36,21 @@ namespace System { namespace Primitives { + const Type ButtonBaseTypeInfo("ButtonBase", "System::Windows::Controls::Primitives::ButtonBase", TypeCode::Object); + ButtonBase::ButtonBase() { + // TODO: implement } ButtonBase::~ButtonBase() { + // TODO: implement + } + + const Type& ButtonBase::GetType() + { + return ButtonBaseTypeInfo; } bool ButtonBase::IsFocused() const @@ -28,7 +65,7 @@ namespace System Click(this, rea); } - void ButtonBase::OnGotFocus(RoutedEventArgs* e) + void ButtonBase::OnGotFocus(RoutedEventArgs * const e) { Control::OnGotFocus(e); this->isFocused = true; @@ -37,6 +74,7 @@ namespace System void ButtonBase::UpdateVisualState(bool useTransitions) { + // TODO: implement } bool ButtonBase::operator ==(const ButtonBase& right) const diff --git a/src/libSystem.Windows/Canvas.cpp b/src/libSystem.Windows/Canvas.cpp index f89f52a..cf9d6bc 100644 --- a/src/libSystem.Windows/Canvas.cpp +++ b/src/libSystem.Windows/Canvas.cpp @@ -36,33 +36,35 @@ namespace System { namespace Controls { - const DependencyProperty Canvas::LeftProperty = DependencyProperty::Register("Left", Canvas::GetType()); - const DependencyProperty Canvas::TopProperty = DependencyProperty::Register("Top", Canvas::GetType()); - const DependencyProperty Canvas::ZIndexProperty = DependencyProperty::Register("ZIndex", Canvas::GetType()); + const DependencyProperty Canvas::LeftProperty = DependencyProperty::Register("Left", Canvas::GetType()); + const DependencyProperty Canvas::TopProperty = DependencyProperty::Register("Top", Canvas::GetType()); + const DependencyProperty Canvas::ZIndexProperty = DependencyProperty::Register("ZIndex", Canvas::GetType()); const Type CanvasTypeInfo("Canvas", "System::Windows::Controls::Canvas", TypeCode::Object); Canvas::Canvas() { + // TODO: implement } Size Canvas::ArrangeOverride(const Size arrangeSize) { + // TODO: implement } - int Canvas::GetLeft(const UIElement& element) + int Canvas::GetLeft(UIElement * const element) { - return element.GetValue(Canvas::LeftProperty); + return element->GetValue(Canvas::LeftProperty); } - int Canvas::GetTop(const UIElement& element) + int Canvas::GetTop(UIElement * const element) { - return element.GetValue(Canvas::TopProperty); + return element->GetValue(Canvas::TopProperty); } - int Canvas::GetZIndex(const UIElement& element) + int Canvas::GetZIndex(UIElement * const element) { - return element.GetValue(Canvas::ZIndexProperty); + return element->GetValue(Canvas::ZIndexProperty); } const Type& Canvas::GetType() @@ -72,29 +74,32 @@ namespace System Size Canvas::MeasureOverride(const Size constraint) { + // TODO: implement } - void Canvas::SetLeft(const UIElement& element, const int left) + void Canvas::SetLeft(UIElement * const element, const int left) { - element.SetValue(Canvas::LeftProperty, left); + element->SetValue(Canvas::LeftProperty, left); } - void Canvas::SetTop(const UIElement& element, const int top) + void Canvas::SetTop(UIElement * const element, const int top) { - element.SetValue(Canvas::TopProperty, top); + element->SetValue(Canvas::TopProperty, top); } - void Canvas::SetZIndex(const UIElement& element, const int zIndex) + void Canvas::SetZIndex(UIElement * const element, const int zIndex) { - element.SetValue(Canvas::ZIndexProperty, new Int32(zIndex)); + element->SetValue(Canvas::ZIndexProperty, zIndex); } bool Canvas::operator ==(const Canvas& right) const { + return Object::ReferenceEquals(*this, right); } bool Canvas::operator !=(const Canvas& right) const { + return !Object::ReferenceEquals(*this, right); } } } diff --git a/src/libSystem.Windows/Color.cpp b/src/libSystem.Windows/Color.cpp index c6d79a2..3917aa6 100644 --- a/src/libSystem.Windows/Color.cpp +++ b/src/libSystem.Windows/Color.cpp @@ -1,5 +1,33 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include +#include namespace System { @@ -7,6 +35,8 @@ namespace System { namespace Media { + const Type ColorTypeInfo("Color", "System::Windows::Media::Color", TypeCode::Object); + Color::Color(uint packedValue) : packedValue(packedValue) { @@ -34,7 +64,7 @@ namespace System bool Color::Equals(Object const * const obj) const { - return is(obj, this) ? *this == *(Color*)obj : false; + return is(obj, this) ? *this == *(Color *)obj : false; } bool Color::Equals(const Color other) const @@ -52,8 +82,9 @@ namespace System return (int)packedValue; } - int Color::GetType() + const Type& Color::GetType() { + return ColorTypeInfo; } const String Color::ToString() const diff --git a/src/libSystem.Windows/ContentControl.cpp b/src/libSystem.Windows/ContentControl.cpp index 71d7524..7037e6e 100644 --- a/src/libSystem.Windows/ContentControl.cpp +++ b/src/libSystem.Windows/ContentControl.cpp @@ -1,4 +1,32 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include +#include namespace System { @@ -6,24 +34,38 @@ namespace System { namespace Controls { - ContentControl::ContentControl() + const DependencyProperty ContentControl::ContentProperty = DependencyProperty::Register("Content", ContentControl::GetType()); + const DependencyProperty ContentControl::ContentStringFormatProperty = DependencyProperty::Register("ContentStringFormat", ContentControl::GetType()); + const Type ContentControlTypeInfo("ContentControl", "System::Windows::Controls::ContentControl", TypeCode::Object); + + bool ContentControl::HasContent() const { + return Content != NULL; } - void ContentControl::AddChild(Object* value) + ContentControl::ContentControl() { + // TODO: implement + } + + void ContentControl::AddChild(Object * const value) + { + // TODO: implement } void ContentControl::AddText(const String& text) { + // TODO: implement } - int ContentControl::GetType() + const Type& ContentControl::GetType() { + return ContentControlTypeInfo; } - void ContentControl::OnContentChanged(Object* newContent, Object* oldContent) + void ContentControl::OnContentChanged(Object * const newContent, Object * const oldContent) { + // TODO: implement } } } diff --git a/src/libSystem.Windows/Control.cpp b/src/libSystem.Windows/Control.cpp index 30ad13f..30cd908 100644 --- a/src/libSystem.Windows/Control.cpp +++ b/src/libSystem.Windows/Control.cpp @@ -1,6 +1,34 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include #include +#include namespace System { @@ -8,6 +36,8 @@ namespace System { namespace Controls { + const Type ControlTypeInfo("Control", "System::Windows::Controls::Control", TypeCode::Object); + Control::Control() : Background(null), BorderBrush(null), BorderThickness(3), Foreground(new SolidColorBrush(Color::White)), Padding(0), TabIndex(Int32::MaxValue) { @@ -62,8 +92,9 @@ namespace System return true; } - int Control::GetType() + const Type& Control::GetType() { + return ControlTypeInfo; } bool Control::operator ==(const Control& right) const diff --git a/src/libSystem.Windows/CornerRadius.cpp b/src/libSystem.Windows/CornerRadius.cpp index 4652ddc..00cd61e 100644 --- a/src/libSystem.Windows/CornerRadius.cpp +++ b/src/libSystem.Windows/CornerRadius.cpp @@ -27,11 +27,14 @@ #include #include +#include namespace System { namespace Windows { + const Type CornerRadiusTypeInfo("CornerRadius", "System::Windows::CornerRadius", TypeCode::Object); + CornerRadius::CornerRadius() : BottomLeft(0), BottomRight(0), TopLeft(0), TopRight(0) { @@ -57,7 +60,7 @@ namespace System bool CornerRadius::Equals(Object const * const obj) const { - return is(obj, this) ? *this == *(CornerRadius*)obj : false; + return is(obj, this) ? *this == *(CornerRadius *)obj : false; } bool CornerRadius::Equals(const CornerRadius other) const @@ -70,9 +73,9 @@ namespace System return (((TopLeft ^ TopRight) ^ BottomLeft) ^ BottomRight); } - int CornerRadius::GetType() + const Type& CornerRadius::GetType() { - // TODO: implement + return CornerRadiusTypeInfo; } const String CornerRadius::ToString() const diff --git a/src/libSystem.Windows/FrameworkElement.cpp b/src/libSystem.Windows/FrameworkElement.cpp index 8658ae3..c2ee24a 100644 --- a/src/libSystem.Windows/FrameworkElement.cpp +++ b/src/libSystem.Windows/FrameworkElement.cpp @@ -85,11 +85,15 @@ namespace System FrameworkElement::~FrameworkElement() { - delete Parent; + if (Parent != NULL) + { + delete Parent; + } } Size FrameworkElement::ArrangeOverride(const Size finalSize) { + // TODO: implement } const Type& FrameworkElement::GetType() @@ -99,6 +103,7 @@ namespace System Size FrameworkElement::MeasureOverride(const Size finalSize) { + // TODO: implement } } } diff --git a/src/libSystem.Windows/Grid.cpp b/src/libSystem.Windows/Grid.cpp index 9d73caf..24889e2 100644 --- a/src/libSystem.Windows/Grid.cpp +++ b/src/libSystem.Windows/Grid.cpp @@ -45,14 +45,17 @@ namespace System Size Grid::ArrangeOverride(const Size arrangeSize) { + // TODO: implement } Size Grid::MeasureOverride(const Size constraint) { + // TODO: implement } Grid::Grid() { + // TODO: implement } Grid::~Grid() @@ -87,7 +90,9 @@ namespace System void Grid::SetColumn(FrameworkElement * const element, const int column) { if (!element) + { return; + } element->SetValue(Grid::ColumnProperty, column); } @@ -95,7 +100,9 @@ namespace System void Grid::SetColumnSpan(FrameworkElement * const element, const int columnSpan) { if (!element) + { return; + } element->SetValue(Grid::ColumnSpanProperty, columnSpan); } @@ -103,7 +110,9 @@ namespace System void Grid::SetRow(FrameworkElement * const element, const int row) { if (!element) + { return; + } element->SetValue(Grid::RowProperty, row); } @@ -111,7 +120,9 @@ namespace System void Grid::SetRowSpan(FrameworkElement * const element, const int rowSpan) { if (!element) + { return; + } element->SetValue(Grid::RowSpanProperty, rowSpan); } diff --git a/src/libSystem.Windows/GridLength.cpp b/src/libSystem.Windows/GridLength.cpp index 202c3cb..7cb340e 100644 --- a/src/libSystem.Windows/GridLength.cpp +++ b/src/libSystem.Windows/GridLength.cpp @@ -105,9 +105,15 @@ namespace System const String GridLength::ToString() const { if (gridUnitType == GridUnitType::Auto) + { return "Auto"; + } + if (gridUnitType == GridUnitType::Star) + { return "*"; + } + return String::Format("%i", value); } @@ -117,6 +123,7 @@ namespace System { return (value == right.value); } + return false; } diff --git a/src/libSystem.Windows/Panel.cpp b/src/libSystem.Windows/Panel.cpp index bc710b1..3e64f1e 100644 --- a/src/libSystem.Windows/Panel.cpp +++ b/src/libSystem.Windows/Panel.cpp @@ -1,4 +1,32 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include +#include namespace System { @@ -6,6 +34,8 @@ namespace System { namespace Controls { + const Type PanelTypeInfo("Panel", "System::Windows::Controls::Panel", TypeCode::Object); + Panel::Panel() : Background(null) { @@ -21,8 +51,9 @@ namespace System } } - int Panel::GetType() + const Type& Panel::GetType() { + return PanelTypeInfo; } bool Panel::operator ==(const Panel& right) const diff --git a/src/libSystem.Windows/RangeBase.cpp b/src/libSystem.Windows/RangeBase.cpp index 7f1a822..be77e0e 100644 --- a/src/libSystem.Windows/RangeBase.cpp +++ b/src/libSystem.Windows/RangeBase.cpp @@ -1,3 +1,30 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include @@ -9,6 +36,8 @@ namespace System { namespace Primitives { + const Type RangeBaseTypeInfo("RangeBase", "System::Windows::Controls::Primitives::RangeBase", TypeCode::Object); + int RangeBase::getMaximum() const { return maximum; @@ -53,6 +82,12 @@ namespace System RangeBase::RangeBase() { + // TODO: implement + } + + const Type& RangeBase::GetType() + { + return RangeBaseTypeInfo; } void RangeBase::OnValueChanged(int oldValue, int newValue) diff --git a/src/libSystem.Windows/Rect.cpp b/src/libSystem.Windows/Rect.cpp index 4cfd182..a53bf74 100644 --- a/src/libSystem.Windows/Rect.cpp +++ b/src/libSystem.Windows/Rect.cpp @@ -1,13 +1,42 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include #include #include +#include namespace System { namespace Windows { const Rect Rect::Empty = Rect(); + const Type RectTypeInfo("Rect", "System::Windows::Rect", TypeCode::Object); int Rect::getBottom() const { @@ -62,7 +91,7 @@ namespace System bool Rect::Equals(Object const * const obj) const { - return is(obj, this) ? this->Equals(*(Rect*)obj) : false; + return is(obj, this) ? this->Equals(*(Rect *)obj) : false; } bool Rect::Equals(const Rect other) const @@ -72,17 +101,20 @@ namespace System int Rect::GetHashCode() const { + // TODO: implement } - int Rect::GetType() + const Type& Rect::GetType() { + return RectTypeInfo; } void Rect::Intersect(const Rect rect) { + // TODO: implement } - const char* Rect::ToString() const + const String Rect::ToString() const { return String::Format("X:%i Y:%i Width:%i Height:%i", X, Y, Width, Height); } @@ -113,6 +145,7 @@ namespace System void Rect::Union(const Rect rect) { + // TODO: implement } bool Rect::operator ==(const Rect& right) const diff --git a/src/libSystem.Windows/Size.cpp b/src/libSystem.Windows/Size.cpp index 095c8ee..e245a6d 100644 --- a/src/libSystem.Windows/Size.cpp +++ b/src/libSystem.Windows/Size.cpp @@ -1,11 +1,40 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include +#include namespace System { namespace Windows { const Size Size::Empty = Size(); + const Type SizeTypeInfo("Size", "System::Windows::Size", TypeCode::Object); Size::Size() : Height(0), Width(0) @@ -42,9 +71,9 @@ namespace System return Width ^ Height; } - int Size::GetType() + const Type& Size::GetType() { - // TODO: implement + return SizeTypeInfo; } const String Size::ToString() const diff --git a/src/libSystem.Windows/SolidColorBrush.cpp b/src/libSystem.Windows/SolidColorBrush.cpp index 613eb3b..a6c31e1 100644 --- a/src/libSystem.Windows/SolidColorBrush.cpp +++ b/src/libSystem.Windows/SolidColorBrush.cpp @@ -1,4 +1,32 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include +#include namespace System { @@ -6,6 +34,8 @@ namespace System { namespace Media { + const Type SolidColorBrushTypeInfo("SolidColorBrush", "System::Windows::Media::SolidColorBrush", TypeCode::Object); + SolidColorBrush::SolidColorBrush() : Color(Color::Transparent) { @@ -16,9 +46,9 @@ namespace System { } - int SolidColorBrush::GetType() + const Type& SolidColorBrush::GetType() { - // TODO: implement + return SolidColorBrushTypeInfo; } } } diff --git a/src/libSystem.Windows/StackPanel.cpp b/src/libSystem.Windows/StackPanel.cpp index 214f753..3ecc9a9 100644 --- a/src/libSystem.Windows/StackPanel.cpp +++ b/src/libSystem.Windows/StackPanel.cpp @@ -28,6 +28,7 @@ #include #include #include +#include namespace System { @@ -35,6 +36,8 @@ namespace System { namespace Controls { + const Type StackPanelTypeInfo("StackPanel", "System::Windows::Controls::StackPanel", TypeCode::Object); + StackPanel::StackPanel() : Orientation(Orientation::Vertical) { @@ -64,6 +67,11 @@ namespace System return Size(vertSize, horSize); } + const Type& StackPanel::GetType() + { + return StackPanelTypeInfo; + } + Size StackPanel::MeasureOverride(const Size constraint) { for (int i = 0; i < Children.Count(); i++) diff --git a/src/libSystem.Windows/TextBlock.cpp b/src/libSystem.Windows/TextBlock.cpp index c21f28c..bad6367 100644 --- a/src/libSystem.Windows/TextBlock.cpp +++ b/src/libSystem.Windows/TextBlock.cpp @@ -1,5 +1,33 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include +#include namespace System { @@ -7,6 +35,8 @@ namespace System { namespace Controls { + const Type TextBlockTypeInfo("TextBlock", "System::Windows::Controls::TextBlock", TypeCode::Object); + TextBlock::TextBlock() : Foreground(new SolidColorBrush(Color::White)), Padding(0), Text(String::Empty) { @@ -17,6 +47,11 @@ namespace System delete Foreground; } + const Type& TextBlock::GetType() + { + return TextBlockTypeInfo; + } + const String TextBlock::ToString() const { return Text; diff --git a/src/libSystem.Windows/TextBox.cpp b/src/libSystem.Windows/TextBox.cpp index 5d89ed5..2346731 100644 --- a/src/libSystem.Windows/TextBox.cpp +++ b/src/libSystem.Windows/TextBox.cpp @@ -1,5 +1,33 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include +#include namespace System { @@ -7,6 +35,8 @@ namespace System { namespace Controls { + const Type TextBoxTypeInfo("TextBox", "System::Windows::Controls::TextBox", TypeCode::Object); + TextBox::TextBox() : _text(String::Empty) { @@ -29,8 +59,9 @@ namespace System _text = value; } - int TextBox::GetType() + const Type& TextBox::GetType() { + return TextBoxTypeInfo; } void TextBox::Select(const int start, const int length) diff --git a/src/libSystem.Windows/Thickness.cpp b/src/libSystem.Windows/Thickness.cpp index ddab663..2394f0a 100644 --- a/src/libSystem.Windows/Thickness.cpp +++ b/src/libSystem.Windows/Thickness.cpp @@ -1,10 +1,40 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include +#include namespace System { namespace Windows { + const Type ThicknessTypeInfo("Thickness", "System::Windows::Thickness", TypeCode::Object); + Thickness::Thickness() : Bottom(0), Left(0), Right(0), Top(0) { @@ -40,9 +70,9 @@ namespace System return (Left + Right + Top + Bottom); } - int Thickness::GetType() + const Type& Thickness::GetType() { - // TODO: implement + return ThicknessTypeInfo; } const String Thickness::ToString() const diff --git a/src/libSystem.Windows/Thumb.cpp b/src/libSystem.Windows/Thumb.cpp index e972c38..5a7e8da 100644 --- a/src/libSystem.Windows/Thumb.cpp +++ b/src/libSystem.Windows/Thumb.cpp @@ -40,6 +40,7 @@ namespace System Thumb::Thumb() { + // TODO: implement } void Thumb::CancelDrag() @@ -55,22 +56,27 @@ namespace System void Thumb::OnGotFocus(RoutedEventArgs * const e) { + GotFocus(this, e); } void Thumb::OnLostFocus(RoutedEventArgs * const e) { + LostFocus(this, e); } void Thumb::OnMouseEnter(MouseEventArgs * const e) { + MouseEnter(this, e); } void Thumb::OnMouseLeave(MouseEventArgs * const e) { + MouseLeave(this, e); } void Thumb::OnMouseMove(MouseEventArgs * const e) { + MouseMove(this, e); } bool Thumb::operator ==(const Thumb& right) const diff --git a/src/libSystem.Windows/ToggleButton.cpp b/src/libSystem.Windows/ToggleButton.cpp index 0f97858..9b7474e 100644 --- a/src/libSystem.Windows/ToggleButton.cpp +++ b/src/libSystem.Windows/ToggleButton.cpp @@ -42,10 +42,12 @@ namespace System ToggleButton::ToggleButton() { + // TODO: implement } ToggleButton::~ToggleButton() { + // TODO: implement } const Type& ToggleButton::GetType() @@ -70,11 +72,11 @@ namespace System Nullable isChecked = this->IsChecked; if (isChecked == true) { - this->IsChecked = this->IsThreeState ? Nullable::Null : ((Nullable) false); + this->IsChecked = this->IsThreeState ? Nullable::Null : false; } else { - this->IsChecked = Nullable(isChecked.HasValue()); + this->IsChecked = isChecked.HasValue(); } } diff --git a/src/libSystem.Windows/UIElement.cpp b/src/libSystem.Windows/UIElement.cpp index 2536275..35aceae 100644 --- a/src/libSystem.Windows/UIElement.cpp +++ b/src/libSystem.Windows/UIElement.cpp @@ -1,5 +1,33 @@ +// Copyright (C) XFX Team +// 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 copyright holder nor the names of any +// 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. + #include #include +#include namespace System { @@ -7,6 +35,8 @@ namespace System { const DependencyProperty UIElement::VisibilityProperty = DependencyProperty::Register("Visibility", UIElement::GetType()); + const Type UIElementTypeInfo("UIElement", "System::Windows::UIElement", TypeCode::Object); + Visibility_t UIElement::getVisibility() const { return GetValue(VisibilityProperty); @@ -21,8 +51,9 @@ namespace System { } - int UIElement::GetType() + const Type& UIElement::GetType() { + return UIElementTypeInfo; } void UIElement::InvalidateArrange()