diff --git a/uppdev/AccessKey/main.cpp b/uppdev/AccessKey/main.cpp index bdedbf2e0..3d17491ee 100644 --- a/uppdev/AccessKey/main.cpp +++ b/uppdev/AccessKey/main.cpp @@ -15,6 +15,21 @@ AccessKey::AccessKey() CtrlLayoutOKCancel(*this, "Window title"); } +struct Test { + Test(); +}; + + +void Test::Ahoj() +{ +} + +12234523.234 +1234 +123456789000000000.124124 + +1000000000 +10000000000000000000000000000000000000000000.234234234 GUI_APP_MAIN { Ctrl::AddFlags(Ctrl::AKD_CONSERVATIVE); diff --git a/uppdev/AccessKey/testing.icpp b/uppdev/AccessKey/testing.icpp deleted file mode 100644 index 35b71b379..000000000 --- a/uppdev/AccessKey/testing.icpp +++ /dev/null @@ -1,2 +0,0 @@ -"#include \"AccessKey.h\"\r\n;akslkjasdfj" -"\t\tfor(int i = 0; i < p.GetCount() && n < 12; i++) {\r\n\t\t\tString fn = p[i];\r\n\t\t\tString ext = ToLower(GetFileExt(fn));\r\n\t\t\tString pp = pn + '/' + fn;\r\n\t\t\tif(ext == \".lay\") {\r\n\t\t\t\tbar.Add(fn + \" include\", THISBACK1(InsertLay, pp));\r\n\t\t\t\tn++;\r\n\t\t\t}\r\n\t\t\tif(ext == \".iml\") {\r\n\t\t\t\tString c = GetFileTitle(fn);\r\n\t\t\t\tc.Set(0, ToUpper(c[0]));\r\n\t\t\t\tbar.Add(fn + \" include\", THISBACK2(InsertIml, pp, c.EndsWith(\"Img\") ? c : c + \"Img\"));\r\n\t\t\t\tn++;\r\n\t\t\t}\r\n\t\t\tif(ext == \".tpp\") {\r\n\t\t\t\tString s;\r\n\t\t\t\ts << \"#define TOPICFILE <\" << pp << \"/all.i>\\n\"\r\n\t\t\t\t << \"#include \\n\";\r\n\t\t\t\tbar.Add(fn + \" include\", THISBACK1(InsertText, s));\r\n\t\t\t\tn++;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n" \ No newline at end of file diff --git a/uppdev/ArrayCtrlSort/ArrayCtrlSort.upp b/uppdev/ArrayCtrlSort/ArrayCtrlSort.upp index 92a083e5f..9ae9f5405 100644 --- a/uppdev/ArrayCtrlSort/ArrayCtrlSort.upp +++ b/uppdev/ArrayCtrlSort/ArrayCtrlSort.upp @@ -1,9 +1,10 @@ -uses - CtrlLib; - -file - ArrayCtrlSort.h, - main.cpp; - -mainconfig - "" = "GUI"; +uses + CtrlLib; + +file + ArrayCtrlSort.h, + main.cpp; + +mainconfig + "" = "GUI"; + diff --git a/uppdev/ArrayCtrlSort/init b/uppdev/ArrayCtrlSort/init new file mode 100644 index 000000000..99123bcc6 --- /dev/null +++ b/uppdev/ArrayCtrlSort/init @@ -0,0 +1,4 @@ +#ifndef _ArrayCtrlSort_icpp_init_stub +#define _ArrayCtrlSort_icpp_init_stub +#include "CtrlLib/init" +#endif diff --git a/uppdev/GlDraw/GlDraw.cpp b/uppdev/GlDraw/GlDraw.cpp index 9438c278b..e3916a417 100644 --- a/uppdev/GlDraw/GlDraw.cpp +++ b/uppdev/GlDraw/GlDraw.cpp @@ -76,8 +76,6 @@ void GLDraw::PutImage(Point p, const Image& img, const Rect& src) glEnable(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, sd.texture_id); - DDUMP(sd.texture_id); - glColor3f(1.0f, 1.0f, 1.0f); if(src == img.GetSize()) { @@ -126,7 +124,6 @@ void GLDraw::SetColor(Color c) void GLDraw::PutRect(const Rect& r, Color color) { - DLOG("PutRect " << r << " " << color); if(color == InvertColor()) { glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR); glColor3f(1.0f, 1.0f, 1.0f); diff --git a/uppdev/GlDraw/main.cpp b/uppdev/GlDraw/main.cpp index 194a4aaea..c62fc7718 100644 --- a/uppdev/GlDraw/main.cpp +++ b/uppdev/GlDraw/main.cpp @@ -8,7 +8,6 @@ struct OpenGLExample : GLCtrl { Point point; virtual void GLPaint() { - DLOG("GLPaint"); Size sz = GetSize(); GLDraw w; @@ -17,6 +16,7 @@ struct OpenGLExample : GLCtrl { w.InitGL(GetSize()); +#if 0 w.DrawRect(sz, LtRed()); DrawFatFrame(w, r, LtBlue(), 2); @@ -54,13 +54,11 @@ struct OpenGLExample : GLCtrl { w.End(); RichText txt = ParseQTF(LoadFile(GetDataFile("test.qtf"))); - DDUMP(txt.GetLength()); - if(1) { - RTIMING("SystemDraw"); - DLOG("---------------------------------------"); + for(int i = 0; i < 100; i++) { + RTIMING("PaintText"); txt.Paint(Zoom(2, 10), w, 20, 20, 500); } - +#endif GLDraw::ClearCache(); }