Merge continued

git-svn-id: svn://ultimatepp.org/upp/trunk@10263 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-10-04 08:34:39 +00:00
parent adf46bd64e
commit 2e4b276e07
3860 changed files with 1161787 additions and 438 deletions

View file

@ -0,0 +1,53 @@
#include <CtrlLib/CtrlLib.h>
#include <GLCtrl/GLCtrl.h>
using namespace Upp;
class GLTest : public GLCtrl
{
virtual void GLPaint()
{
glClearColor(1.0, 1.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT);
}
};
class GLControlTest : public TopWindow
{
typedef GLControlTest CLASSNAME;
private:
Splitter _splitter;
GLTest _glTest;
ImageCtrl _imgCtrl;
MenuBar _menuBar;
void Test()
{
}
void MainMenu(Bar &bar)
{
bar.Add("Test", THISBACK(Test));
}
public:
GLControlTest()
{
SetRect(0, 0, 500, 400);
AddFrame(_menuBar);
_menuBar.Set(THISBACK(MainMenu));
_imgCtrl.AddFrame(InsetFrame());
_glTest.AddFrame(InsetFrame());
_splitter.Horz(_imgCtrl, _glTest);
*this << _splitter;
}
};
GUI_APP_MAIN
{
GLControlTest().Run();
}