git-svn-id: svn://ultimatepp.org/upp/trunk@11944 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-05-15 08:33:39 +00:00
parent 10be0102d9
commit 52c00ae86d
4 changed files with 4 additions and 49 deletions

View file

@ -255,7 +255,7 @@ void AppMain()
.DefaultExt("qtf");
LoadFromFile(callback(UWord::SerializeApp));
UWord uword;
new UWord;
Ctrl::EventLoop();
StoreToFile(callback(UWord::SerializeApp));
}

View file

@ -4,49 +4,4 @@ public:
~ViewDraw();
};
/*
class ViewDraw : public SystemDraw {
Vector<Rect> dummy;
public:
ViewDraw(Ctrl *) : SystemDraw(Ctrl::framebuffer, dummy) { dummy.Add(Rect(10, 10, 100, 100)); }
};
*/
class DHCtrl : Ctrl {};
#if 0
#ifdef PLATFORM_WIN32
#define GUI_APP_MAIN \
void GuiMainFn_(); \
\
extern "C" int main(int argc, char *argv[]) { \
UPP::AppInit__(argc, (const char **)argv); \
FBInit(); \
GuiMainFn_(); \
UPP::Ctrl::CloseTopCtrls(); \
FBDeInit(); \
return UPP::GetExitCode(); \
} \
\
void GuiMainFn_()
#endif
#ifdef PLATFORM_POSIX
#define GUI_APP_MAIN \
void GuiMainFn_(); \
\
extern "C" int main(int argc, const char **argv, const char **envptr) { \
UPP::AppInit__(argc, argv, envptr); \
FBInit(); \
GuiMainFn_(); \
UPP::Ctrl::CloseTopCtrls(); \
FBDeInit(); \
return UPP::GetExitCode(); \
} \
\
void GuiMainFn_()
#endif
#endif

View file

@ -2,7 +2,7 @@
#ifdef VIRTUALGUI
NAMESPACE_UPP
namespace Upp {
class TopWindowFrame : public Ctrl {
public:
@ -58,6 +58,6 @@ public:
TopWindowFrame();
};
END_UPP_NAMESPACE
}
#endif

View file

@ -42,7 +42,7 @@ void TopWindow::SyncCaption()
frame->sizeable = sizeable;
frame->RefreshLayout();
frame->Refresh();
frame->close << [=] { WhenClose(); };
frame->close ^= [=] { WhenClose(); };
frame->icon = icon;
frame->Enable(IsEnabled());
}