.rainbow: Gtk backend getting ready for uppsrc

git-svn-id: svn://ultimatepp.org/upp/trunk@5689 f0d560ea-af0d-0410-9eb7-867de7ffcac7

rainbow/Gtk/Gtk.h

@@ -147,7 +147,7 @@ struct DrawDragRectInfo {
 #include <CtrlCore/stdids.h>
 #endif
 
-#define GUIPLATFORM_KEYCODES_INCLUDE <Gtk/Keys.h>
+#define GUIPLATFORM_KEYCODES_INCLUDE <Gtk/GtkKeys.h>
 
 //$	struct Ctrl::Top {
 #define GUIPLATFORM_CTRL_TOP_DECLS \
@@ -158,12 +158,12 @@ struct DrawDragRectInfo {
 	int                   id; \
 //$ }
 
-#define GUIPLATFORM_CTRL_DECLS_INCLUDE <Gtk/Ctrl.h>
+#define GUIPLATFORM_CTRL_DECLS_INCLUDE <Gtk/GtkCtrl.h>
 
 #define GUIPLATFORM_PASTECLIP_DECLS \
 int type; \
 
-#define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE <Gtk/Top.h>
+#define GUIPLATFORM_TOPWINDOW_DECLS_INCLUDE <Gtk/GtkTop.h>
 
 #define GUIPLATFORM_NOSCROLL
 
@@ -171,4 +171,4 @@ int rmsecs();
 
 END_UPP_NAMESPACE
 
-#define GUIPLATFORM_INCLUDE_AFTER <Gtk/After.h>
+#define GUIPLATFORM_INCLUDE_AFTER <Gtk/GtkAfter.h>

rainbow/Gtk/Gtk.upp

@@ -2,22 +2,22 @@ description "Gtk backend\377";
 
 file
 	Gtk.h,
-	After.h,
-	Keys.h,
-	DrawOp.cpp,
-	DrawText.cpp,
-	DrawImage.cpp,
-	Util.cpp,
+	GtkAfter.h,
+	GtkKeys.h,
+	GtkDrawOp.cpp,
+	GtkDrawText.cpp,
+	GtkDrawImage.cpp,
+	GtkUtil.cpp,
 	GdkImage.cpp,
-	Ctrl.h,
-	Ctrl.cpp,
-	Wnd.cpp,
-	Create.cpp,
-	Capture.cpp,
-	Event.cpp,
-	App.cpp,
-	Top.h,
-	Top.cpp,
-	Clip.cpp,
-	DnD.cpp;
+	GtkCtrl.h,
+	GtkCtrl.cpp,
+	GtkWnd.cpp,
+	GtkCreate.cpp,
+	GtkCapture.cpp,
+	GtkEvent.cpp,
+	GtkApp.cpp,
+	GtkTop.h,
+	GtkTop.cpp,
+	GtkClip.cpp,
+	GtkDnD.cpp;
 

rainbow/GtkMain/main.cpp

@@ -152,8 +152,6 @@ struct MyApp2 : TopWindow {
 		Title("Widget test");
 		Add(text.SizePos());
 		text <<= "Test\nHello World!";
-
-		DDUMP(Ctrl::GetWorkArea());
 	}
 };
 
@@ -240,7 +238,6 @@ struct MyApp4 : TopWindow {
 	
 	void DoFrameless()
 	{
-		DLOG("FRAMELESS");
 		FrameLess(!IsFrameLess());
 	}