github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-02 08:12:42 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Ctrl::exitcode removed (4 bytes saved..)

Browse source
This commit is contained in:
Mirek Fidler 2022-04-12 09:39:10 +02:00
parent 59c095e344
commit b97ddd71ed
4 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -629,7 +629,6 @@ Ctrl::Ctrl() {
destroying = false;
parent = prev = next = firstchild = lastchild = NULL;
top = NULL;
exitcode = 0;
frame.Add().frame = &NullFrame();
enabled = visible = wantfocus = initfocus = true;
editable = true;
@ -1102,7 +1101,8 @@ void Ctrl::EndLoop(int code)
{
GuiLock __;
ASSERT(!parent);
exitcode = code;
TopWindow *w = GetTopWindow();
w->exitcode = code;
EndLoop();
}
@ -1118,12 +1118,6 @@ bool Ctrl::InCurrentLoop() const
return GetLoopCtrl() == this;
}
int Ctrl::GetExitCode() const
{
GuiLock __;
return exitcode;
}
#ifdef HAS_TopFrameDraw
ViewDraw::ViewDraw(Ctrl *ctrl, const Rect& r)

2
uppsrc/CtrlCore/CtrlCore.h
View file

@ -489,7 +489,6 @@ private:
};
Top *top;
int exitcode;
Ctrl *prev, *next;
Ctrl *firstchild, *lastchild;//16
@ -1255,7 +1254,6 @@ public:
void EndLoop(int code);
bool InLoop() const;
bool InCurrentLoop() const;
int GetExitCode() const;
static PasteClip& Clipboard();
static PasteClip& Selection();

4
uppsrc/CtrlCore/TopWindow.h
View file

@ -48,6 +48,8 @@ private:
bool fullscreen;
byte center:2;
int exitcode = 0;
void PlaceFocus();
void ActiveFocus0(Ctrl& ctrl);
@ -91,6 +93,8 @@ private:
GUIPLATFORM_TOPWINDOW_DECLS
#endif
friend class Ctrl;
public:
virtual void ShutdownWindow();

6
uppsrc/CtrlCore/lay0.h
View file

@ -54,9 +54,9 @@
#define LAYOUT(nm, x, y) template <class L, class D> \
void InitLayout(UPP::Ctrl& parent, L& layout, D& uts, nm##__layid&) { \
parent.LayoutId(#nm);
#define UNTYPED(var, param) uts.var.param; uts.var.LayoutId(#var); parent.Add(uts.var);
#define ITEM(clss, var, param) layout.var.param; layout.var.LayoutId(#var); parent.Add(layout.var);
parent.LayoutIdLiteral(#nm);
#define UNTYPED(var, param) uts.var.param; uts.var.LayoutIdLiteral(#var); parent.Add(uts.var);
#define ITEM(clss, var, param) layout.var.param; layout.var.LayoutIdLiteral(#var); parent.Add(layout.var);
#define END_LAYOUT }
#include LAYOUTFILE