working on fix

include/MwCXX/Widget/BaseAuto.h

@@ -1,47 +1,47 @@
 MwCXX::String GetBackground();
-void	      SetBackground(MwCXX::String value);
-MwLLPixmap    GetBackgroundPixmap();
-void	      SetBackgroundPixmap(MwLLPixmap value);
-int	      GetBitmapFont();
-void	      SetBitmapFont(int value);
-int	      GetBorderWidth();
-void	      SetBorderWidth(int value);
-int	      GetDarkTheme();
-void	      SetDarkTheme(int value);
-int	      GetDarkThemeAutomatic();
-void	      SetDarkThemeAutomatic(int value);
-int	      GetFixedSize();
-void	      SetFixedSize(int value);
-int	      GetForceInverted();
-void	      SetForceInverted(int value);
+void SetBackground(MwCXX::String value);
+MwLLPixmap GetBackgroundPixmap();
+void SetBackgroundPixmap(MwLLPixmap value);
+int GetBitmapFont();
+void SetBitmapFont(int value);
+int GetBorderWidth();
+void SetBorderWidth(int value);
+int GetDarkTheme();
+void SetDarkTheme(int value);
+int GetDarkThemeAutomatic();
+void SetDarkThemeAutomatic(int value);
+int GetFixedSize();
+void SetFixedSize(int value);
+int GetForceInverted();
+void SetForceInverted(int value);
 MwCXX::String GetForeground();
-void	      SetForeground(MwCXX::String value);
-int	      GetHeight();
-void	      SetHeight(int value);
-int	      GetIsRounded();
-void	      SetIsRounded(int value);
-int	      GetModernLook();
-void	      SetModernLook(int value);
-int	      GetRatio();
-void	      SetRatio(int value);
+void SetForeground(MwCXX::String value);
+int GetHeight();
+void SetHeight(int value);
+int GetIsRounded();
+void SetIsRounded(int value);
+int GetModernLook();
+void SetModernLook(int value);
+int GetRatio();
+void SetRatio(int value);
 MwCXX::String GetSubBackground();
-void	      SetSubBackground(MwCXX::String value);
+void SetSubBackground(MwCXX::String value);
 MwCXX::String GetSubForeground();
-void	      SetSubForeground(MwCXX::String value);
+void SetSubForeground(MwCXX::String value);
 MwCXX::String GetTitleBackground();
-void	      SetTitleBackground(MwCXX::String value);
+void SetTitleBackground(MwCXX::String value);
 MwCXX::String GetTitleForeground();
-void	      SetTitleForeground(MwCXX::String value);
-int	      GetUseMonospace();
-void	      SetUseMonospace(int value);
-int	      GetWaitMS();
-void	      SetWaitMS(int value);
-int	      GetWidth();
-void	      SetWidth(int value);
-int	      GetX();
-void	      SetX(int value);
-int	      GetY();
-void	      SetY(int value);
+void SetTitleForeground(MwCXX::String value);
+int GetUseMonospace();
+void SetUseMonospace(int value);
+int GetWaitMS();
+void SetWaitMS(int value);
+int GetWidth();
+void SetWidth(int value);
+int GetX();
+void SetX(int value);
+int GetY();
+void SetY(int value);
 
 virtual void OnClipboard(MwCXX::String value) {};
 virtual void OnDarkTheme(int value) {};

include/MwCXX/Widget/Box.h

@@ -15,17 +15,17 @@ namespace MwCXX {
 		Box(MwWidget widget, MwCXX::Base* parent = NULL);
 		Box(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetOrientation();
+		int GetOrientation();
 		void SetOrientation(int value);
-		int  GetMargin();
+		int GetMargin();
 		void SetMargin(int value);
-		int  GetPadding();
+		int GetPadding();
 		void SetPadding(int value);
-		int  GetHasBorder();
+		int GetHasBorder();
 		void SetHasBorder(int value);
-		int  GetInverted();
+		int GetInverted();
 		void SetInverted(int value);
-		int  GetWaitLayout();
+		int GetWaitLayout();
 		void SetWaitLayout(int value);
 	};
 }; // namespace MwCXX

include/MwCXX/Widget/Button.h

@@ -15,16 +15,16 @@ namespace MwCXX {
 		Button(MwWidget widget, MwCXX::Base* parent = NULL);
 		Button(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		MwLLPixmap    GetPixmap();
-		void	      SetPixmap(MwLLPixmap value);
+		MwLLPixmap GetPixmap();
+		void SetPixmap(MwLLPixmap value);
 		MwCXX::String GetText();
-		void	      SetText(MwCXX::String value);
-		int	      GetFlat();
-		void	      SetFlat(int value);
-		int	      GetPadding();
-		void	      SetPadding(int value);
-		int	      GetFillArea();
-		void	      SetFillArea(int value);
+		void SetText(MwCXX::String value);
+		int GetFlat();
+		void SetFlat(int value);
+		int GetPadding();
+		void SetPadding(int value);
+		int GetFillArea();
+		void SetFillArea(int value);
 
 		virtual void OnActivate() {};
 		virtual void OnChanged() {};

include/MwCXX/Widget/Calendar.h

@@ -0,0 +1,31 @@
+#ifndef __MWCXX_WIDGET_CALENDAR_H__
+#define __MWCXX_WIDGET_CALENDAR_H__
+
+#include <MwCXX/MachDep.h>
+#include <MwCXX/Widget/Base.h>
+
+#include <Mw/Widget/Calendar.h>
+
+namespace MwCXX {
+	class Calendar : public MwCXX::Base {
+	    protected:
+		virtual void RegisterHandlers();
+
+	    public:
+		Calendar(MwWidget widget, MwCXX::Base* parent = NULL);
+		Calendar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
+
+		int GetYear();
+		void SetYear(int value);
+		int GetMonth();
+		void SetMonth(int value);
+		int GetDate();
+		void SetDate(int value);
+		int GetDay();
+		void SetDay(int value);
+		int GetScale();
+		void SetScale(int value);
+	};
+}; // namespace MwCXX
+
+#endif

include/MwCXX/Widget/CheckBox.h

@@ -15,7 +15,7 @@ namespace MwCXX {
 		CheckBox(MwWidget widget, MwCXX::Base* parent = NULL);
 		CheckBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetChecked();
+		int GetChecked();
 		void SetChecked(int value);
 
 		virtual void OnChanged() {};

include/MwCXX/Widget/ComboBox.h

@@ -15,9 +15,9 @@ namespace MwCXX {
 		ComboBox(MwWidget widget, MwCXX::Base* parent = NULL);
 		ComboBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetAreaShown();
+		int GetAreaShown();
 		void SetAreaShown(int value);
-		int  GetValue();
+		int GetValue();
 		void SetValue(int value);
 
 		virtual void OnComboBoxChanged(int value) {};

include/MwCXX/Widget/Entry.h

@@ -16,9 +16,9 @@ namespace MwCXX {
 		Entry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
 		MwCXX::String GetText();
-		void	      SetText(MwCXX::String value);
-		int	      GetHideInput();
-		void	      SetHideInput(int value);
+		void SetText(MwCXX::String value);
+		int GetHideInput();
+		void SetHideInput(int value);
 
 		virtual void OnActivate() {};
 		virtual void OnChanged() {};

include/MwCXX/Widget/Frame.h

@@ -15,9 +15,9 @@ namespace MwCXX {
 		Frame(MwWidget widget, MwCXX::Base* parent = NULL);
 		Frame(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetHasBorder();
+		int GetHasBorder();
 		void SetHasBorder(int value);
-		int  GetInverted();
+		int GetInverted();
 		void SetInverted(int value);
 	};
 }; // namespace MwCXX

include/MwCXX/Widget/Image.h

@@ -16,13 +16,13 @@ namespace MwCXX {
 		Image(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
 		MwLLPixmap GetPixmap();
-		void	   SetPixmap(MwLLPixmap value);
-		int	   GetHasBorder();
-		void	   SetHasBorder(int value);
-		int	   GetInverted();
-		void	   SetInverted(int value);
-		int	   GetFillArea();
-		void	   SetFillArea(int value);
+		void SetPixmap(MwLLPixmap value);
+		int GetHasBorder();
+		void SetHasBorder(int value);
+		int GetInverted();
+		void SetInverted(int value);
+		int GetFillArea();
+		void SetFillArea(int value);
 	};
 }; // namespace MwCXX
 

include/MwCXX/Widget/Label.h

@@ -16,17 +16,17 @@ namespace MwCXX {
 		Label(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
 		MwCXX::String GetText();
-		void	      SetText(MwCXX::String value);
-		int	      GetAlignment();
-		void	      SetAlignment(int value);
-		int	      GetBold();
-		void	      SetBold(int value);
-		int	      GetSevenSegment();
-		void	      SetSevenSegment(int value);
-		int	      GetLength();
-		void	      SetLength(int value);
-		int	      GetLeftPadding();
-		void	      SetLeftPadding(int value);
+		void SetText(MwCXX::String value);
+		int GetAlignment();
+		void SetAlignment(int value);
+		int GetBold();
+		void SetBold(int value);
+		int GetSevenSegment();
+		void SetSevenSegment(int value);
+		int GetLength();
+		void SetLength(int value);
+		int GetLeftPadding();
+		void SetLeftPadding(int value);
 
 		void SetSevenSegment(int index, int data);
 	};

include/MwCXX/Widget/ListBox.h

@@ -15,23 +15,23 @@ namespace MwCXX {
 		ListBox(MwWidget widget, MwCXX::Base* parent = NULL);
 		ListBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetLeftPadding();
+		int GetLeftPadding();
 		void SetLeftPadding(int value);
-		int  GetHasHeading();
+		int GetHasHeading();
 		void SetHasHeading(int value);
-		int  GetSingleClickSelectable();
+		int GetSingleClickSelectable();
 		void SetSingleClickSelectable(int value);
 
 		virtual void OnListBoxActivate(int value) {};
 
 		void (*ListBoxActivateHandler)(MwCXX::ListBox* widget, int value);
 
-		int	      Set(int row, int col, MwCXX::String text);
-		void	      SetIcon(int index, MwLLPixmap icon);
-		void	      Delete(int index);
+		int Set(int row, int col, MwCXX::String text);
+		void SetIcon(int index, MwLLPixmap icon);
+		void Delete(int index);
 		MwCXX::String Get(int index);
-		void	      SetWidth(int index, int width);
-		void	      Reset();
+		void SetWidth(int index, int width);
+		void Reset();
 	};
 }; // namespace MwCXX
 

include/MwCXX/Widget/NumberEntry.h

@@ -16,7 +16,7 @@ namespace MwCXX {
 		NumberEntry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
 		MwCXX::String GetText();
-		void	      SetText(MwCXX::String value);
+		void SetText(MwCXX::String value);
 
 		virtual void OnActivate() {};
 		virtual void OnChanged() {};

include/MwCXX/Widget/OpenGL.h

@@ -15,9 +15,9 @@ namespace MwCXX {
 		OpenGL(MwWidget widget, MwCXX::Base* parent = NULL);
 		OpenGL(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		void  MakeCurrent();
+		void MakeCurrent();
 		void* GetProcAddress(MwCXX::String name);
-		void  SwapBuffer();
+		void SwapBuffer();
 	};
 }; // namespace MwCXX
 

include/MwCXX/Widget/ProgressBar.h

@@ -15,11 +15,11 @@ namespace MwCXX {
 		ProgressBar(MwWidget widget, MwCXX::Base* parent = NULL);
 		ProgressBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetMinValue();
+		int GetMinValue();
 		void SetMinValue(int value);
-		int  GetMaxValue();
+		int GetMaxValue();
 		void SetMaxValue(int value);
-		int  GetValue();
+		int GetValue();
 		void SetValue(int value);
 	};
 }; // namespace MwCXX

include/MwCXX/Widget/RadioBox.h

@@ -15,7 +15,7 @@ namespace MwCXX {
 		RadioBox(MwWidget widget, MwCXX::Base* parent = NULL);
 		RadioBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetChecked();
+		int GetChecked();
 		void SetChecked(int value);
 
 		virtual void OnChanged() {};

include/MwCXX/Widget/ScrollBar.h

@@ -15,17 +15,17 @@ namespace MwCXX {
 		ScrollBar(MwWidget widget, MwCXX::Base* parent = NULL);
 		ScrollBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetShowArrows();
+		int GetShowArrows();
 		void SetShowArrows(int value);
-		int  GetAreaShown();
+		int GetAreaShown();
 		void SetAreaShown(int value);
-		int  GetValue();
+		int GetValue();
 		void SetValue(int value);
-		int  GetMinValue();
+		int GetMinValue();
 		void SetMinValue(int value);
-		int  GetMaxValue();
+		int GetMaxValue();
 		void SetMaxValue(int value);
-		int  GetOrientation();
+		int GetOrientation();
 		void SetOrientation(int value);
 
 		virtual void OnChanged() {};

include/MwCXX/Widget/SubMenu.h

@@ -15,7 +15,7 @@ namespace MwCXX {
 		SubMenu(MwWidget widget, MwCXX::Base* parent = NULL);
 		SubMenu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetLeftPadding();
+		int GetLeftPadding();
 		void SetLeftPadding(int value);
 
 		void Appear(void* menu, MwPoint* point, int diff_calc);

include/MwCXX/Widget/SubWindow.h

@@ -0,0 +1,31 @@
+#ifndef __MWCXX_WIDGET_SUBWINDOW_H__
+#define __MWCXX_WIDGET_SUBWINDOW_H__
+
+#include <MwCXX/MachDep.h>
+#include <MwCXX/Widget/Base.h>
+
+#include <Mw/Widget/SubWindow.h>
+
+namespace MwCXX {
+	class SubWindow : public MwCXX::Base {
+	    protected:
+		virtual void RegisterHandlers();
+
+	    public:
+		SubWindow(MwWidget widget, MwCXX::Base* parent = NULL);
+		SubWindow(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
+
+		MwLLPixmap GetIconPixmap();
+		void SetIconPixmap(MwLLPixmap value);
+		MwCXX::String GetTitle();
+		void SetTitle(MwCXX::String value);
+
+		virtual void OnClose() {};
+
+		void (*CloseHandler)(MwCXX::SubWindow* widget);
+
+		MwCXX::Base* GetFrame();
+	};
+}; // namespace MwCXX
+
+#endif

include/MwCXX/Widget/Tab.h

@@ -0,0 +1,30 @@
+#ifndef __MWCXX_WIDGET_TAB_H__
+#define __MWCXX_WIDGET_TAB_H__
+
+#include <MwCXX/MachDep.h>
+#include <MwCXX/Widget/Base.h>
+
+#include <Mw/Widget/Tab.h>
+
+namespace MwCXX {
+	class Tab : public MwCXX::Base {
+	    protected:
+		virtual void RegisterHandlers();
+
+	    public:
+		Tab(MwWidget widget, MwCXX::Base* parent = NULL);
+		Tab(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
+
+		int GetValue();
+		void SetValue(int value);
+
+		virtual void OnChanged() {};
+
+		void (*ChangedHandler)(MwCXX::Tab* widget);
+
+		MwCXX::Base* Add(MwCXX::String name);
+		MwCXX::Base* GetFrame(MwCXX::String name);
+	};
+}; // namespace MwCXX
+
+#endif

include/MwCXX/Widget/Table.h

@@ -0,0 +1,33 @@
+#ifndef __MWCXX_WIDGET_TABLE_H__
+#define __MWCXX_WIDGET_TABLE_H__
+
+#include <MwCXX/MachDep.h>
+#include <MwCXX/Widget/Base.h>
+
+#include <Mw/Widget/Table.h>
+
+namespace MwCXX {
+	class Table : public MwCXX::Base {
+	    protected:
+		virtual void RegisterHandlers();
+
+	    public:
+		Table(MwWidget widget, MwCXX::Base* parent = NULL);
+		Table(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
+
+		int GetColumns();
+		void SetColumns(int value);
+		int GetMargin();
+		void SetMargin(int value);
+		int GetPadding();
+		void SetPadding(int value);
+		int GetHasBorder();
+		void SetHasBorder(int value);
+		int GetInverted();
+		void SetInverted(int value);
+		int GetWaitLayout();
+		void SetWaitLayout(int value);
+	};
+}; // namespace MwCXX
+
+#endif

include/MwCXX/Widget/TreeView.h

@@ -15,9 +15,9 @@ namespace MwCXX {
 		TreeView(MwWidget widget, MwCXX::Base* parent = NULL);
 		TreeView(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
-		int  GetLeftPadding();
+		int GetLeftPadding();
 		void SetLeftPadding(int value);
-		int  GetSingleClickSelectable();
+		int GetSingleClickSelectable();
 		void SetSingleClickSelectable(int value);
 
 		virtual void OnTreeViewActivate(void* value) {};
@@ -27,7 +27,7 @@ namespace MwCXX {
 		void Add(void* parent, MwLLPixmap pixmap, MwCXX::String item);
 		void Delete(void* item);
 		void SetOpened(void* item, int opened);
-		int  GetOpened(void* item);
+		int GetOpened(void* item);
 		void Reset();
 	};
 }; // namespace MwCXX

include/MwCXX/Widget/Viewport.h

@@ -16,7 +16,7 @@ namespace MwCXX {
 		Viewport(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
 		MwCXX::Base* GetViewport();
-		void	     SetSize(int w, int h);
+		void SetSize(int w, int h);
 	};
 }; // namespace MwCXX
 

include/MwCXX/Widget/Window.h

@@ -16,17 +16,17 @@ namespace MwCXX {
 		Window(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
 
 		MwCXX::String GetTitle();
-		void	      SetTitle(MwCXX::String value);
-		int	      GetMain();
-		void	      SetMain(int value);
-		MwLLPixmap    GetIconPixmap();
-		void	      SetIconPixmap(MwLLPixmap value);
-		MwSizeHints*  GetSizeHints();
-		void	      SetSizeHints(MwSizeHints* value);
-		int	      GetHasBorder();
-		void	      SetHasBorder(int value);
-		int	      GetInverted();
-		void	      SetInverted(int value);
+		void SetTitle(MwCXX::String value);
+		int GetMain();
+		void SetMain(int value);
+		MwLLPixmap GetIconPixmap();
+		void SetIconPixmap(MwLLPixmap value);
+		MwSizeHints* GetSizeHints();
+		void SetSizeHints(MwSizeHints* value);
+		int GetHasBorder();
+		void SetHasBorder(int value);
+		int GetInverted();
+		void SetInverted(int value);
 
 		virtual void OnColorChosen(MwRGB value) {};
 		virtual void OnFileChosen(MwCXX::String value) {};