pyrite-dev/mwcxx
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix things

Browse source
This commit is contained in:
Nishi 2026-04-17 21:26:28 +09:00
commit 2c44efeb2f
Signed by: nishi
GPG key ID: 27EF69B208EB9343
48 changed files with 315 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -5,7 +5,7 @@ AlignConsecutiveAssignments:
Enabled: true
AlignConsecutiveDeclarations:
Enabled: true
IndentAccessModifiers: true
AccessModifierOffset: -4
NamespaceIndentation: All
IndentWidth: 8
PointerAlignment: Left

2
.gitignore vendored
View file

@ -3,3 +3,5 @@
/*.exe
/*.so
/*.dll
/a.out
*.o

22
bindgen.cxx
View file

@ -7,16 +7,16 @@
#include <locale>
struct typeinfo {
std::string type;
std::string name;
std::string struct_name;
int pointer;
std::string type;
std::string name;
std::string struct_name;
int pointer;
};
struct property {
typeinfo type;
int common;
typeinfo arg_type;
typeinfo type;
int common;
typeinfo arg_type;
};
std::map<std::string, std::ofstream> files;
@ -230,15 +230,15 @@ static void scan_widget(xl_node_t* node) {
OFS << "namespace MwCXX {" << std::endl;
OFS << " class " + name + " : public MwCXX::Base {" << std::endl;
OFS << " public:" << std::endl;
OFS << " " + name + "(MwWidget widget);" << std::endl;
OFS << " " + name + "(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);" << std::endl;
OFS << " public:" << std::endl;
OFS << " " + name + "(MwWidget widget);" << std::endl;
OFS << " " + name + "(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);" << std::endl;
if(nodes != NULL) {
std::string r = "";
for(i = 0; nodes[i] != NULL; i++) {
r += scan_widget_properties_header(nodes[i], "\t\t\t");
r += scan_widget_properties_header(nodes[i], "\t\t");
}
if(r != "") OFS << std::endl

12
include/MwCXX/Widget/Base.h
View file

@ -5,14 +5,14 @@
namespace MwCXX {
class Base {
protected:
MwWidget widget;
protected:
MwWidget widget;
public:
Base(MwWidget widget);
Base(MwClass widget_class, MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Base(MwWidget widget);
Base(MwClass widget_class, MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
void Loop();
void Loop();
#include <MwCXX/Widget/BaseAuto.h>
};

88
include/MwCXX/Widget/BaseAuto.h
View file

@ -1,58 +1,38 @@
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);
GetClipboard();
void SetClipboard( value);
GetDarkTheme();
void SetDarkTheme( value);
int GetFixedSize();
void SetFixedSize(int value);
GetFocusIn();
void SetFocusIn( value);
GetFocusOut();
void SetFocusOut( 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);
GetKey();
void SetKey( value);
GetKeyRelease();
void SetKeyRelease( value);
int GetModernLook();
void SetModernLook(int value);
GetMouseDown();
void SetMouseDown( value);
GetMouseMove();
void SetMouseMove( value);
GetMouseUp();
void SetMouseUp( value);
int GetRatio();
void SetRatio(int value);
GetResize();
void SetResize( 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);
GetTick();
void SetTick( 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);

26
include/MwCXX/Widget/Box.h
View file

@ -8,20 +8,20 @@
namespace MwCXX {
class Box : public MwCXX::Base {
public:
Box(MwWidget widget);
Box(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Box(MwWidget widget);
Box(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetOrientation();
void SetOrientation(int value);
int GetMargin();
void SetMargin(int value);
int GetPadding();
void SetPadding(int value);
int GetHasBorder();
void SetHasBorder(int value);
int GetInverted();
void SetInverted(int value);
int GetOrientation();
void SetOrientation(int value);
int GetMargin();
void SetMargin(int value);
int GetPadding();
void SetPadding(int value);
int GetHasBorder();
void SetHasBorder(int value);
int GetInverted();
void SetInverted(int value);
};
}; // namespace MwCXX

26
include/MwCXX/Widget/Button.h
View file

@ -8,20 +8,20 @@
namespace MwCXX {
class Button : public MwCXX::Base {
public:
Button(MwWidget widget);
Button(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Button(MwWidget widget);
Button(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
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);
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);
};
}; // namespace MwCXX

10
include/MwCXX/Widget/CheckBox.h
View file

@ -8,12 +8,12 @@
namespace MwCXX {
class CheckBox : public MwCXX::Base {
public:
CheckBox(MwWidget widget);
CheckBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
CheckBox(MwWidget widget);
CheckBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetChecked();
void SetChecked(int value);
int GetChecked();
void SetChecked(int value);
};
}; // namespace MwCXX

14
include/MwCXX/Widget/ComboBox.h
View file

@ -8,14 +8,14 @@
namespace MwCXX {
class ComboBox : public MwCXX::Base {
public:
ComboBox(MwWidget widget);
ComboBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
ComboBox(MwWidget widget);
ComboBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetAreaShown();
void SetAreaShown(int value);
int GetValue();
void SetValue(int value);
int GetAreaShown();
void SetAreaShown(int value);
int GetValue();
void SetValue(int value);
};
}; // namespace MwCXX

14
include/MwCXX/Widget/Entry.h
View file

@ -8,14 +8,14 @@
namespace MwCXX {
class Entry : public MwCXX::Base {
public:
Entry(MwWidget widget);
Entry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Entry(MwWidget widget);
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);
MwCXX::String GetText();
void SetText(MwCXX::String value);
int GetHideInput();
void SetHideInput(int value);
};
}; // namespace MwCXX

14
include/MwCXX/Widget/Frame.h
View file

@ -8,14 +8,14 @@
namespace MwCXX {
class Frame : public MwCXX::Base {
public:
Frame(MwWidget widget);
Frame(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Frame(MwWidget widget);
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);
};
}; // namespace MwCXX

22
include/MwCXX/Widget/Image.h
View file

@ -8,18 +8,18 @@
namespace MwCXX {
class Image : public MwCXX::Base {
public:
Image(MwWidget widget);
Image(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Image(MwWidget widget);
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);
MwLLPixmap GetPixmap();
void SetPixmap(MwLLPixmap value);
int GetHasBorder();
void SetHasBorder(int value);
int GetInverted();
void SetInverted(int value);
int GetFillArea();
void SetFillArea(int value);
};
}; // namespace MwCXX

30
include/MwCXX/Widget/Label.h
View file

@ -8,22 +8,22 @@
namespace MwCXX {
class Label : public MwCXX::Base {
public:
Label(MwWidget widget);
Label(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Label(MwWidget widget);
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);
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);
};
}; // namespace MwCXX

18
include/MwCXX/Widget/ListBox.h
View file

@ -8,16 +8,16 @@
namespace MwCXX {
class ListBox : public MwCXX::Base {
public:
ListBox(MwWidget widget);
ListBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
ListBox(MwWidget widget);
ListBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetLeftPadding();
void SetLeftPadding(int value);
int GetHasHeading();
void SetHasHeading(int value);
int GetSingleClickSelectable();
void SetSingleClickSelectable(int value);
int GetLeftPadding();
void SetLeftPadding(int value);
int GetHasHeading();
void SetHasHeading(int value);
int GetSingleClickSelectable();
void SetSingleClickSelectable(int value);
};
}; // namespace MwCXX

6
include/MwCXX/Widget/Menu.h
View file

@ -8,9 +8,9 @@
namespace MwCXX {
class Menu : public MwCXX::Base {
public:
Menu(MwWidget widget);
Menu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Menu(MwWidget widget);
Menu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
};
}; // namespace MwCXX

10
include/MwCXX/Widget/NumberEntry.h
View file

@ -8,12 +8,12 @@
namespace MwCXX {
class NumberEntry : public MwCXX::Base {
public:
NumberEntry(MwWidget widget);
NumberEntry(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
NumberEntry(MwWidget widget);
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);
MwCXX::String GetText();
void SetText(MwCXX::String value);
};
}; // namespace MwCXX

6
include/MwCXX/Widget/OpenGL.h
View file

@ -8,9 +8,9 @@
namespace MwCXX {
class OpenGL : public MwCXX::Base {
public:
OpenGL(MwWidget widget);
OpenGL(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
OpenGL(MwWidget widget);
OpenGL(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
};
}; // namespace MwCXX

18
include/MwCXX/Widget/ProgressBar.h
View file

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

10
include/MwCXX/Widget/RadioBox.h
View file

@ -8,12 +8,12 @@
namespace MwCXX {
class RadioBox : public MwCXX::Base {
public:
RadioBox(MwWidget widget);
RadioBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
RadioBox(MwWidget widget);
RadioBox(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetChecked();
void SetChecked(int value);
int GetChecked();
void SetChecked(int value);
};
}; // namespace MwCXX

30
include/MwCXX/Widget/ScrollBar.h
View file

@ -8,22 +8,22 @@
namespace MwCXX {
class ScrollBar : public MwCXX::Base {
public:
ScrollBar(MwWidget widget);
ScrollBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
ScrollBar(MwWidget widget);
ScrollBar(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetShowArrows();
void SetShowArrows(int value);
int GetAreaShown();
void SetAreaShown(int value);
int GetValue();
void SetValue(int value);
int GetMinValue();
void SetMinValue(int value);
int GetMaxValue();
void SetMaxValue(int value);
int GetOrientation();
void SetOrientation(int value);
int GetShowArrows();
void SetShowArrows(int value);
int GetAreaShown();
void SetAreaShown(int value);
int GetValue();
void SetValue(int value);
int GetMinValue();
void SetMinValue(int value);
int GetMaxValue();
void SetMaxValue(int value);
int GetOrientation();
void SetOrientation(int value);
};
}; // namespace MwCXX

10
include/MwCXX/Widget/SubMenu.h
View file

@ -8,12 +8,12 @@
namespace MwCXX {
class SubMenu : public MwCXX::Base {
public:
SubMenu(MwWidget widget);
SubMenu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
SubMenu(MwWidget widget);
SubMenu(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetLeftPadding();
void SetLeftPadding(int value);
int GetLeftPadding();
void SetLeftPadding(int value);
};
}; // namespace MwCXX

14
include/MwCXX/Widget/TreeView.h
View file

@ -8,14 +8,14 @@
namespace MwCXX {
class TreeView : public MwCXX::Base {
public:
TreeView(MwWidget widget);
TreeView(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
TreeView(MwWidget widget);
TreeView(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
int GetLeftPadding();
void SetLeftPadding(int value);
int GetSingleClickSelectable();
void SetSingleClickSelectable(int value);
int GetLeftPadding();
void SetLeftPadding(int value);
int GetSingleClickSelectable();
void SetSingleClickSelectable(int value);
};
}; // namespace MwCXX

6
include/MwCXX/Widget/Viewport.h
View file

@ -8,9 +8,9 @@
namespace MwCXX {
class Viewport : public MwCXX::Base {
public:
Viewport(MwWidget widget);
Viewport(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Viewport(MwWidget widget);
Viewport(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
};
}; // namespace MwCXX

6
include/MwCXX/Widget/Vulkan.h
View file

@ -8,9 +8,9 @@
namespace MwCXX {
class Vulkan : public MwCXX::Base {
public:
Vulkan(MwWidget widget);
Vulkan(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Vulkan(MwWidget widget);
Vulkan(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
};
}; // namespace MwCXX

30
include/MwCXX/Widget/Window.h
View file

@ -8,22 +8,22 @@
namespace MwCXX {
class Window : public MwCXX::Base {
public:
Window(MwWidget widget);
Window(MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height);
public:
Window(MwWidget widget);
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);
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);
};
}; // namespace MwCXX

4
src/widget/base.cxx
View file

@ -1,10 +1,10 @@
#include <MwCXX/Widget/Base.h>
MwCXX::Base::Base(MwWidget widget){
MwCXX::Base::Base(MwWidget widget) {
this->widget = widget;
}
MwCXX::Base::Base(MwClass widget_class, MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height){
MwCXX::Base::Base(MwClass widget_class, MwCXX::String name, MwCXX::Base* parent, int x, int y, unsigned int width, unsigned int height) {
#ifdef MWCXX_USE_C_STRING
this->widget = MwCreateWidget(widget_class, name, parent == NULL ? NULL : parent->widget, x, y, width, height);
#else

89
src/widget/baseauto.cxx
View file

@ -36,20 +36,12 @@ void MwCXX::Base::SetBorderWidth(int value) {
MwSetInteger(this->widget, MwNborderWidth, (int)value);
}
MwCXX::Base::GetClipboard() {
return ()MwGetVoid(this->widget, MwNclipboard);
int MwCXX::Base::GetDarkTheme() {
return (int)MwGetInteger(this->widget, MwNdarkTheme);
}
void MwCXX::Base::SetClipboard( value) {
MwSetVoid(this->widget, MwNclipboard, ()value);
}
MwCXX::Base::GetDarkTheme() {
return ()MwGetVoid(this->widget, MwNdarkTheme);
}
void MwCXX::Base::SetDarkTheme( value) {
MwSetVoid(this->widget, MwNdarkTheme, ()value);
void MwCXX::Base::SetDarkTheme(int value) {
MwSetInteger(this->widget, MwNdarkTheme, (int)value);
}
int MwCXX::Base::GetFixedSize() {
@ -60,22 +52,6 @@ void MwCXX::Base::SetFixedSize(int value) {
MwSetInteger(this->widget, MwNfixedSize, (int)value);
}
MwCXX::Base::GetFocusIn() {
return ()MwGetVoid(this->widget, MwNfocusIn);
}
void MwCXX::Base::SetFocusIn( value) {
MwSetVoid(this->widget, MwNfocusIn, ()value);
}
MwCXX::Base::GetFocusOut() {
return ()MwGetVoid(this->widget, MwNfocusOut);
}
void MwCXX::Base::SetFocusOut( value) {
MwSetVoid(this->widget, MwNfocusOut, ()value);
}
int MwCXX::Base::GetForceInverted() {
return (int)MwGetInteger(this->widget, MwNforceInverted);
}
@ -112,22 +88,6 @@ void MwCXX::Base::SetIsRounded(int value) {
MwSetInteger(this->widget, MwNisRounded, (int)value);
}
MwCXX::Base::GetKey() {
return ()MwGetVoid(this->widget, MwNkey);
}
void MwCXX::Base::SetKey( value) {
MwSetVoid(this->widget, MwNkey, ()value);
}
MwCXX::Base::GetKeyRelease() {
return ()MwGetVoid(this->widget, MwNkeyRelease);
}
void MwCXX::Base::SetKeyRelease( value) {
MwSetVoid(this->widget, MwNkeyRelease, ()value);
}
int MwCXX::Base::GetModernLook() {
return (int)MwGetInteger(this->widget, MwNmodernLook);
}
@ -136,30 +96,6 @@ void MwCXX::Base::SetModernLook(int value) {
MwSetInteger(this->widget, MwNmodernLook, (int)value);
}
MwCXX::Base::GetMouseDown() {
return ()MwGetVoid(this->widget, MwNmouseDown);
}
void MwCXX::Base::SetMouseDown( value) {
MwSetVoid(this->widget, MwNmouseDown, ()value);
}
MwCXX::Base::GetMouseMove() {
return ()MwGetVoid(this->widget, MwNmouseMove);
}
void MwCXX::Base::SetMouseMove( value) {
MwSetVoid(this->widget, MwNmouseMove, ()value);
}
MwCXX::Base::GetMouseUp() {
return ()MwGetVoid(this->widget, MwNmouseUp);
}
void MwCXX::Base::SetMouseUp( value) {
MwSetVoid(this->widget, MwNmouseUp, ()value);
}
int MwCXX::Base::GetRatio() {
return (int)MwGetInteger(this->widget, MwNratio);
}
@ -168,14 +104,6 @@ void MwCXX::Base::SetRatio(int value) {
MwSetInteger(this->widget, MwNratio, (int)value);
}
MwCXX::Base::GetResize() {
return ()MwGetVoid(this->widget, MwNresize);
}
void MwCXX::Base::SetResize( value) {
MwSetVoid(this->widget, MwNresize, ()value);
}
MwCXX::String MwCXX::Base::GetSubBackground() {
return (MwCXX::String)MwGetText(this->widget, MwNsubBackground);
}
@ -200,14 +128,6 @@ void MwCXX::Base::SetSubForeground(MwCXX::String value) {
#endif
}
MwCXX::Base::GetTick() {
return ()MwGetVoid(this->widget, MwNtick);
}
void MwCXX::Base::SetTick( value) {
MwSetVoid(this->widget, MwNtick, ()value);
}
int MwCXX::Base::GetUseMonospace() {
return (int)MwGetInteger(this->widget, MwNuseMonospace);
}
@ -247,4 +167,3 @@ int MwCXX::Base::GetY() {
void MwCXX::Base::SetY(int value) {
MwSetInteger(this->widget, MwNy, (int)value);
}

7
src/widget/box.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Box.h>
MwCXX::Box::Box(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Box::Box(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::Box::GetOrientation() {
@ -45,4 +47,3 @@ int MwCXX::Box::GetInverted() {
void MwCXX::Box::SetInverted(int value) {
MwSetInteger(this->widget, MwNinverted, (int)value);
}

7
src/widget/button.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Button.h>
MwCXX::Button::Button(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Button::Button(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
MwLLPixmap MwCXX::Button::GetPixmap() {
@ -49,4 +51,3 @@ int MwCXX::Button::GetFillArea() {
void MwCXX::Button::SetFillArea(int value) {
MwSetInteger(this->widget, MwNfillArea, (int)value);
}

7
src/widget/checkbox.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/CheckBox.h>
MwCXX::CheckBox::CheckBox(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::CheckBox::CheckBox(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::CheckBox::GetChecked() {
@ -13,4 +15,3 @@ int MwCXX::CheckBox::GetChecked() {
void MwCXX::CheckBox::SetChecked(int value) {
MwSetInteger(this->widget, MwNchecked, (int)value);
}

7
src/widget/combobox.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/ComboBox.h>
MwCXX::ComboBox::ComboBox(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::ComboBox::ComboBox(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::ComboBox::GetAreaShown() {
@ -21,4 +23,3 @@ int MwCXX::ComboBox::GetValue() {
void MwCXX::ComboBox::SetValue(int value) {
MwSetInteger(this->widget, MwNvalue, (int)value);
}

7
src/widget/entry.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Entry.h>
MwCXX::Entry::Entry(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Entry::Entry(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
MwCXX::String MwCXX::Entry::GetText() {
@ -25,4 +27,3 @@ int MwCXX::Entry::GetHideInput() {
void MwCXX::Entry::SetHideInput(int value) {
MwSetInteger(this->widget, MwNhideInput, (int)value);
}

7
src/widget/frame.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Frame.h>
MwCXX::Frame::Frame(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Frame::Frame(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::Frame::GetHasBorder() {
@ -21,4 +23,3 @@ int MwCXX::Frame::GetInverted() {
void MwCXX::Frame::SetInverted(int value) {
MwSetInteger(this->widget, MwNinverted, (int)value);
}

7
src/widget/image.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Image.h>
MwCXX::Image::Image(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Image::Image(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
MwLLPixmap MwCXX::Image::GetPixmap() {
@ -37,4 +39,3 @@ int MwCXX::Image::GetFillArea() {
void MwCXX::Image::SetFillArea(int value) {
MwSetInteger(this->widget, MwNfillArea, (int)value);
}

7
src/widget/label.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Label.h>
MwCXX::Label::Label(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Label::Label(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
MwCXX::String MwCXX::Label::GetText() {
@ -57,4 +59,3 @@ int MwCXX::Label::GetLeftPadding() {
void MwCXX::Label::SetLeftPadding(int value) {
MwSetInteger(this->widget, MwNleftPadding, (int)value);
}

7
src/widget/listbox.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/ListBox.h>
MwCXX::ListBox::ListBox(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::ListBox::ListBox(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::ListBox::GetLeftPadding() {
@ -29,4 +31,3 @@ int MwCXX::ListBox::GetSingleClickSelectable() {
void MwCXX::ListBox::SetSingleClickSelectable(int value) {
MwSetInteger(this->widget, MwNsingleClickSelectable, (int)value);
}

7
src/widget/menu.cxx
View file

@ -1,8 +1,9 @@
#include <MwCXX/Widget/Menu.h>
MwCXX::Menu::Menu(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Menu::Menu(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}

7
src/widget/numberentry.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/NumberEntry.h>
MwCXX::NumberEntry::NumberEntry(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::NumberEntry::NumberEntry(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
MwCXX::String MwCXX::NumberEntry::GetText() {
@ -17,4 +19,3 @@ void MwCXX::NumberEntry::SetText(MwCXX::String value) {
MwSetText(this->widget, MwNtext, (MwCXX::String)value);
#endif
}

7
src/widget/opengl.cxx
View file

@ -1,9 +1,10 @@
#define MW_OPENGL_NO_INCLUDE
#include <MwCXX/Widget/OpenGL.h>
MwCXX::OpenGL::OpenGL(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::OpenGL::OpenGL(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}

7
src/widget/progressbar.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/ProgressBar.h>
MwCXX::ProgressBar::ProgressBar(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::ProgressBar::ProgressBar(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::ProgressBar::GetMinValue() {
@ -29,4 +31,3 @@ int MwCXX::ProgressBar::GetValue() {
void MwCXX::ProgressBar::SetValue(int value) {
MwSetInteger(this->widget, MwNvalue, (int)value);
}

7
src/widget/radiobox.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/RadioBox.h>
MwCXX::RadioBox::RadioBox(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::RadioBox::RadioBox(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::RadioBox::GetChecked() {
@ -13,4 +15,3 @@ int MwCXX::RadioBox::GetChecked() {
void MwCXX::RadioBox::SetChecked(int value) {
MwSetInteger(this->widget, MwNchecked, (int)value);
}

7
src/widget/scrollbar.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/ScrollBar.h>
MwCXX::ScrollBar::ScrollBar(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::ScrollBar::ScrollBar(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::ScrollBar::GetShowArrows() {
@ -53,4 +55,3 @@ int MwCXX::ScrollBar::GetOrientation() {
void MwCXX::ScrollBar::SetOrientation(int value) {
MwSetInteger(this->widget, MwNorientation, (int)value);
}

7
src/widget/submenu.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/SubMenu.h>
MwCXX::SubMenu::SubMenu(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::SubMenu::SubMenu(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::SubMenu::GetLeftPadding() {
@ -13,4 +15,3 @@ int MwCXX::SubMenu::GetLeftPadding() {
void MwCXX::SubMenu::SetLeftPadding(int value) {
MwSetInteger(this->widget, MwNleftPadding, (int)value);
}

7
src/widget/treeview.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/TreeView.h>
MwCXX::TreeView::TreeView(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::TreeView::TreeView(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
int MwCXX::TreeView::GetLeftPadding() {
@ -21,4 +23,3 @@ int MwCXX::TreeView::GetSingleClickSelectable() {
void MwCXX::TreeView::SetSingleClickSelectable(int value) {
MwSetInteger(this->widget, MwNsingleClickSelectable, (int)value);
}

7
src/widget/viewport.cxx
View file

@ -1,8 +1,9 @@
#include <MwCXX/Widget/Viewport.h>
MwCXX::Viewport::Viewport(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Viewport::Viewport(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}

7
src/widget/vulkan.cxx
View file

@ -1,9 +1,10 @@
#define MW_VULKAN_NO_INCLUDE
#include <MwCXX/Widget/Vulkan.h>
MwCXX::Vulkan::Vulkan(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Vulkan::Vulkan(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}

7
src/widget/window.cxx
View file

@ -1,9 +1,11 @@
#include <MwCXX/Widget/Window.h>
MwCXX::Window::Window(MwWidget widget) : MwCXX::Base(widget) {
MwCXX::Window::Window(MwWidget widget)
: MwCXX::Base(widget) {
}
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) {
}
MwCXX::String MwCXX::Window::GetTitle() {
@ -57,4 +59,3 @@ int MwCXX::Window::GetInverted() {
void MwCXX::Window::SetInverted(int value) {
MwSetInteger(this->widget, MwNinverted, (int)value);
}

28
test.cxx
View file

@ -5,25 +5,25 @@
#include <iostream>
class MyButton : public MwCXX::Button {
protected:
void OnActivate() {
std::cout << "Hello" << std::endl;
}
protected:
void OnActivate() {
std::cout << "Hello" << std::endl;
}
public:
MWCXX_CONSTRUCTOR(MyButton, MwCXX::Button) {
this->SetText("Hello, world!");
}
public:
MWCXX_CONSTRUCTOR(MyButton, MwCXX::Button) {
this->SetText("Hello, world!");
}
};
class MyWindow : public MwCXX::Window {
private:
MyButton* epic;
private:
MyButton* epic;
public:
MWCXX_CONSTRUCTOR(MyWindow, MwCXX::Window) {
this->epic = new MyButton("epic app", this, 10, 10, 640 - 10 * 2, 480 - 10 * 2);
}
public:
MWCXX_CONSTRUCTOR(MyWindow, MwCXX::Window) {
this->epic = new MyButton("epic app", this, 10, 10, 640 - 10 * 2, 480 - 10 * 2);
}
};
int main() {