From 0e358d20d5051a57a85871fd10761dc70aa2341d Mon Sep 17 00:00:00 2001 From: Nishi Date: Tue, 15 Sep 2026 12:00:07 +0900 Subject: [PATCH] update --- include/MwCXX/Widget/All.h | 1 + include/MwCXX/Widget/BaseAuto.h | 78 +++++++++++++++--------------- include/MwCXX/Widget/Box.h | 12 ++--- include/MwCXX/Widget/Button.h | 18 +++---- include/MwCXX/Widget/Calendar.h | 10 ++-- include/MwCXX/Widget/Chart.h | 8 +-- include/MwCXX/Widget/CheckBox.h | 2 +- include/MwCXX/Widget/Clock.h | 6 +-- include/MwCXX/Widget/ComboBox.h | 10 ++-- include/MwCXX/Widget/Document.h | 27 +++++++++++ include/MwCXX/Widget/Entry.h | 6 +-- include/MwCXX/Widget/Frame.h | 10 ++-- include/MwCXX/Widget/Image.h | 14 +++--- include/MwCXX/Widget/Label.h | 22 ++++----- include/MwCXX/Widget/ListBox.h | 16 +++--- include/MwCXX/Widget/NumberEntry.h | 2 +- include/MwCXX/Widget/OpenGL.h | 4 +- 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/SubWindow.h | 6 +-- include/MwCXX/Widget/Tab.h | 4 +- include/MwCXX/Widget/Table.h | 12 ++--- include/MwCXX/Widget/TreeView.h | 6 +-- include/MwCXX/Widget/Viewport.h | 2 +- include/MwCXX/Widget/Window.h | 22 ++++----- objs.mk | 2 +- src/dialog/colorpicker.cc | 9 ++-- src/dialog/directorychooser.cc | 9 ++-- src/dialog/filechooser.cc | 19 +++++--- src/dialog/messagebox.cc | 16 +++--- src/widget/baseauto.cc | 29 ++++++----- src/widget/box.cc | 7 +-- src/widget/button.cc | 9 ++-- src/widget/calendar.cc | 7 +-- src/widget/chart.cc | 26 +++++----- src/widget/checkbox.cc | 7 +-- src/widget/clock.cc | 7 +-- src/widget/combobox.cc | 31 ++++++------ src/widget/document.cc | 34 +++++++++++++ src/widget/entry.cc | 9 ++-- src/widget/frame.cc | 7 +-- src/widget/image.cc | 7 +-- src/widget/label.cc | 12 ++--- src/widget/listbox.cc | 39 +++++++-------- src/widget/menu.cc | 14 +++--- src/widget/numberentry.cc | 9 ++-- src/widget/opengl.cc | 24 +++++---- src/widget/progressbar.cc | 7 +-- src/widget/radiobox.cc | 7 +-- src/widget/scrollbar.cc | 12 ++--- src/widget/submenu.cc | 17 +++---- src/widget/subwindow.cc | 12 ++--- src/widget/tab.cc | 28 +++++------ src/widget/table.cc | 7 +-- src/widget/treeview.cc | 34 ++++++------- src/widget/viewport.cc | 17 +++---- src/widget/vulkan.cc | 12 ++--- src/widget/window.cc | 18 +++---- 60 files changed, 448 insertions(+), 376 deletions(-) create mode 100644 include/MwCXX/Widget/Document.h create mode 100644 src/widget/document.cc diff --git a/include/MwCXX/Widget/All.h b/include/MwCXX/Widget/All.h index f4f06f1..21d5701 100644 --- a/include/MwCXX/Widget/All.h +++ b/include/MwCXX/Widget/All.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include diff --git a/include/MwCXX/Widget/BaseAuto.h b/include/MwCXX/Widget/BaseAuto.h index 626d5b9..0d86ea5 100644 --- a/include/MwCXX/Widget/BaseAuto.h +++ b/include/MwCXX/Widget/BaseAuto.h @@ -1,50 +1,51 @@ 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) {}; +virtual void OnDragAndDrop(MwCXX::String value) {}; virtual void OnFocusIn() {}; virtual void OnFocusOut() {}; virtual void OnKey(int value) {}; @@ -57,6 +58,7 @@ virtual void OnTick() {}; void (*ClipboardHandler)(MwCXX::Base* widget, MwCXX::String value); void (*DarkThemeHandler)(MwCXX::Base* widget, int value); +void (*DragAndDropHandler)(MwCXX::Base* widget, MwCXX::String value); void (*FocusInHandler)(MwCXX::Base* widget); void (*FocusOutHandler)(MwCXX::Base* widget); void (*KeyHandler)(MwCXX::Base* widget, int value); diff --git a/include/MwCXX/Widget/Box.h b/include/MwCXX/Widget/Box.h index b91f589..e53ae89 100644 --- a/include/MwCXX/Widget/Box.h +++ b/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 diff --git a/include/MwCXX/Widget/Button.h b/include/MwCXX/Widget/Button.h index 033d013..d2bfc28 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/Calendar.h b/include/MwCXX/Widget/Calendar.h index 3dfa589..7baacef 100644 --- a/include/MwCXX/Widget/Calendar.h +++ b/include/MwCXX/Widget/Calendar.h @@ -15,15 +15,15 @@ namespace MwCXX { 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(); + int GetYear(); void SetYear(int value); - int GetMonth(); + int GetMonth(); void SetMonth(int value); - int GetDate(); + int GetDate(); void SetDate(int value); - int GetDay(); + int GetDay(); void SetDay(int value); - int GetScale(); + int GetScale(); void SetScale(int value); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/Chart.h b/include/MwCXX/Widget/Chart.h index 71210e8..bb22bd1 100644 --- a/include/MwCXX/Widget/Chart.h +++ b/include/MwCXX/Widget/Chart.h @@ -15,14 +15,14 @@ namespace MwCXX { Chart(MwWidget widget, MwCXX::Base* parent = NULL); Chart(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height); - int GetType(); + int GetType(); void SetType(int value); - int GetMinValue(); + int GetMinValue(); void SetMinValue(int value); - int GetMaxValue(); + int GetMaxValue(); void SetMaxValue(int value); - int Set(int index, MwCXX::String text, double value, MwCXX::String color); + int Set(int index, MwCXX::String text, double value, MwCXX::String color); void Delete(int index); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/CheckBox.h b/include/MwCXX/Widget/CheckBox.h index 042206f..090da8c 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/Clock.h b/include/MwCXX/Widget/Clock.h index f7a79d4..d83d553 100644 --- a/include/MwCXX/Widget/Clock.h +++ b/include/MwCXX/Widget/Clock.h @@ -15,11 +15,11 @@ namespace MwCXX { Clock(MwWidget widget, MwCXX::Base* parent = NULL); Clock(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height); - int GetHour(); + int GetHour(); void SetHour(int value); - int GetMinute(); + int GetMinute(); void SetMinute(int value); - int GetSecond(); + int GetSecond(); void SetSecond(int value); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/ComboBox.h b/include/MwCXX/Widget/ComboBox.h index d1f5228..ee139e8 100644 --- a/include/MwCXX/Widget/ComboBox.h +++ b/include/MwCXX/Widget/ComboBox.h @@ -15,19 +15,19 @@ 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) {}; void (*ComboBoxChangedHandler)(MwCXX::ComboBox* widget, int value); - void Add(int index, MwCXX::String text); + void Add(int index, MwCXX::String text); MwCXX::String Get(int index, MwCXX::String text); - void Delete(int index); - void Reset(); + void Delete(int index); + void Reset(); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/Document.h b/include/MwCXX/Widget/Document.h new file mode 100644 index 0000000..d92e26e --- /dev/null +++ b/include/MwCXX/Widget/Document.h @@ -0,0 +1,27 @@ +#ifndef __MWCXX_WIDGET_DOCUMENT_H__ +#define __MWCXX_WIDGET_DOCUMENT_H__ + +#include +#include + +#include + +namespace MwCXX { + class Document : public MwCXX::Base { + protected: + virtual void RegisterHandlers(); + + public: + Document(MwWidget widget, MwCXX::Base* parent = NULL); + Document(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height); + + MwCXX::String GetText(); + void SetText(MwCXX::String value); + + virtual void OnLayout(int value) {}; + + void (*LayoutHandler)(MwCXX::Document* widget, int value); + }; +}; // namespace MwCXX + +#endif diff --git a/include/MwCXX/Widget/Entry.h b/include/MwCXX/Widget/Entry.h index 242d6b3..4499d0b 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 5ac32f4..9d7d76d 100644 --- a/include/MwCXX/Widget/Frame.h +++ b/include/MwCXX/Widget/Frame.h @@ -15,12 +15,12 @@ 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(); - void SetHasBorder(int value); - int GetInverted(); - void SetInverted(int value); + int GetHasBorder(); + void SetHasBorder(int value); + int GetInverted(); + void SetInverted(int value); MwLLPixmap GetIconPixmap(); - void SetIconPixmap(MwLLPixmap value); + void SetIconPixmap(MwLLPixmap value); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/Image.h b/include/MwCXX/Widget/Image.h index 063301f..3a23ba2 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 d1e6edf..6707b71 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); void SetSevenSegment(int index, int data); }; diff --git a/include/MwCXX/Widget/ListBox.h b/include/MwCXX/Widget/ListBox.h index 8b6cbda..7088ec0 100644 --- a/include/MwCXX/Widget/ListBox.h +++ b/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 diff --git a/include/MwCXX/Widget/NumberEntry.h b/include/MwCXX/Widget/NumberEntry.h index 9e88bab..a7fb295 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/OpenGL.h b/include/MwCXX/Widget/OpenGL.h index 0d615e3..9eaf394 100644 --- a/include/MwCXX/Widget/OpenGL.h +++ b/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 diff --git a/include/MwCXX/Widget/ProgressBar.h b/include/MwCXX/Widget/ProgressBar.h index d776a64..d6d3b12 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 0554dec..551d9eb 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 ad4dba5..2fdd9e6 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 d105598..cb23ddc 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); void Appear(void* menu, MwPoint* point, int diff_calc); diff --git a/include/MwCXX/Widget/SubWindow.h b/include/MwCXX/Widget/SubWindow.h index bdaa873..6f1a3a4 100644 --- a/include/MwCXX/Widget/SubWindow.h +++ b/include/MwCXX/Widget/SubWindow.h @@ -15,10 +15,10 @@ namespace MwCXX { 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); + MwLLPixmap GetIconPixmap(); + void SetIconPixmap(MwLLPixmap value); MwCXX::String GetTitle(); - void SetTitle(MwCXX::String value); + void SetTitle(MwCXX::String value); virtual void OnClose() {}; diff --git a/include/MwCXX/Widget/Tab.h b/include/MwCXX/Widget/Tab.h index 7b39eb5..091c4d0 100644 --- a/include/MwCXX/Widget/Tab.h +++ b/include/MwCXX/Widget/Tab.h @@ -15,7 +15,7 @@ namespace MwCXX { 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(); + int GetValue(); void SetValue(int value); virtual void OnChanged() {}; @@ -24,7 +24,7 @@ namespace MwCXX { MwCXX::Base* Add(MwCXX::String name); MwCXX::Base* GetFrame(MwCXX::String name); - void Focus(MwCXX::String name); + void Focus(MwCXX::String name); }; }; // namespace MwCXX diff --git a/include/MwCXX/Widget/Table.h b/include/MwCXX/Widget/Table.h index 9716336..cff88dc 100644 --- a/include/MwCXX/Widget/Table.h +++ b/include/MwCXX/Widget/Table.h @@ -15,17 +15,17 @@ namespace MwCXX { 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(); + int GetColumns(); void SetColumns(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 diff --git a/include/MwCXX/Widget/TreeView.h b/include/MwCXX/Widget/TreeView.h index 2da657a..41f5641 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) {}; @@ -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 diff --git a/include/MwCXX/Widget/Viewport.h b/include/MwCXX/Widget/Viewport.h index e3131fe..794d964 100644 --- a/include/MwCXX/Widget/Viewport.h +++ b/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 diff --git a/include/MwCXX/Widget/Window.h b/include/MwCXX/Widget/Window.h index d619170..c44b5b7 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); virtual void OnColorChosen(MwRGB value) {}; virtual void OnFileChosen(MwCXX::String value) {}; diff --git a/objs.mk b/objs.mk index 1d3b35f..60c9423 100644 --- a/objs.mk +++ b/objs.mk @@ -1 +1 @@ -OBJS += src/dialog/colorpicker.o src/dialog/filechooser.o src/dialog/directorychooser.o src/dialog/messagebox.o src/widget/baseauto.o src/widget/box.o src/widget/button.o src/widget/calendar.o src/widget/chart.o src/widget/checkbox.o src/widget/clock.o src/widget/entry.o src/widget/frame.o src/widget/image.o src/widget/label.o src/widget/listbox.o src/widget/menu.o src/widget/numberentry.o src/widget/scrollbar.o src/widget/submenu.o src/widget/viewport.o src/widget/window.o src/widget/progressbar.o src/widget/radiobox.o src/widget/combobox.o src/widget/treeview.o src/widget/subwindow.o src/widget/table.o src/widget/tab.o src/widget/opengl.o src/widget/vulkan.o +OBJS += src/dialog/colorpicker.o src/dialog/filechooser.o src/dialog/directorychooser.o src/dialog/messagebox.o src/widget/baseauto.o src/widget/box.o src/widget/button.o src/widget/calendar.o src/widget/chart.o src/widget/checkbox.o src/widget/clock.o src/widget/document.o src/widget/entry.o src/widget/frame.o src/widget/image.o src/widget/label.o src/widget/listbox.o src/widget/menu.o src/widget/numberentry.o src/widget/scrollbar.o src/widget/submenu.o src/widget/viewport.o src/widget/window.o src/widget/progressbar.o src/widget/radiobox.o src/widget/combobox.o src/widget/treeview.o src/widget/subwindow.o src/widget/table.o src/widget/tab.o src/widget/opengl.o src/widget/vulkan.o diff --git a/src/dialog/colorpicker.cc b/src/dialog/colorpicker.cc index 248d06a..6b86852 100644 --- a/src/dialog/colorpicker.cc +++ b/src/dialog/colorpicker.cc @@ -1,11 +1,12 @@ #include MwCXX::Window* MwCXX::ColorPicker(MwCXX::Base* handle, MwCXX::String title) { - return new MwCXX::Window(MwColorPicker((handle == NULL ? NULL : handle->GetWidget()), + return new MwCXX::Window(MwColorPicker((handle == NULL ? NULL : 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 7caff72..1261b87 100644 --- a/src/dialog/directorychooser.cc +++ b/src/dialog/directorychooser.cc @@ -1,11 +1,12 @@ #include MwCXX::Window* MwCXX::DirectoryChooser(MwCXX::Base* handle, MwCXX::String title) { - return new MwCXX::Window(MwDirectoryChooser((handle == NULL ? NULL : handle->GetWidget()), + return new MwCXX::Window(MwDirectoryChooser((handle == NULL ? NULL : 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 7ce05df..b36c739 100644 --- a/src/dialog/filechooser.cc +++ b/src/dialog/filechooser.cc @@ -1,20 +1,23 @@ #include MwCXX::Window* MwCXX::FileChooser(MwCXX::Base* handle, MwCXX::String title) { - return new MwCXX::Window(MwFileChooser((handle == NULL ? NULL : handle->GetWidget()), + return new MwCXX::Window(MwFileChooser((handle == NULL ? NULL : 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 == NULL ? NULL : handle->GetWidget()), + return new MwCXX::Window(MwFileChooserEx((handle == NULL ? NULL : 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 2be75c9..4c7e16b 100644 --- a/src/dialog/messagebox.cc +++ b/src/dialog/messagebox.cc @@ -1,19 +1,21 @@ #include MwCXX::Window* MwCXX::MessageBox(MwCXX::Base* handle, MwCXX::String text, MwCXX::String title, unsigned int flag) { - return new MwCXX::Window(MwMessageBox((handle == NULL ? NULL : handle->GetWidget()), + return new MwCXX::Window(MwMessageBox((handle == NULL ? NULL : 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 - , (unsigned int)flag), handle); + , + (unsigned int)flag), + handle); } MwCXX::Button* MwCXX::MessageBoxGetChild(MwCXX::Window* handle, int child) { return new MwCXX::Button(MwMessageBoxGetChild((handle == NULL ? NULL : handle->GetWidget()), (int)child), handle); diff --git a/src/widget/baseauto.cc b/src/widget/baseauto.cc index 5731fbb..aa77aea 100644 --- a/src/widget/baseauto.cc +++ b/src/widget/baseauto.cc @@ -209,6 +209,11 @@ static void __OnDarkTheme(MwWidget handle, void* user, void* call) { if(((MwCXX::Base*)user)->DarkThemeHandler != NULL) ((MwCXX::Base*)user)->DarkThemeHandler((MwCXX::Base*)user, *(int*)call); } +static void __OnDragAndDrop(MwWidget handle, void* user, void* call) { + ((MwCXX::Base*)user)->OnDragAndDrop((MwCXX::String)(char*)call); + if(((MwCXX::Base*)user)->DragAndDropHandler != NULL) ((MwCXX::Base*)user)->DragAndDropHandler((MwCXX::Base*)user, (MwCXX::String)(char*)call); +} + static void __OnFocusIn(MwWidget handle, void* user, void* call) { ((MwCXX::Base*)user)->OnFocusIn(); if(((MwCXX::Base*)user)->FocusInHandler != NULL) ((MwCXX::Base*)user)->FocusInHandler((MwCXX::Base*)user); @@ -257,6 +262,7 @@ static void __OnTick(MwWidget handle, void* user, void* call) { void MwCXX::Base::RegisterHandlers() { MwAddUserHandler(this->widget, MwNclipboardHandler, __OnClipboard, (void*)this); MwAddUserHandler(this->widget, MwNdarkThemeHandler, __OnDarkTheme, (void*)this); + MwAddUserHandler(this->widget, MwNdragAndDropHandler, __OnDragAndDrop, (void*)this); MwAddUserHandler(this->widget, MwNfocusInHandler, __OnFocusIn, (void*)this); MwAddUserHandler(this->widget, MwNfocusOutHandler, __OnFocusOut, (void*)this); MwAddUserHandler(this->widget, MwNkeyHandler, __OnKey, (void*)this); @@ -267,15 +273,16 @@ 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->KeyReleaseHandler = NULL; - this->MouseDownHandler = NULL; - this->MouseMoveHandler = NULL; - this->MouseUpHandler = NULL; - this->ResizeHandler = NULL; - this->TickHandler = NULL; + this->ClipboardHandler = NULL; + this->DarkThemeHandler = NULL; + this->DragAndDropHandler = 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; } diff --git a/src/widget/box.cc b/src/widget/box.cc index 0c10b1c..b6ddab1 100644 --- a/src/widget/box.cc +++ b/src/widget/box.cc @@ -1,10 +1,12 @@ #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(); } @@ -58,4 +60,3 @@ void MwCXX::Box::SetWaitLayout(int value) { void MwCXX::Box::RegisterHandlers() { } - diff --git a/src/widget/button.cc b/src/widget/button.cc index 47235f1..6e93e8c 100644 --- a/src/widget/button.cc +++ b/src/widget/button.cc @@ -1,10 +1,12 @@ #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(); } @@ -67,6 +69,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/calendar.cc b/src/widget/calendar.cc index c7f4473..3130039 100644 --- a/src/widget/calendar.cc +++ b/src/widget/calendar.cc @@ -1,10 +1,12 @@ #include -MwCXX::Calendar::Calendar(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { +MwCXX::Calendar::Calendar(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Calendar::Calendar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwCalendarClass, name, parent, x, y, width, height) { +MwCXX::Calendar::Calendar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwCalendarClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -50,4 +52,3 @@ void MwCXX::Calendar::SetScale(int value) { void MwCXX::Calendar::RegisterHandlers() { } - diff --git a/src/widget/chart.cc b/src/widget/chart.cc index b22c992..88849bd 100644 --- a/src/widget/chart.cc +++ b/src/widget/chart.cc @@ -1,10 +1,12 @@ #include -MwCXX::Chart::Chart(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { +MwCXX::Chart::Chart(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Chart::Chart(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwChartClass, name, parent, x, y, width, height) { +MwCXX::Chart::Chart(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwChartClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -35,29 +37,27 @@ void MwCXX::Chart::SetMaxValue(int value) { void MwCXX::Chart::RegisterHandlers() { } -int MwCXX::Chart::Set(int index, MwCXX::String text, double value, MwCXX::String color) - { +int MwCXX::Chart::Set(int index, MwCXX::String text, double value, MwCXX::String color) { int out; MwVaWidgetExecute(this->widget, "mwChartSet", &out, index, #ifdef MWCXX_USE_C_STRING - text + text #else - text.c_str() + text.c_str() #endif -, value, + , + value, #ifdef MWCXX_USE_C_STRING - color + color #else - color.c_str() + color.c_str() #endif ); return out; } -void MwCXX::Chart::Delete(int index) - { - MwVaWidgetExecute(this->widget, "mwChartDelete", NULL, index ); +void MwCXX::Chart::Delete(int index) { + MwVaWidgetExecute(this->widget, "mwChartDelete", NULL, index); } - diff --git a/src/widget/checkbox.cc b/src/widget/checkbox.cc index 0d4d839..fdc52ad 100644 --- a/src/widget/checkbox.cc +++ b/src/widget/checkbox.cc @@ -1,10 +1,12 @@ #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(); } @@ -26,4 +28,3 @@ void MwCXX::CheckBox::RegisterHandlers() { this->ChangedHandler = NULL; } - diff --git a/src/widget/clock.cc b/src/widget/clock.cc index bc39d42..66f1f4f 100644 --- a/src/widget/clock.cc +++ b/src/widget/clock.cc @@ -1,10 +1,12 @@ #include -MwCXX::Clock::Clock(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { +MwCXX::Clock::Clock(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Clock::Clock(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwClockClass, name, parent, x, y, width, height) { +MwCXX::Clock::Clock(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwClockClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -34,4 +36,3 @@ void MwCXX::Clock::SetSecond(int value) { void MwCXX::Clock::RegisterHandlers() { } - diff --git a/src/widget/combobox.cc b/src/widget/combobox.cc index 0d4bad7..8e1283f 100644 --- a/src/widget/combobox.cc +++ b/src/widget/combobox.cc @@ -1,10 +1,12 @@ #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(); } @@ -35,26 +37,24 @@ void MwCXX::ComboBox::RegisterHandlers() { this->ComboBoxChangedHandler = NULL; } -void MwCXX::ComboBox::Add(int index, MwCXX::String text) - { +void MwCXX::ComboBox::Add(int index, MwCXX::String text) { MwVaWidgetExecute(this->widget, "mwComboBoxAdd", NULL, index, #ifdef MWCXX_USE_C_STRING - text + text #else - text.c_str() + text.c_str() #endif ); } -MwCXX::String MwCXX::ComboBox::Get(int index, MwCXX::String text) - { +MwCXX::String MwCXX::ComboBox::Get(int index, MwCXX::String text) { char* out; MwVaWidgetExecute(this->widget, "mwComboBoxGet", &out, index, #ifdef MWCXX_USE_C_STRING - text + text #else - text.c_str() + text.c_str() #endif ); @@ -65,13 +65,10 @@ MwCXX::String MwCXX::ComboBox::Get(int index, MwCXX::String text) #endif } -void MwCXX::ComboBox::Delete(int index) - { - MwVaWidgetExecute(this->widget, "mwComboBoxDelete", NULL, index ); +void MwCXX::ComboBox::Delete(int index) { + MwVaWidgetExecute(this->widget, "mwComboBoxDelete", NULL, index); } -void MwCXX::ComboBox::Reset() - { - MwVaWidgetExecute(this->widget, "mwComboBoxReset", NULL ); +void MwCXX::ComboBox::Reset() { + MwVaWidgetExecute(this->widget, "mwComboBoxReset", NULL); } - diff --git a/src/widget/document.cc b/src/widget/document.cc new file mode 100644 index 0000000..fc30a0e --- /dev/null +++ b/src/widget/document.cc @@ -0,0 +1,34 @@ +#include + +MwCXX::Document::Document(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { + this->RegisterHandlers(); +} + +MwCXX::Document::Document(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwDocumentClass, name, parent, x, y, width, height) { + this->RegisterHandlers(); +} + +MwCXX::String MwCXX::Document::GetText() { + return (MwCXX::String)MwGetText(this->widget, MwNtext); +} + +void MwCXX::Document::SetText(MwCXX::String value) { +#ifndef MWCXX_USE_C_STRING + MwSetText(this->widget, MwNtext, value.c_str()); +#else + MwSetText(this->widget, MwNtext, (MwCXX::String)value); +#endif +} + +static void __OnLayout(MwWidget handle, void* user, void* call) { + ((MwCXX::Document*)user)->OnLayout(*(int*)call); + if(((MwCXX::Document*)user)->LayoutHandler != NULL) ((MwCXX::Document*)user)->LayoutHandler((MwCXX::Document*)user, *(int*)call); +} + +void MwCXX::Document::RegisterHandlers() { + MwAddUserHandler(this->widget, MwNlayoutHandler, __OnLayout, (void*)this); + + this->LayoutHandler = NULL; +} diff --git a/src/widget/entry.cc b/src/widget/entry.cc index 8a09357..b360020 100644 --- a/src/widget/entry.cc +++ b/src/widget/entry.cc @@ -1,10 +1,12 @@ #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(); } @@ -43,6 +45,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 de08da4..d85ffff 100644 --- a/src/widget/frame.cc +++ b/src/widget/frame.cc @@ -1,10 +1,12 @@ #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(); } @@ -34,4 +36,3 @@ void MwCXX::Frame::SetIconPixmap(MwLLPixmap value) { void MwCXX::Frame::RegisterHandlers() { } - diff --git a/src/widget/image.cc b/src/widget/image.cc index 88fa785..075797f 100644 --- a/src/widget/image.cc +++ b/src/widget/image.cc @@ -1,10 +1,12 @@ #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(); } @@ -42,4 +44,3 @@ void MwCXX::Image::SetFillArea(int value) { void MwCXX::Image::RegisterHandlers() { } - diff --git a/src/widget/label.cc b/src/widget/label.cc index 7aef6c6..74c7b91 100644 --- a/src/widget/label.cc +++ b/src/widget/label.cc @@ -1,10 +1,12 @@ #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(); } @@ -63,8 +65,6 @@ void MwCXX::Label::SetLeftPadding(int value) { void MwCXX::Label::RegisterHandlers() { } -void MwCXX::Label::SetSevenSegment(int index, int data) - { - MwVaWidgetExecute(this->widget, "mwLabelSetSevenSegment", NULL, index, data ); +void MwCXX::Label::SetSevenSegment(int index, int data) { + MwVaWidgetExecute(this->widget, "mwLabelSetSevenSegment", NULL, index, data); } - diff --git a/src/widget/listbox.cc b/src/widget/listbox.cc index e8c6f5d..bc014ee 100644 --- a/src/widget/listbox.cc +++ b/src/widget/listbox.cc @@ -1,10 +1,12 @@ #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(); } @@ -43,36 +45,32 @@ void MwCXX::ListBox::RegisterHandlers() { this->ListBoxActivateHandler = NULL; } -int MwCXX::ListBox::Set(int row, int col, MwCXX::String text) - { +int MwCXX::ListBox::Set(int row, int col, MwCXX::String text) { int out; MwVaWidgetExecute(this->widget, "mwListBoxSet", &out, row, col, #ifdef MWCXX_USE_C_STRING - text + text #else - text.c_str() + text.c_str() #endif ); return out; } -void MwCXX::ListBox::SetIcon(int index, MwLLPixmap icon) - { - MwVaWidgetExecute(this->widget, "mwListBoxSetIcon", NULL, index, icon ); +void MwCXX::ListBox::SetIcon(int index, MwLLPixmap icon) { + MwVaWidgetExecute(this->widget, "mwListBoxSetIcon", NULL, index, icon); } -void MwCXX::ListBox::Delete(int index) - { - MwVaWidgetExecute(this->widget, "mwListBoxDelete", NULL, index ); +void MwCXX::ListBox::Delete(int index) { + MwVaWidgetExecute(this->widget, "mwListBoxDelete", NULL, index); } -MwCXX::String MwCXX::ListBox::Get(int index) - { +MwCXX::String MwCXX::ListBox::Get(int index) { char* out; - MwVaWidgetExecute(this->widget, "mwListBoxGet", &out, index ); + MwVaWidgetExecute(this->widget, "mwListBoxGet", &out, index); #ifdef MWCXX_USE_C_STRING return out; @@ -81,13 +79,10 @@ MwCXX::String MwCXX::ListBox::Get(int index) #endif } -void MwCXX::ListBox::SetWidth(int index, int width) - { - MwVaWidgetExecute(this->widget, "mwListBoxSetWidth", NULL, index, width ); +void MwCXX::ListBox::SetWidth(int index, int width) { + MwVaWidgetExecute(this->widget, "mwListBoxSetWidth", NULL, index, width); } -void MwCXX::ListBox::Reset() - { - MwVaWidgetExecute(this->widget, "mwListBoxReset", NULL ); +void MwCXX::ListBox::Reset() { + MwVaWidgetExecute(this->widget, "mwListBoxReset", NULL); } - diff --git a/src/widget/menu.cc b/src/widget/menu.cc index dbe6a90..91f2e9c 100644 --- a/src/widget/menu.cc +++ b/src/widget/menu.cc @@ -1,10 +1,12 @@ #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(); } @@ -19,18 +21,16 @@ void MwCXX::Menu::RegisterHandlers() { this->MenuHandler = NULL; } -void* MwCXX::Menu::Add(void* menu, MwCXX::String name) - { +void* MwCXX::Menu::Add(void* menu, MwCXX::String name) { void* out; MwVaWidgetExecute(this->widget, "mwMenuAdd", &out, menu, #ifdef MWCXX_USE_C_STRING - name + name #else - name.c_str() + name.c_str() #endif ); return out; } - diff --git a/src/widget/numberentry.cc b/src/widget/numberentry.cc index 42982c6..b8e1335 100644 --- a/src/widget/numberentry.cc +++ b/src/widget/numberentry.cc @@ -1,10 +1,12 @@ #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(); } @@ -35,6 +37,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 9fbedde..3c52aee 100644 --- a/src/widget/opengl.cc +++ b/src/widget/opengl.cc @@ -1,39 +1,37 @@ #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(); } void MwCXX::OpenGL::RegisterHandlers() { } -void MwCXX::OpenGL::MakeCurrent() - { - MwVaWidgetExecute(this->widget, "mwOpenGLMakeCurrent", NULL ); +void MwCXX::OpenGL::MakeCurrent() { + MwVaWidgetExecute(this->widget, "mwOpenGLMakeCurrent", NULL); } -void* MwCXX::OpenGL::GetProcAddress(MwCXX::String name) - { +void* MwCXX::OpenGL::GetProcAddress(MwCXX::String name) { void* out; MwVaWidgetExecute(this->widget, "mwOpenGLGetProcAddress", &out, #ifdef MWCXX_USE_C_STRING - name + name #else - name.c_str() + name.c_str() #endif ); return out; } -void MwCXX::OpenGL::SwapBuffer() - { - MwVaWidgetExecute(this->widget, "mwOpenGLSwapBuffer", NULL ); +void MwCXX::OpenGL::SwapBuffer() { + MwVaWidgetExecute(this->widget, "mwOpenGLSwapBuffer", NULL); } - diff --git a/src/widget/progressbar.cc b/src/widget/progressbar.cc index e140b51..86007f4 100644 --- a/src/widget/progressbar.cc +++ b/src/widget/progressbar.cc @@ -1,10 +1,12 @@ #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(); } @@ -34,4 +36,3 @@ void MwCXX::ProgressBar::SetValue(int value) { void MwCXX::ProgressBar::RegisterHandlers() { } - diff --git a/src/widget/radiobox.cc b/src/widget/radiobox.cc index bcc2507..36eb700 100644 --- a/src/widget/radiobox.cc +++ b/src/widget/radiobox.cc @@ -1,10 +1,12 @@ #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(); } @@ -26,4 +28,3 @@ void MwCXX::RadioBox::RegisterHandlers() { this->ChangedHandler = NULL; } - diff --git a/src/widget/scrollbar.cc b/src/widget/scrollbar.cc index 5d6dc78..8b1adb0 100644 --- a/src/widget/scrollbar.cc +++ b/src/widget/scrollbar.cc @@ -1,10 +1,12 @@ #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(); } @@ -67,12 +69,10 @@ void MwCXX::ScrollBar::RegisterHandlers() { this->ChangedHandler = NULL; } -int MwCXX::ScrollBar::GetVisibleLength() - { +int MwCXX::ScrollBar::GetVisibleLength() { int out; - MwVaWidgetExecute(this->widget, "mwScrollBarGetVisibleLength", &out ); + MwVaWidgetExecute(this->widget, "mwScrollBarGetVisibleLength", &out); return out; } - diff --git a/src/widget/submenu.cc b/src/widget/submenu.cc index c28f85f..191e574 100644 --- a/src/widget/submenu.cc +++ b/src/widget/submenu.cc @@ -1,10 +1,12 @@ #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(); } @@ -19,13 +21,10 @@ void MwCXX::SubMenu::SetLeftPadding(int value) { void MwCXX::SubMenu::RegisterHandlers() { } -void MwCXX::SubMenu::Appear(void* menu, MwPoint* point, int diff_calc) - { - MwVaWidgetExecute(this->widget, "mwSubMenuAppear", NULL, menu, point, diff_calc ); +void MwCXX::SubMenu::Appear(void* menu, MwPoint* point, int diff_calc) { + MwVaWidgetExecute(this->widget, "mwSubMenuAppear", NULL, menu, point, diff_calc); } -void MwCXX::SubMenu::GetSize(void* menu, MwRect* rect) - { - MwVaWidgetExecute(this->widget, "mwSubMenuGetSize", NULL, menu, rect ); +void MwCXX::SubMenu::GetSize(void* menu, MwRect* rect) { + MwVaWidgetExecute(this->widget, "mwSubMenuGetSize", NULL, menu, rect); } - diff --git a/src/widget/subwindow.cc b/src/widget/subwindow.cc index 91d7f6b..9ea6584 100644 --- a/src/widget/subwindow.cc +++ b/src/widget/subwindow.cc @@ -1,10 +1,12 @@ #include -MwCXX::SubWindow::SubWindow(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { +MwCXX::SubWindow::SubWindow(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::SubWindow::SubWindow(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwSubWindowClass, name, parent, x, y, width, height) { +MwCXX::SubWindow::SubWindow(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwSubWindowClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -39,12 +41,10 @@ void MwCXX::SubWindow::RegisterHandlers() { this->CloseHandler = NULL; } -MwCXX::Base* MwCXX::SubWindow::GetFrame() - { +MwCXX::Base* MwCXX::SubWindow::GetFrame() { MwCXX::Base* out; - MwVaWidgetExecute(this->widget, "mwSubWindowGetFrame", &out ); + MwVaWidgetExecute(this->widget, "mwSubWindowGetFrame", &out); return out; } - diff --git a/src/widget/tab.cc b/src/widget/tab.cc index 09aae38..4b99324 100644 --- a/src/widget/tab.cc +++ b/src/widget/tab.cc @@ -1,10 +1,12 @@ #include -MwCXX::Tab::Tab(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { +MwCXX::Tab::Tab(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Tab::Tab(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwTabClass, name, parent, x, y, width, height) { +MwCXX::Tab::Tab(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwTabClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -27,44 +29,40 @@ void MwCXX::Tab::RegisterHandlers() { this->ChangedHandler = NULL; } -MwCXX::Base* MwCXX::Tab::Add(MwCXX::String name) - { +MwCXX::Base* MwCXX::Tab::Add(MwCXX::String name) { MwCXX::Base* out; MwVaWidgetExecute(this->widget, "mwTabAdd", &out, #ifdef MWCXX_USE_C_STRING - name + name #else - name.c_str() + name.c_str() #endif ); return out; } -MwCXX::Base* MwCXX::Tab::GetFrame(MwCXX::String name) - { +MwCXX::Base* MwCXX::Tab::GetFrame(MwCXX::String name) { MwCXX::Base* out; MwVaWidgetExecute(this->widget, "mwTabGetFrame", &out, #ifdef MWCXX_USE_C_STRING - name + name #else - name.c_str() + name.c_str() #endif ); return out; } -void MwCXX::Tab::Focus(MwCXX::String name) - { +void MwCXX::Tab::Focus(MwCXX::String name) { MwVaWidgetExecute(this->widget, "mwTabFocus", NULL, #ifdef MWCXX_USE_C_STRING - name + name #else - name.c_str() + name.c_str() #endif ); } - diff --git a/src/widget/table.cc b/src/widget/table.cc index 6ada80f..a8fe6f4 100644 --- a/src/widget/table.cc +++ b/src/widget/table.cc @@ -1,10 +1,12 @@ #include -MwCXX::Table::Table(MwWidget widget, MwCXX::Base* parent) : MwCXX::Base(widget, parent) { +MwCXX::Table::Table(MwWidget widget, MwCXX::Base* parent) + : MwCXX::Base(widget, parent) { this->RegisterHandlers(); } -MwCXX::Table::Table(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) : MwCXX::Base(MwTableClass, name, parent, x, y, width, height) { +MwCXX::Table::Table(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) + : MwCXX::Base(MwTableClass, name, parent, x, y, width, height) { this->RegisterHandlers(); } @@ -58,4 +60,3 @@ void MwCXX::Table::SetWaitLayout(int value) { void MwCXX::Table::RegisterHandlers() { } - diff --git a/src/widget/treeview.cc b/src/widget/treeview.cc index 7354bff..f91ecbb 100644 --- a/src/widget/treeview.cc +++ b/src/widget/treeview.cc @@ -1,10 +1,12 @@ #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(); } @@ -35,38 +37,32 @@ void MwCXX::TreeView::RegisterHandlers() { this->TreeViewActivateHandler = NULL; } -void MwCXX::TreeView::Add(void* parent, MwLLPixmap pixmap, MwCXX::String item) - { +void MwCXX::TreeView::Add(void* parent, MwLLPixmap pixmap, MwCXX::String item) { MwVaWidgetExecute(this->widget, "mwTreeViewAdd", NULL, parent, pixmap, #ifdef MWCXX_USE_C_STRING - item + item #else - item.c_str() + item.c_str() #endif ); } -void MwCXX::TreeView::Delete(void* item) - { - MwVaWidgetExecute(this->widget, "mwTreeViewDelete", NULL, item ); +void MwCXX::TreeView::Delete(void* item) { + MwVaWidgetExecute(this->widget, "mwTreeViewDelete", NULL, item); } -void MwCXX::TreeView::SetOpened(void* item, int opened) - { - MwVaWidgetExecute(this->widget, "mwTreeViewSetOpened", NULL, item, opened ); +void MwCXX::TreeView::SetOpened(void* item, int opened) { + MwVaWidgetExecute(this->widget, "mwTreeViewSetOpened", NULL, item, opened); } -int MwCXX::TreeView::GetOpened(void* item) - { +int MwCXX::TreeView::GetOpened(void* item) { int out; - MwVaWidgetExecute(this->widget, "mwTreeViewGetOpened", &out, item ); + MwVaWidgetExecute(this->widget, "mwTreeViewGetOpened", &out, item); return out; } -void MwCXX::TreeView::Reset() - { - MwVaWidgetExecute(this->widget, "mwTreeViewReset", NULL ); +void MwCXX::TreeView::Reset() { + MwVaWidgetExecute(this->widget, "mwTreeViewReset", NULL); } - diff --git a/src/widget/viewport.cc b/src/widget/viewport.cc index e566887..9036917 100644 --- a/src/widget/viewport.cc +++ b/src/widget/viewport.cc @@ -1,27 +1,26 @@ #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(); } void MwCXX::Viewport::RegisterHandlers() { } -MwCXX::Base* MwCXX::Viewport::GetViewport() - { +MwCXX::Base* MwCXX::Viewport::GetViewport() { MwCXX::Base* out; - MwVaWidgetExecute(this->widget, "mwViewportGetViewport", &out ); + MwVaWidgetExecute(this->widget, "mwViewportGetViewport", &out); return out; } -void MwCXX::Viewport::SetSize(int w, int h) - { - MwVaWidgetExecute(this->widget, "mwViewportSetSize", NULL, w, h ); +void MwCXX::Viewport::SetSize(int w, int h) { + MwVaWidgetExecute(this->widget, "mwViewportSetSize", NULL, w, h); } - diff --git a/src/widget/vulkan.cc b/src/widget/vulkan.cc index 4fe592d..71b73bc 100644 --- a/src/widget/vulkan.cc +++ b/src/widget/vulkan.cc @@ -1,23 +1,23 @@ #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(); } void MwCXX::Vulkan::RegisterHandlers() { } -void* MwCXX::Vulkan::GetField(int field, int* output) - { +void* MwCXX::Vulkan::GetField(int field, int* output) { void* out; - MwVaWidgetExecute(this->widget, "mwVulkanGetField", &out, field, output ); + MwVaWidgetExecute(this->widget, "mwVulkanGetField", &out, field, output); return out; } - diff --git a/src/widget/window.cc b/src/widget/window.cc index 76f746f..7bd97d6 100644 --- a/src/widget/window.cc +++ b/src/widget/window.cc @@ -1,10 +1,12 @@ #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(); } @@ -86,14 +88,12 @@ void MwCXX::Window::RegisterHandlers() { MwAddUserHandler(this->widget, MwNdirectoryChosenHandler, __OnDirectoryChosen, (void*)this); MwAddUserHandler(this->widget, MwNcloseHandler, __OnClose, (void*)this); - this->ColorChosenHandler = NULL; - this->FileChosenHandler = NULL; + this->ColorChosenHandler = NULL; + this->FileChosenHandler = NULL; this->DirectoryChosenHandler = NULL; - this->CloseHandler = NULL; + this->CloseHandler = NULL; } -void MwCXX::Window::MakeBorderless() - { - MwVaWidgetExecute(this->widget, "mwWindowMakeBorderless", NULL ); +void MwCXX::Window::MakeBorderless() { + MwVaWidgetExecute(this->widget, "mwWindowMakeBorderless", NULL); } -