From db7238f1ed66f016d3350fcaa90a1cd0aa07925b Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sat, 18 Apr 2026 19:46:43 +0900 Subject: [PATCH] updates --- include/MwCXX/Dialog/MessageBox.h | 2 +- include/MwCXX/Widget/BaseAuto.h | 68 +++++++++++++++--------------- include/MwCXX/Widget/Box.h | 10 ++--- include/MwCXX/Widget/Button.h | 18 ++++---- include/MwCXX/Widget/CheckBox.h | 2 +- include/MwCXX/Widget/ComboBox.h | 4 +- include/MwCXX/Widget/Entry.h | 6 +-- include/MwCXX/Widget/Frame.h | 4 +- include/MwCXX/Widget/Image.h | 14 +++--- include/MwCXX/Widget/Label.h | 22 +++++----- include/MwCXX/Widget/ListBox.h | 6 +-- include/MwCXX/Widget/NumberEntry.h | 2 +- include/MwCXX/Widget/ProgressBar.h | 6 +-- include/MwCXX/Widget/RadioBox.h | 2 +- include/MwCXX/Widget/ScrollBar.h | 12 +++--- include/MwCXX/Widget/SubMenu.h | 2 +- include/MwCXX/Widget/TreeView.h | 4 +- include/MwCXX/Widget/Window.h | 22 +++++----- src/dialog/colorpicker.cc | 9 ++-- src/dialog/directorychooser.cc | 9 ++-- src/dialog/filechooser.cc | 19 ++++----- src/dialog/messagebox.cc | 16 +++---- src/widget/baseauto.cc | 20 ++++----- src/widget/box.cc | 6 +-- src/widget/button.cc | 8 ++-- src/widget/checkbox.cc | 6 +-- src/widget/combobox.cc | 6 +-- src/widget/entry.cc | 8 ++-- src/widget/frame.cc | 6 +-- src/widget/image.cc | 6 +-- src/widget/label.cc | 6 +-- src/widget/listbox.cc | 6 +-- src/widget/menu.cc | 6 +-- src/widget/numberentry.cc | 8 ++-- src/widget/opengl.cc | 6 +-- src/widget/progressbar.cc | 6 +-- src/widget/radiobox.cc | 6 +-- src/widget/scrollbar.cc | 6 +-- src/widget/submenu.cc | 6 +-- src/widget/treeview.cc | 6 +-- src/widget/viewport.cc | 6 +-- src/widget/vulkan.cc | 6 +-- src/widget/window.cc | 6 +-- 43 files changed, 179 insertions(+), 226 deletions(-) diff --git a/include/MwCXX/Dialog/MessageBox.h b/include/MwCXX/Dialog/MessageBox.h index ee95b60..d168079 100644 --- a/include/MwCXX/Dialog/MessageBox.h +++ b/include/MwCXX/Dialog/MessageBox.h @@ -6,7 +6,7 @@ namespace MwCXX { MwCXX::Window* MessageBox(MwCXX::Base* handle, MwCXX::String text, MwCXX::String title, int flag); MwCXX::Button* MessageBoxGetChild(MwCXX::Window* handle, int child); - void MessageBoxDestroy(MwCXX::Window* handle); + void MessageBoxDestroy(MwCXX::Window* handle); }; // namespace MwCXX #endif diff --git a/include/MwCXX/Widget/BaseAuto.h b/include/MwCXX/Widget/BaseAuto.h index a0f729b..4555329 100644 --- a/include/MwCXX/Widget/BaseAuto.h +++ b/include/MwCXX/Widget/BaseAuto.h @@ -1,41 +1,41 @@ 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 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 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); -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 SetSubForeground(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) {}; diff --git a/include/MwCXX/Widget/Box.h b/include/MwCXX/Widget/Box.h index 79e9c00..332ef72 100644 --- a/include/MwCXX/Widget/Box.h +++ b/include/MwCXX/Widget/Box.h @@ -15,15 +15,15 @@ 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); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/Button.h b/include/MwCXX/Widget/Button.h index d2bfc28..033d013 100644 --- a/include/MwCXX/Widget/Button.h +++ b/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() {}; diff --git a/include/MwCXX/Widget/CheckBox.h b/include/MwCXX/Widget/CheckBox.h index 090da8c..042206f 100644 --- a/include/MwCXX/Widget/CheckBox.h +++ b/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() {}; diff --git a/include/MwCXX/Widget/ComboBox.h b/include/MwCXX/Widget/ComboBox.h index 5f58ef2..4336f40 100644 --- a/include/MwCXX/Widget/ComboBox.h +++ b/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) {}; diff --git a/include/MwCXX/Widget/Entry.h b/include/MwCXX/Widget/Entry.h index 4499d0b..242d6b3 100644 --- a/include/MwCXX/Widget/Entry.h +++ b/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() {}; diff --git a/include/MwCXX/Widget/Frame.h b/include/MwCXX/Widget/Frame.h index 43c1db1..a430c0c 100644 --- a/include/MwCXX/Widget/Frame.h +++ b/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 diff --git a/include/MwCXX/Widget/Image.h b/include/MwCXX/Widget/Image.h index 3a23ba2..063301f 100644 --- a/include/MwCXX/Widget/Image.h +++ b/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 diff --git a/include/MwCXX/Widget/Label.h b/include/MwCXX/Widget/Label.h index 716b8f9..f81524e 100644 --- a/include/MwCXX/Widget/Label.h +++ b/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); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/ListBox.h b/include/MwCXX/Widget/ListBox.h index 1f02b7d..d8076c5 100644 --- a/include/MwCXX/Widget/ListBox.h +++ b/include/MwCXX/Widget/ListBox.h @@ -15,11 +15,11 @@ 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) {}; diff --git a/include/MwCXX/Widget/NumberEntry.h b/include/MwCXX/Widget/NumberEntry.h index a7fb295..9e88bab 100644 --- a/include/MwCXX/Widget/NumberEntry.h +++ b/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() {}; diff --git a/include/MwCXX/Widget/ProgressBar.h b/include/MwCXX/Widget/ProgressBar.h index d6d3b12..d776a64 100644 --- a/include/MwCXX/Widget/ProgressBar.h +++ b/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 diff --git a/include/MwCXX/Widget/RadioBox.h b/include/MwCXX/Widget/RadioBox.h index 551d9eb..0554dec 100644 --- a/include/MwCXX/Widget/RadioBox.h +++ b/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() {}; diff --git a/include/MwCXX/Widget/ScrollBar.h b/include/MwCXX/Widget/ScrollBar.h index f01af73..da83ddb 100644 --- a/include/MwCXX/Widget/ScrollBar.h +++ b/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() {}; diff --git a/include/MwCXX/Widget/SubMenu.h b/include/MwCXX/Widget/SubMenu.h index 4c807b5..9886f2b 100644 --- a/include/MwCXX/Widget/SubMenu.h +++ b/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); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/TreeView.h b/include/MwCXX/Widget/TreeView.h index a2f4752..630a941 100644 --- a/include/MwCXX/Widget/TreeView.h +++ b/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) {}; diff --git a/include/MwCXX/Widget/Window.h b/include/MwCXX/Widget/Window.h index d82f30e..7476b1e 100644 --- a/include/MwCXX/Widget/Window.h +++ b/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); }; }; // namespace MwCXX diff --git a/src/dialog/colorpicker.cc b/src/dialog/colorpicker.cc index 45d7d22..987c38d 100644 --- a/src/dialog/colorpicker.cc +++ b/src/dialog/colorpicker.cc @@ -1,12 +1,11 @@ #include MwCXX::Window* MwCXX::ColorPicker(MwCXX::Base* handle, MwCXX::String title) { - return new MwCXX::Window(MwColorPicker(handle->GetWidget(), + return new MwCXX::Window(MwColorPicker(handle->GetWidget(), #ifdef MWCXX_USE_C_STRING - title +title #else - title.c_str() +title.c_str() #endif - ), - handle); + ), handle); } diff --git a/src/dialog/directorychooser.cc b/src/dialog/directorychooser.cc index 61b4fc4..33609dd 100644 --- a/src/dialog/directorychooser.cc +++ b/src/dialog/directorychooser.cc @@ -1,12 +1,11 @@ #include MwCXX::Window* MwCXX::DirectoryChooser(MwCXX::Base* handle, MwCXX::String title) { - return new MwCXX::Window(MwDirectoryChooser(handle->GetWidget(), + return new MwCXX::Window(MwDirectoryChooser(handle->GetWidget(), #ifdef MWCXX_USE_C_STRING - title +title #else - title.c_str() +title.c_str() #endif - ), - handle); + ), handle); } diff --git a/src/dialog/filechooser.cc b/src/dialog/filechooser.cc index ecc4009..0238021 100644 --- a/src/dialog/filechooser.cc +++ b/src/dialog/filechooser.cc @@ -1,23 +1,20 @@ #include MwCXX::Window* MwCXX::FileChooser(MwCXX::Base* handle, MwCXX::String title) { - return new MwCXX::Window(MwFileChooser(handle->GetWidget(), + return new MwCXX::Window(MwFileChooser(handle->GetWidget(), #ifdef MWCXX_USE_C_STRING - title +title #else - title.c_str() +title.c_str() #endif - ), - handle); + ), handle); } MwCXX::Window* MwCXX::FileChooserEx(MwCXX::Base* handle, MwCXX::String title, int dir) { - return new MwCXX::Window(MwFileChooserEx(handle->GetWidget(), + return new MwCXX::Window(MwFileChooserEx(handle->GetWidget(), #ifdef MWCXX_USE_C_STRING - title +title #else - title.c_str() +title.c_str() #endif - , - (int)dir), - handle); + , (int)dir), handle); } diff --git a/src/dialog/messagebox.cc b/src/dialog/messagebox.cc index ca5c5d7..3674a3e 100644 --- a/src/dialog/messagebox.cc +++ b/src/dialog/messagebox.cc @@ -1,21 +1,19 @@ #include MwCXX::Window* MwCXX::MessageBox(MwCXX::Base* handle, MwCXX::String text, MwCXX::String title, int flag) { - return new MwCXX::Window(MwMessageBox(handle->GetWidget(), + return new MwCXX::Window(MwMessageBox(handle->GetWidget(), #ifdef MWCXX_USE_C_STRING - text +text #else - text.c_str() +text.c_str() #endif - , + , #ifdef MWCXX_USE_C_STRING - title +title #else - title.c_str() +title.c_str() #endif - , - (int)flag), - handle); + , (int)flag), handle); } MwCXX::Button* MwCXX::MessageBoxGetChild(MwCXX::Window* handle, int child) { return new MwCXX::Button(MwMessageBoxGetChild(handle->GetWidget(), (int)child), handle); diff --git a/src/widget/baseauto.cc b/src/widget/baseauto.cc index 07a1306..d59f205 100644 --- a/src/widget/baseauto.cc +++ b/src/widget/baseauto.cc @@ -235,15 +235,15 @@ void MwCXX::Base::RegisterHandlers() { MwAddUserHandler(this->widget, MwNresizeHandler, __OnResize, (void*)this); MwAddUserHandler(this->widget, MwNtickHandler, __OnTick, (void*)this); - this->ClipboardHandler = NULL; - this->DarkThemeHandler = NULL; - this->FocusInHandler = NULL; - this->FocusOutHandler = NULL; - this->KeyHandler = NULL; + this->ClipboardHandler = NULL; + this->DarkThemeHandler = NULL; + this->FocusInHandler = NULL; + this->FocusOutHandler = NULL; + this->KeyHandler = NULL; this->KeyReleaseHandler = NULL; - this->MouseDownHandler = NULL; - this->MouseMoveHandler = NULL; - this->MouseUpHandler = NULL; - this->ResizeHandler = NULL; - this->TickHandler = NULL; + this->MouseDownHandler = NULL; + this->MouseMoveHandler = NULL; + this->MouseUpHandler = NULL; + this->ResizeHandler = NULL; + this->TickHandler = NULL; } diff --git a/src/widget/box.cc b/src/widget/box.cc index 974b796..984558e 100644 --- a/src/widget/box.cc +++ b/src/widget/box.cc @@ -1,12 +1,10 @@ #include -MwCXX::Box::Box(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Box::Box(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Box::Box(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwBoxClass, name, parent, x, y, width, height) { +MwCXX::Box::Box(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwBoxClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/button.cc b/src/widget/button.cc index 6e93e8c..5b35564 100644 --- a/src/widget/button.cc +++ b/src/widget/button.cc @@ -1,12 +1,10 @@ #include -MwCXX::Button::Button(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Button::Button(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Button::Button(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwButtonClass, name, parent, x, y, width, height) { +MwCXX::Button::Button(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwButtonClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -69,5 +67,5 @@ void MwCXX::Button::RegisterHandlers() { MwAddUserHandler(this->widget, MwNchangedHandler, __OnChanged, (void*)this); this->ActivateHandler = NULL; - this->ChangedHandler = NULL; + this->ChangedHandler = NULL; } diff --git a/src/widget/checkbox.cc b/src/widget/checkbox.cc index fdc52ad..203f37c 100644 --- a/src/widget/checkbox.cc +++ b/src/widget/checkbox.cc @@ -1,12 +1,10 @@ #include -MwCXX::CheckBox::CheckBox(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::CheckBox::CheckBox(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::CheckBox::CheckBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwCheckBoxClass, name, parent, x, y, width, height) { +MwCXX::CheckBox::CheckBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwCheckBoxClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/combobox.cc b/src/widget/combobox.cc index 2d4986e..1037203 100644 --- a/src/widget/combobox.cc +++ b/src/widget/combobox.cc @@ -1,12 +1,10 @@ #include -MwCXX::ComboBox::ComboBox(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::ComboBox::ComboBox(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::ComboBox::ComboBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwComboBoxClass, name, parent, x, y, width, height) { +MwCXX::ComboBox::ComboBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwComboBoxClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/entry.cc b/src/widget/entry.cc index b360020..32c1234 100644 --- a/src/widget/entry.cc +++ b/src/widget/entry.cc @@ -1,12 +1,10 @@ #include -MwCXX::Entry::Entry(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Entry::Entry(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Entry::Entry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwEntryClass, name, parent, x, y, width, height) { +MwCXX::Entry::Entry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwEntryClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -45,5 +43,5 @@ void MwCXX::Entry::RegisterHandlers() { MwAddUserHandler(this->widget, MwNchangedHandler, __OnChanged, (void*)this); this->ActivateHandler = NULL; - this->ChangedHandler = NULL; + this->ChangedHandler = NULL; } diff --git a/src/widget/frame.cc b/src/widget/frame.cc index a13f39c..d9df84a 100644 --- a/src/widget/frame.cc +++ b/src/widget/frame.cc @@ -1,12 +1,10 @@ #include -MwCXX::Frame::Frame(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Frame::Frame(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Frame::Frame(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwFrameClass, name, parent, x, y, width, height) { +MwCXX::Frame::Frame(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwFrameClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/image.cc b/src/widget/image.cc index 075797f..ee1a131 100644 --- a/src/widget/image.cc +++ b/src/widget/image.cc @@ -1,12 +1,10 @@ #include -MwCXX::Image::Image(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Image::Image(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Image::Image(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwImageClass, name, parent, x, y, width, height) { +MwCXX::Image::Image(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwImageClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/label.cc b/src/widget/label.cc index 5128489..a11a1a7 100644 --- a/src/widget/label.cc +++ b/src/widget/label.cc @@ -1,12 +1,10 @@ #include -MwCXX::Label::Label(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Label::Label(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Label::Label(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwLabelClass, name, parent, x, y, width, height) { +MwCXX::Label::Label(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwLabelClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/listbox.cc b/src/widget/listbox.cc index b7283f9..3d6d4ca 100644 --- a/src/widget/listbox.cc +++ b/src/widget/listbox.cc @@ -1,12 +1,10 @@ #include -MwCXX::ListBox::ListBox(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::ListBox::ListBox(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::ListBox::ListBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwListBoxClass, name, parent, x, y, width, height) { +MwCXX::ListBox::ListBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwListBoxClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/menu.cc b/src/widget/menu.cc index 169be72..813735d 100644 --- a/src/widget/menu.cc +++ b/src/widget/menu.cc @@ -1,12 +1,10 @@ #include -MwCXX::Menu::Menu(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Menu::Menu(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Menu::Menu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwMenuClass, name, parent, x, y, width, height) { +MwCXX::Menu::Menu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwMenuClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/numberentry.cc b/src/widget/numberentry.cc index b8e1335..36ec06a 100644 --- a/src/widget/numberentry.cc +++ b/src/widget/numberentry.cc @@ -1,12 +1,10 @@ #include -MwCXX::NumberEntry::NumberEntry(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::NumberEntry::NumberEntry(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::NumberEntry::NumberEntry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwNumberEntryClass, name, parent, x, y, width, height) { +MwCXX::NumberEntry::NumberEntry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwNumberEntryClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -37,5 +35,5 @@ void MwCXX::NumberEntry::RegisterHandlers() { MwAddUserHandler(this->widget, MwNchangedHandler, __OnChanged, (void*)this); this->ActivateHandler = NULL; - this->ChangedHandler = NULL; + this->ChangedHandler = NULL; } diff --git a/src/widget/opengl.cc b/src/widget/opengl.cc index b93feb1..d566ef7 100644 --- a/src/widget/opengl.cc +++ b/src/widget/opengl.cc @@ -1,13 +1,11 @@ #define MW_OPENGL_NO_INCLUDE #include -MwCXX::OpenGL::OpenGL(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::OpenGL::OpenGL(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::OpenGL::OpenGL(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwOpenGLClass, name, parent, x, y, width, height) { +MwCXX::OpenGL::OpenGL(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwOpenGLClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/progressbar.cc b/src/widget/progressbar.cc index 86007f4..492c0d6 100644 --- a/src/widget/progressbar.cc +++ b/src/widget/progressbar.cc @@ -1,12 +1,10 @@ #include -MwCXX::ProgressBar::ProgressBar(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::ProgressBar::ProgressBar(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::ProgressBar::ProgressBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwProgressBarClass, name, parent, x, y, width, height) { +MwCXX::ProgressBar::ProgressBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwProgressBarClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/radiobox.cc b/src/widget/radiobox.cc index 36eb700..bb2dad9 100644 --- a/src/widget/radiobox.cc +++ b/src/widget/radiobox.cc @@ -1,12 +1,10 @@ #include -MwCXX::RadioBox::RadioBox(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::RadioBox::RadioBox(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::RadioBox::RadioBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwRadioBoxClass, name, parent, x, y, width, height) { +MwCXX::RadioBox::RadioBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwRadioBoxClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/scrollbar.cc b/src/widget/scrollbar.cc index 34337cc..b074ff9 100644 --- a/src/widget/scrollbar.cc +++ b/src/widget/scrollbar.cc @@ -1,12 +1,10 @@ #include -MwCXX::ScrollBar::ScrollBar(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::ScrollBar::ScrollBar(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::ScrollBar::ScrollBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwScrollBarClass, name, parent, x, y, width, height) { +MwCXX::ScrollBar::ScrollBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwScrollBarClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/submenu.cc b/src/widget/submenu.cc index 2c14776..516ced8 100644 --- a/src/widget/submenu.cc +++ b/src/widget/submenu.cc @@ -1,12 +1,10 @@ #include -MwCXX::SubMenu::SubMenu(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::SubMenu::SubMenu(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::SubMenu::SubMenu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwSubMenuClass, name, parent, x, y, width, height) { +MwCXX::SubMenu::SubMenu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwSubMenuClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/treeview.cc b/src/widget/treeview.cc index 5d4d8ec..e819d0d 100644 --- a/src/widget/treeview.cc +++ b/src/widget/treeview.cc @@ -1,12 +1,10 @@ #include -MwCXX::TreeView::TreeView(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::TreeView::TreeView(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::TreeView::TreeView(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwTreeViewClass, name, parent, x, y, width, height) { +MwCXX::TreeView::TreeView(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwTreeViewClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/viewport.cc b/src/widget/viewport.cc index 5842042..918ce69 100644 --- a/src/widget/viewport.cc +++ b/src/widget/viewport.cc @@ -1,12 +1,10 @@ #include -MwCXX::Viewport::Viewport(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Viewport::Viewport(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Viewport::Viewport(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwViewportClass, name, parent, x, y, width, height) { +MwCXX::Viewport::Viewport(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwViewportClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/vulkan.cc b/src/widget/vulkan.cc index abce262..dcc81cb 100644 --- a/src/widget/vulkan.cc +++ b/src/widget/vulkan.cc @@ -1,13 +1,11 @@ #define MW_VULKAN_NO_INCLUDE #include -MwCXX::Vulkan::Vulkan(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Vulkan::Vulkan(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Vulkan::Vulkan(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwVulkanClass, name, parent, x, y, width, height) { +MwCXX::Vulkan::Vulkan(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwVulkanClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } diff --git a/src/widget/window.cc b/src/widget/window.cc index f0e85d0..ec6063d 100644 --- a/src/widget/window.cc +++ b/src/widget/window.cc @@ -1,12 +1,10 @@ #include -MwCXX::Window::Window(MwWidget widget, MwCXX::Base* parent) - : MwCXX::Base(widget, parent) { +MwCXX::Window::Window(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Window::Window(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) - : MwCXX::Base(MwWindowClass, name, parent, x, y, width, height) { +MwCXX::Window::Window(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwWindowClass, name, parent, x, y, width, height) { this->RegisterHandlers(); }