From 6f68ba633fe5251fe5673bf56257a75294774da9 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 5 Dec 2012 05:56:26 +0000 Subject: [PATCH] .gtk git-svn-id: svn://ultimatepp.org/upp/trunk@5624 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- rainbow/GtkMain/GtkMain.upp | 3 ++- rainbow/GtkMain/init | 1 + rainbow/GtkMain/main.cpp | 13 ++++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/rainbow/GtkMain/GtkMain.upp b/rainbow/GtkMain/GtkMain.upp index c74c27576..3b835eb6b 100644 --- a/rainbow/GtkMain/GtkMain.upp +++ b/rainbow/GtkMain/GtkMain.upp @@ -1,6 +1,7 @@ uses CtrlLib, - Gtk; + Gtk, + RichEdit; file main.cpp; diff --git a/rainbow/GtkMain/init b/rainbow/GtkMain/init index 95798684d..8ed8bdf84 100644 --- a/rainbow/GtkMain/init +++ b/rainbow/GtkMain/init @@ -2,4 +2,5 @@ #define _GtkMain_icpp_init_stub #include "CtrlLib/init" #include "Gtk/init" +#include "RichEdit/init" #endif diff --git a/rainbow/GtkMain/main.cpp b/rainbow/GtkMain/main.cpp index d1bd0a856..c56569799 100644 --- a/rainbow/GtkMain/main.cpp +++ b/rainbow/GtkMain/main.cpp @@ -1,4 +1,5 @@ #include +#include using namespace Upp; @@ -108,9 +109,19 @@ CONSOLE_APP_MAIN // gtk_init(&argc, &argv); gtk_init(0, NULL); + Ctrl::GlobalBackBuffer(); #if 1 - MyApp().Run(); + PromptOK("Hello world!"); + return; + + RichEditWithToolBar edit; + edit.SetQTF("[A500 Hello World!"); + TopWindow win; + win.Add(edit.SizePos()); + win.Run(); + +// MyApp().Run(); #else GtkWidget *window;