X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fmainframe.cpp;h=b75225ebf65c7832a30bc27be3f2c577b3055ec8;hb=733ec8a931094f120a9923882b0eb592c45595fc;hp=abb12ef658711518d79e1cd444b59dbdc337ac56;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61;p=xonotic%2Fnetradiant.git

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index abb12ef6..b75225eb 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -27,13 +27,10 @@
 
 #include "mainframe.h"
 
-#include "debugging/debugging.h"
 #include "version.h"
 
 #include "ifilesystem.h"
 #include "iundo.h"
-#include "ifilter.h"
-#include "itoolbar.h"
 #include "editable.h"
 #include "ientity.h"
 #include "ishaders.h"
@@ -43,20 +40,10 @@
 #include <ctime>
 
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtktable.h>
+#include <gtk/gtk.h>
 
 
 #include "cmdlib.h"
-#include "scenelib.h"
 #include "stream/stringstream.h"
 #include "signal/isignal.h"
 #include "os/path.h"
@@ -65,14 +52,11 @@
 #include "moduleobservers.h"
 
 #include "gtkutil/clipboard.h"
-#include "gtkutil/container.h"
 #include "gtkutil/frame.h"
-#include "gtkutil/glfont.h"
 #include "gtkutil/glwidget.h"
 #include "gtkutil/image.h"
 #include "gtkutil/menu.h"
 #include "gtkutil/paned.h"
-#include "gtkutil/widget.h"
 
 #include "autosave.h"
 #include "build.h"
@@ -101,7 +85,6 @@
 #include "pluginmanager.h"
 #include "pluginmenu.h"
 #include "plugintoolbar.h"
-#include "points.h"
 #include "preferences.h"
 #include "qe3.h"
 #include "qgl.h"
@@ -200,6 +183,8 @@ void HomePaths_Realise(){
 				g_qeglobals.m_userEnginePath = path.c_str();
 				break;
 			}
+			path.clear();
+			path << DirectoryCleaned( g_get_home_dir() ) << prefix << "/";
 #endif
 
 #if defined( WIN32 )
@@ -305,7 +290,7 @@ void HomePaths_Destroy(){
 
 // Engine Path
 
-CopiedString g_strEnginePath;
+std::string g_strEnginePath;
 ModuleObservers g_enginePathObservers;
 std::size_t g_enginepath_unrealised = 1;
 
@@ -367,7 +352,7 @@ void setEnginePath( const char* path ){
 
 // App Path
 
-CopiedString g_strAppPath;                 ///< holds the full path of the executable
+std::string g_strAppPath;                 ///< holds the full path of the executable
 
 const char* AppPath_get(){
 	return g_strAppPath.c_str();
@@ -375,7 +360,7 @@ const char* AppPath_get(){
 
 /// the path to the local rc-dir
 const char* LocalRcPath_get( void ){
-	static CopiedString rc_path;
+	static std::string rc_path;
 	if ( rc_path.empty() ) {
 		StringOutputStream stream( 256 );
 		stream << GlobalRadiant().getSettingsPath() << g_pGameDescription->mGameFile.c_str() << "/";
@@ -386,7 +371,7 @@ const char* LocalRcPath_get( void ){
 
 /// directory for temp files
 /// NOTE: on *nix this is were we check for .pid
-CopiedString g_strSettingsPath;
+std::string g_strSettingsPath;
 const char* SettingsPath_get(){
 	return g_strSettingsPath.c_str();
 }
@@ -401,16 +386,16 @@ const char* SettingsPath_get(){
    [GameToolsPath]/modules
    and also q3map, bspc
  */
-CopiedString g_strGameToolsPath;           ///< this is set by g_GamesDialog
+std::string g_strGameToolsPath;           ///< this is set by g_GamesDialog
 
 const char* GameToolsPath_get(){
 	return g_strGameToolsPath.c_str();
 }
 
-void EnginePathImport( CopiedString& self, const char* value ){
+void EnginePathImport( std::string& self, const char* value ){
 	setEnginePath( value );
 }
-typedef ReferenceCaller1<CopiedString, const char*, EnginePathImport> EnginePathImportCaller;
+typedef ReferenceCaller1<std::string, const char*, EnginePathImport> EnginePathImportCaller;
 
 void Paths_constructPreferences( PreferencesPage& page ){
 	page.appendPathEntry( "Engine Path", true,
@@ -430,18 +415,18 @@ void Paths_registerPreferencesPage(){
 class PathsDialog : public Dialog
 {
 public:
-GtkWindow* BuildDialog(){
+ui::Window BuildDialog(){
 	GtkFrame* frame = create_dialog_frame( "Path settings", GTK_SHADOW_ETCHED_IN );
 
 	GtkVBox* vbox2 = create_dialog_vbox( 0, 4 );
 	gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox2 ) );
 
 	{
-		PreferencesPage preferencesPage( *this, GTK_WIDGET( vbox2 ) );
+		PreferencesPage preferencesPage( *this, ui::Widget(GTK_WIDGET( vbox2 )) );
 		Paths_constructPreferences( preferencesPage );
 	}
 
-	return create_simple_modal_dialog_window( "Engine Path Not Found", m_modal, GTK_WIDGET( frame ) );
+	return ui::Window(create_simple_modal_dialog_window( "Engine Path Not Found", m_modal, GTK_WIDGET( frame ) ));
 }
 };
 
@@ -457,8 +442,8 @@ void EnginePath_verify(){
 
 namespace
 {
-CopiedString g_gamename;
-CopiedString g_gamemode;
+std::string g_gamename;
+std::string g_gamemode;
 ModuleObservers g_gameNameObservers;
 ModuleObservers g_gameModeObservers;
 }
@@ -803,7 +788,7 @@ ChooseColour( const GetColourCallback& get, const SetColourCallback& set )
 void operator()(){
 	Vector3 colour;
 	m_get( colour );
-	color_dialog( GTK_WIDGET( MainFrame_getWindow() ), colour );
+	color_dialog( MainFrame_getWindow(), colour );
 	m_set( colour );
 }
 };
@@ -950,7 +935,7 @@ void OpenUpdateURL(){
 #else
 	URL << "&OS_dlup=3";
 #endif
-	URL << "&Version_dlup=" RADIANT_VERSION;
+	URL << "&Version_dlup=" << radiant::version();
 	g_GamesDialog.AddPacksURL( URL );
 	OpenURL( URL.c_str() );
 }
@@ -968,13 +953,13 @@ void OpenBugReportURL(){
 }
 
 
-GtkWidget* g_page_console;
+ui::Widget g_page_console;
 
 void Console_ToggleShow(){
 	GroupDialog_showPage( g_page_console );
 }
 
-GtkWidget* g_page_entity;
+ui::Widget g_page_entity;
 
 void EntityInspector_ToggleShow(){
 	GroupDialog_showPage( g_page_entity );
@@ -1614,22 +1599,22 @@ void EverySecondTimer_disable(){
 	}
 }
 
-gint window_realize_remove_decoration( GtkWidget* widget, gpointer data ){
-	gdk_window_set_decorations( widget->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
+gint window_realize_remove_decoration( ui::Widget widget, gpointer data ){
+	gdk_window_set_decorations( GTK_WIDGET(widget)->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
 	return FALSE;
 }
 
 class WaitDialog
 {
 public:
-GtkWindow* m_window;
+ui::Window m_window;
 GtkLabel* m_label;
 };
 
 WaitDialog create_wait_dialog( const char* title, const char* text ){
 	WaitDialog dialog;
 
-	dialog.m_window = create_floating_window( title, MainFrame_getWindow() );
+	dialog.m_window = MainFrame_getWindow().create_floating_window(title);
 	gtk_window_set_resizable( dialog.m_window, FALSE );
 	gtk_container_set_border_width( GTK_CONTAINER( dialog.m_window ), 0 );
 	gtk_window_set_position( dialog.m_window, GTK_WIN_POS_CENTER_ON_PARENT );
@@ -1637,7 +1622,7 @@ WaitDialog create_wait_dialog( const char* title, const char* text ){
 	g_signal_connect( G_OBJECT( dialog.m_window ), "realize", G_CALLBACK( window_realize_remove_decoration ), 0 );
 
 	{
-		dialog.m_label = GTK_LABEL( gtk_label_new( text ) );
+		dialog.m_label = GTK_LABEL( ui::Label( text ) );
 		gtk_misc_set_alignment( GTK_MISC( dialog.m_label ), 0.0, 0.5 );
 		gtk_label_set_justify( dialog.m_label, GTK_JUSTIFY_LEFT );
 		gtk_widget_show( GTK_WIDGET( dialog.m_label ) );
@@ -1678,7 +1663,7 @@ bool MainFrame_isActiveApp(){
 	return false;
 }
 
-typedef std::list<CopiedString> StringStack;
+typedef std::list<std::string> StringStack;
 StringStack g_wait_stack;
 WaitDialog g_wait;
 
@@ -1725,7 +1710,7 @@ void ScreenUpdates_Enable(){
 
 		gtk_grab_remove( GTK_WIDGET( g_wait.m_window ) );
 		destroy_floating_window( g_wait.m_window );
-		g_wait.m_window = 0;
+		g_wait.m_window = ui::Window();
 
 		//gtk_window_present(MainFrame_getWindow());
 	}
@@ -1889,10 +1874,10 @@ void fill_view_xz_front_menu( GtkMenu* menu ){
 }
 
 
-GtkWidget* g_toggle_z_item = 0;
-GtkWidget* g_toggle_console_item = 0;
-GtkWidget* g_toggle_entity_item = 0;
-GtkWidget* g_toggle_entitylist_item = 0;
+ui::Widget g_toggle_z_item;
+ui::Widget g_toggle_console_item;
+ui::Widget g_toggle_entity_item;
+ui::Widget g_toggle_entitylist_item;
 
 GtkMenuItem* create_view_menu( MainFrame::EViewStyle style ){
 	// View menu
@@ -2205,10 +2190,10 @@ void PatchInspector_registerShortcuts(){
 void Patch_registerShortcuts(){
 	command_connect_accelerator( "InvertCurveTextureX" );
 	command_connect_accelerator( "InvertCurveTextureY" );
-	command_connect_accelerator( "IncPatchColumn" );
-	command_connect_accelerator( "IncPatchRow" );
-	command_connect_accelerator( "DecPatchColumn" );
-	command_connect_accelerator( "DecPatchRow" );
+	command_connect_accelerator( "PatchInsertInsertColumn" );
+	command_connect_accelerator( "PatchInsertInsertRow" );
+	command_connect_accelerator( "PatchDeleteLastColumn" );
+	command_connect_accelerator( "PatchDeleteLastRow" );
 	command_connect_accelerator( "NaturalizePatch" );
 	//command_connect_accelerator("CapCurrentCurve");
 }
@@ -2271,55 +2256,55 @@ void register_shortcuts(){
 }
 
 void File_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_button( toolbar, "Open an existing map (CTRL + O)", "file_open.bmp", "OpenMap" );
-	toolbar_append_button( toolbar, "Save the active map (CTRL + S)", "file_save.bmp", "SaveMap" );
+	toolbar_append_button( toolbar, "Open an existing map (CTRL + O)", "file_open.png", "OpenMap" );
+	toolbar_append_button( toolbar, "Save the active map (CTRL + S)", "file_save.png", "SaveMap" );
 }
 
 void UndoRedo_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_button( toolbar, "Undo (CTRL + Z)", "undo.bmp", "Undo" );
-	toolbar_append_button( toolbar, "Redo (CTRL + Y)", "redo.bmp", "Redo" );
+	toolbar_append_button( toolbar, "Undo (CTRL + Z)", "undo.png", "Undo" );
+	toolbar_append_button( toolbar, "Redo (CTRL + Y)", "redo.png", "Redo" );
 }
 
 void RotateFlip_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.bmp", "MirrorSelectionX" );
-	toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.bmp", "RotateSelectionX" );
-	toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.bmp", "MirrorSelectionY" );
-	toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.bmp", "RotateSelectionY" );
-	toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.bmp", "MirrorSelectionZ" );
-	toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.bmp", "RotateSelectionZ" );
+	toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.png", "MirrorSelectionX" );
+	toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.png", "RotateSelectionX" );
+	toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.png", "MirrorSelectionY" );
+	toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.png", "RotateSelectionY" );
+	toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.png", "MirrorSelectionZ" );
+	toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.png", "RotateSelectionZ" );
 }
 
 void Select_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_button( toolbar, "Select touching", "selection_selecttouching.bmp", "SelectTouching" );
-	toolbar_append_button( toolbar, "Select inside", "selection_selectinside.bmp", "SelectInside" );
+	toolbar_append_button( toolbar, "Select touching", "selection_selecttouching.png", "SelectTouching" );
+	toolbar_append_button( toolbar, "Select inside", "selection_selectinside.png", "SelectInside" );
 }
 
 void CSG_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_button( toolbar, "CSG Subtract (SHIFT + U)", "selection_csgsubtract.bmp", "CSGSubtract" );
-	toolbar_append_button( toolbar, "CSG Merge (CTRL + U)", "selection_csgmerge.bmp", "CSGMerge" );
-	toolbar_append_button( toolbar, "Hollow", "selection_makehollow.bmp", "CSGHollow" );
+	toolbar_append_button( toolbar, "CSG Subtract (SHIFT + U)", "selection_csgsubtract.png", "CSGSubtract" );
+	toolbar_append_button( toolbar, "CSG Merge (CTRL + U)", "selection_csgmerge.png", "CSGMerge" );
+	toolbar_append_button( toolbar, "Hollow", "selection_makehollow.png", "CSGHollow" );
 }
 
 void ComponentModes_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_toggle_button( toolbar, "Select Vertices (V)", "modify_vertices.bmp", "DragVertices" );
-	toolbar_append_toggle_button( toolbar, "Select Edges (E)", "modify_edges.bmp", "DragEdges" );
-	toolbar_append_toggle_button( toolbar, "Select Faces (F)", "modify_faces.bmp", "DragFaces" );
+	toolbar_append_toggle_button( toolbar, "Select Vertices (V)", "modify_vertices.png", "DragVertices" );
+	toolbar_append_toggle_button( toolbar, "Select Edges (E)", "modify_edges.png", "DragEdges" );
+	toolbar_append_toggle_button( toolbar, "Select Faces (F)", "modify_faces.png", "DragFaces" );
 }
 
 void Clipper_constructToolbar( GtkToolbar* toolbar ){
 
-	toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.bmp", "ToggleClipper" );
+	toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.png", "ToggleClipper" );
 }
 
 void XYWnd_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_button( toolbar, "Change views", "view_change.bmp", "NextView" );
+	toolbar_append_button( toolbar, "Change views", "view_change.png", "NextView" );
 }
 
 void Manipulators_constructToolbar( GtkToolbar* toolbar ){
-	toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.bmp", "MouseTranslate" );
-	toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.bmp", "MouseRotate" );
-	toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.bmp", "MouseScale" );
-	toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.bmp", "MouseDrag" );
+	toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.png", "MouseTranslate" );
+	toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.png", "MouseRotate" );
+	toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.png", "MouseScale" );
+	toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.png", "MouseDrag" );
 
 	Clipper_constructToolbar( toolbar );
 }
@@ -2375,18 +2360,18 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
 
 	gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-	toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT +T)", "texture_lock.bmp", "TogTexLock" );
+	toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT +T)", "texture_lock.png", "TogTexLock" );
 
 	gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-	GtkButton* g_view_entities_button = toolbar_append_button( toolbar, "Entities (N)", "entities.bmp", "ToggleEntityInspector" );
-	GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.bmp", "ToggleConsole" );
-	GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.bmp", "ToggleTextures" );
+	/*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
+	GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.png", "ToggleConsole" );
+	GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.png", "ToggleTextures" );
 	// TODO: call light inspector
-	//GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.bmp", "ToggleLightInspector");
+	//GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.png", "ToggleLightInspector");
 
 	gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
-	GtkButton* g_refresh_models_button = toolbar_append_button( toolbar, "Refresh Models", "refresh_models.bmp", "RefreshReferences" );
+	/*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
 
 
 	// disable the console and texture button in the regular layouts
@@ -2398,36 +2383,36 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
 	return toolbar;
 }
 
-GtkWidget* create_main_statusbar( GtkWidget *pStatusLabel[c_count_status] ){
-	GtkTable* table = GTK_TABLE( gtk_table_new( 1, c_count_status, FALSE ) );
+ui::Widget create_main_statusbar( ui::Widget pStatusLabel[c_count_status] ){
+	GtkTable* table = ui::Table( 1, c_count_status, FALSE );
 	gtk_widget_show( GTK_WIDGET( table ) );
 
 	{
-		GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) );
+		GtkLabel* label = GTK_LABEL( ui::Label( "Label" ) );
 		gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 		gtk_misc_set_padding( GTK_MISC( label ), 4, 2 );
 		gtk_widget_show( GTK_WIDGET( label ) );
 		gtk_table_attach_defaults( table, GTK_WIDGET( label ), 0, 1, 0, 1 );
-		pStatusLabel[c_command_status] = GTK_WIDGET( label );
+		pStatusLabel[c_command_status] = ui::Widget(GTK_WIDGET( label ));
 	}
 
 	for ( int i = 1; i < c_count_status; ++i )
 	{
-		GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) );
+		GtkFrame* frame = ui::Frame();
 		gtk_widget_show( GTK_WIDGET( frame ) );
 		gtk_table_attach_defaults( table, GTK_WIDGET( frame ), i, i + 1, 0, 1 );
 		gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
 
-		GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) );
+		GtkLabel* label = GTK_LABEL( ui::Label( "Label" ) );
 		gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END );
 		gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 		gtk_misc_set_padding( GTK_MISC( label ), 4, 2 );
 		gtk_widget_show( GTK_WIDGET( label ) );
 		gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( label ) );
-		pStatusLabel[i] = GTK_WIDGET( label );
+		pStatusLabel[i] = ui::Widget(GTK_WIDGET( label ));
 	}
 
-	return GTK_WIDGET( table );
+	return ui::Widget(GTK_WIDGET( table ));
 }
 
 #if 0
@@ -2439,15 +2424,15 @@ class WindowFocusPrinter
 {
 const char* m_name;
 
-static gboolean frame_event( GtkWidget *widget, GdkEvent* event, WindowFocusPrinter* self ){
+static gboolean frame_event( ui::Widget widget, GdkEvent* event, WindowFocusPrinter* self ){
 	globalOutputStream() << self->m_name << " frame_event\n";
 	return FALSE;
 }
-static gboolean keys_changed( GtkWidget *widget, WindowFocusPrinter* self ){
+static gboolean keys_changed( ui::Widget widget, WindowFocusPrinter* self ){
 	globalOutputStream() << self->m_name << " keys_changed\n";
 	return FALSE;
 }
-static gboolean notify( GtkWindow* window, gpointer dummy, WindowFocusPrinter* self ){
+static gboolean notify( ui::Window window, gpointer dummy, WindowFocusPrinter* self ){
 	if ( gtk_window_is_active( window ) ) {
 		globalOutputStream() << self->m_name << " takes toplevel focus\n";
 	}
@@ -2460,7 +2445,7 @@ static gboolean notify( GtkWindow* window, gpointer dummy, WindowFocusPrinter* s
 public:
 WindowFocusPrinter( const char* name ) : m_name( name ){
 }
-void connect( GtkWindow* toplevel_window ){
+void connect( ui::Window toplevel_window ){
 	g_signal_connect( G_OBJECT( toplevel_window ), "notify::has_toplevel_focus", G_CALLBACK( notify ), this );
 	g_signal_connect( G_OBJECT( toplevel_window ), "notify::is_active", G_CALLBACK( notify ), this );
 	g_signal_connect( G_OBJECT( toplevel_window ), "keys_changed", G_CALLBACK( keys_changed ), this );
@@ -2474,15 +2459,15 @@ WindowFocusPrinter g_mainframeFocusPrinter( "mainframe" );
 
 class MainWindowActive
 {
-static gboolean notify( GtkWindow* window, gpointer dummy, MainWindowActive* self ){
-	if ( g_wait.m_window != 0 && gtk_window_is_active( window ) && !GTK_WIDGET_VISIBLE( g_wait.m_window ) ) {
+static gboolean notify( ui::Window window, gpointer dummy, MainWindowActive* self ){
+	if ( g_wait.m_window && gtk_window_is_active( window ) && !GTK_WIDGET_VISIBLE( g_wait.m_window ) ) {
 		gtk_widget_show( GTK_WIDGET( g_wait.m_window ) );
 	}
 
 	return FALSE;
 }
 public:
-void connect( GtkWindow* toplevel_window ){
+void connect( ui::Window toplevel_window ){
 	g_signal_connect( G_OBJECT( toplevel_window ), "notify::is-active", G_CALLBACK( notify ), this );
 }
 };
@@ -2508,16 +2493,14 @@ void XYWindowMouseDown_disconnect( MouseEventHandlerId id ){
 // =============================================================================
 // MainFrame class
 
-MainFrame* g_pParentWnd = 0;
+MainFrame* g_pParentWnd = nullptr;
 
-GtkWindow* MainFrame_getWindow(){
-	if ( g_pParentWnd == 0 ) {
-		return 0;
-	}
-	return g_pParentWnd->m_window;
+ui::Window MainFrame_getWindow()
+{
+	return g_pParentWnd ? g_pParentWnd->m_window : ui::Window();
 }
 
-std::vector<GtkWidget*> g_floating_windows;
+std::vector<ui::Widget> g_floating_windows;
 
 MainFrame::MainFrame() : m_window( 0 ), m_idleRedrawStatusText( RedrawStatusTextCaller( *this ) ){
 	m_pXYWnd = 0;
@@ -2529,7 +2512,7 @@ MainFrame::MainFrame() : m_window( 0 ), m_idleRedrawStatusText( RedrawStatusText
 
 	for ( int n = 0; n < c_count_status; n++ )
 	{
-		m_pStatusLabel[n] = 0;
+		m_pStatusLabel[n] = ui::root;
 	}
 
 	m_bSleeping = false;
@@ -2544,7 +2527,7 @@ MainFrame::~MainFrame(){
 
 	Shutdown();
 
-	for ( std::vector<GtkWidget*>::iterator i = g_floating_windows.begin(); i != g_floating_windows.end(); ++i )
+	for ( std::vector<ui::Widget>::iterator i = g_floating_windows.begin(); i != g_floating_windows.end(); ++i )
 	{
 		gtk_widget_destroy( *i );
 	}
@@ -2669,8 +2652,8 @@ void MainFrame::OnSleep(){
 }
 
 
-GtkWindow* create_splash(){
-	GtkWindow* window = GTK_WINDOW( gtk_window_new( GTK_WINDOW_TOPLEVEL ) );
+ui::Window create_splash(){
+	ui::Window window = ui::Window( ui::window_type::TOP );
 	gtk_window_set_decorated( window, FALSE );
 	gtk_window_set_resizable( window, FALSE );
 	gtk_window_set_modal( window, TRUE );
@@ -2678,7 +2661,7 @@ GtkWindow* create_splash(){
 	gtk_window_set_position( window, GTK_WIN_POS_CENTER );
 	gtk_container_set_border_width( GTK_CONTAINER( window ), 0 );
 
-	GtkImage* image = new_local_image( "splash.bmp" );
+	GtkImage* image = new_local_image( "splash.png" );
 	gtk_widget_show( GTK_WIDGET( image ) );
 	gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( image ) );
 
@@ -2688,7 +2671,7 @@ GtkWindow* create_splash(){
 	return window;
 }
 
-static GtkWindow *splash_screen = 0;
+static ui::Window splash_screen;
 
 void show_splash(){
 	splash_screen = create_splash();
@@ -2705,7 +2688,7 @@ WindowPositionTracker g_posXYWnd;
 WindowPositionTracker g_posXZWnd;
 WindowPositionTracker g_posYZWnd;
 
-static gint mainframe_delete( GtkWidget *widget, GdkEvent *event, gpointer data ){
+static gint mainframe_delete( ui::Widget widget, GdkEvent *event, gpointer data ){
 	if ( ConfirmModified( "Exit Radiant" ) ) {
 		gtk_main_quit();
 	}
@@ -2714,7 +2697,7 @@ static gint mainframe_delete( GtkWidget *widget, GdkEvent *event, gpointer data
 }
 
 void MainFrame::Create(){
-	GtkWindow* window = GTK_WINDOW( gtk_window_new( GTK_WINDOW_TOPLEVEL ) );
+	ui::Window window = ui::Window( ui::window_type::TOP );
 
 	GlobalWindowObservers_connectTopLevel( window );
 
@@ -2722,7 +2705,7 @@ void MainFrame::Create(){
 
 #if !defined( WIN32 )
 	{
-		GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask( "bitmaps/icon.bmp" );
+		GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask( "bitmaps/icon.png" );
 		if ( pixbuf != 0 ) {
 			gtk_window_set_icon( window, pixbuf );
 			gdk_pixbuf_unref( pixbuf );
@@ -2742,9 +2725,9 @@ void MainFrame::Create(){
 
 	g_MainWindowActive.connect( window );
 
-	GetPlugInMgr().Init( GTK_WIDGET( window ) );
+	GetPlugInMgr().Init( window );
 
-	GtkWidget* vbox = gtk_vbox_new( FALSE, 0 );
+	ui::Widget vbox = ui::VBox( FALSE, 0 );
 	gtk_container_add( GTK_CONTAINER( window ), vbox );
 	gtk_widget_show( vbox );
 
@@ -2766,7 +2749,7 @@ void MainFrame::Create(){
 	}
 	gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( plugin_toolbar ), FALSE, FALSE, 0 );
 
-	GtkWidget* main_statusbar = create_main_statusbar( m_pStatusLabel );
+	ui::Widget main_statusbar = create_main_statusbar( m_pStatusLabel );
 	gtk_box_pack_end( GTK_BOX( vbox ), main_statusbar, FALSE, TRUE, 2 );
 
 	GroupDialog_constructWindow( window );
@@ -2799,17 +2782,17 @@ void MainFrame::Create(){
 
 	if ( CurrentStyle() == eRegular || CurrentStyle() == eRegularLeft ) {
 		{
-			GtkWidget* vsplit = gtk_vpaned_new();
+			ui::Widget vsplit = ui::VPaned();
 			m_vSplit = vsplit;
 			gtk_box_pack_start( GTK_BOX( vbox ), vsplit, TRUE, TRUE, 0 );
 			gtk_widget_show( vsplit );
 
 			// console
-			GtkWidget* console_window = Console_constructWindow( window );
+			ui::Widget console_window = Console_constructWindow( window );
 			gtk_paned_pack2( GTK_PANED( vsplit ), console_window, FALSE, TRUE );
 
 			{
-				GtkWidget* hsplit = gtk_hpaned_new();
+				ui::Widget hsplit = ui::HPaned();
 				gtk_widget_show( hsplit );
 				m_hSplit = hsplit;
 				gtk_paned_add1( GTK_PANED( vsplit ), hsplit );
@@ -2817,10 +2800,10 @@ void MainFrame::Create(){
 				// xy
 				m_pXYWnd = new XYWnd();
 				m_pXYWnd->SetViewType( XY );
-				GtkWidget* xy_window = GTK_WIDGET( create_framed_widget( m_pXYWnd->GetWidget() ) );
+				ui::Widget xy_window = ui::Widget(GTK_WIDGET( create_framed_widget( m_pXYWnd->GetWidget() ) ));
 
 				{
-					GtkWidget* vsplit2 = gtk_vpaned_new();
+					ui::Widget vsplit2 = ui::VPaned();
 					gtk_widget_show( vsplit2 );
 					m_vSplit2 = vsplit2;
 
@@ -2865,7 +2848,7 @@ void MainFrame::Create(){
 	}
 	else if ( CurrentStyle() == eFloating ) {
 		{
-			GtkWindow* window = create_persistent_floating_window( "Camera", m_window );
+			ui::Window window = ui::Window(create_persistent_floating_window( "Camera", m_window ));
 			global_accel_connect_window( window );
 			g_posCamWnd.connect( window );
 
@@ -2880,11 +2863,11 @@ void MainFrame::Create(){
 			}
 			CamWnd_setParent( *m_pCamWnd, window );
 
-			g_floating_windows.push_back( GTK_WIDGET( window ) );
+			g_floating_windows.push_back( window );
 		}
 
 		{
-			GtkWindow* window = create_persistent_floating_window( ViewType_getTitle( XY ), m_window );
+			ui::Window window = ui::Window(create_persistent_floating_window( ViewType_getTitle( XY ), m_window ));
 			global_accel_connect_window( window );
 			g_posXYWnd.connect( window );
 
@@ -2899,11 +2882,11 @@ void MainFrame::Create(){
 			}
 			XY_Top_Shown_Construct( window );
 
-			g_floating_windows.push_back( GTK_WIDGET( window ) );
+			g_floating_windows.push_back( window );
 		}
 
 		{
-			GtkWindow* window = create_persistent_floating_window( ViewType_getTitle( XZ ), m_window );
+			ui::Window window = ui::Window(create_persistent_floating_window( ViewType_getTitle( XZ ), m_window ));
 			global_accel_connect_window( window );
 			g_posXZWnd.connect( window );
 
@@ -2918,11 +2901,11 @@ void MainFrame::Create(){
 
 			XZ_Front_Shown_Construct( window );
 
-			g_floating_windows.push_back( GTK_WIDGET( window ) );
+			g_floating_windows.push_back( window );
 		}
 
 		{
-			GtkWindow* window = create_persistent_floating_window( ViewType_getTitle( YZ ), m_window );
+			ui::Window window = ui::Window(create_persistent_floating_window( ViewType_getTitle( YZ ), m_window ));
 			global_accel_connect_window( window );
 			g_posYZWnd.connect( window );
 
@@ -2937,12 +2920,12 @@ void MainFrame::Create(){
 
 			YZ_Side_Shown_Construct( window );
 
-			g_floating_windows.push_back( GTK_WIDGET( window ) );
+			g_floating_windows.push_back( window );
 		}
 
 		{
 			GtkFrame* frame = create_framed_widget( TextureBrowser_constructWindow( GroupDialog_getWindow() ) );
-			g_page_textures = GroupDialog_addPage( "Textures", GTK_WIDGET( frame ), TextureBrowserExportTitleCaller() );
+			g_page_textures = GroupDialog_addPage( "Textures", ui::Widget(GTK_WIDGET( frame )), TextureBrowserExportTitleCaller() );
 		}
 
 		GroupDialog_show();
@@ -2953,29 +2936,29 @@ void MainFrame::Create(){
 		GlobalCamera_setCamWnd( *m_pCamWnd );
 		CamWnd_setParent( *m_pCamWnd, window );
 
-		GtkWidget* camera = CamWnd_getWidget( *m_pCamWnd );
+		ui::Widget camera = CamWnd_getWidget( *m_pCamWnd );
 
 		m_pYZWnd = new XYWnd();
 		m_pYZWnd->SetViewType( YZ );
 
-		GtkWidget* yz = m_pYZWnd->GetWidget();
+		ui::Widget yz = m_pYZWnd->GetWidget();
 
 		m_pXYWnd = new XYWnd();
 		m_pXYWnd->SetViewType( XY );
 
-		GtkWidget* xy = m_pXYWnd->GetWidget();
+		ui::Widget xy = m_pXYWnd->GetWidget();
 
 		m_pXZWnd = new XYWnd();
 		m_pXZWnd->SetViewType( XZ );
 
-		GtkWidget* xz = m_pXZWnd->GetWidget();
+		ui::Widget xz = m_pXZWnd->GetWidget();
 
 		GtkHPaned* split = create_split_views( camera, yz, xy, xz );
 		gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( split ), TRUE, TRUE, 0 );
 
 		{
 			GtkFrame* frame = create_framed_widget( TextureBrowser_constructWindow( window ) );
-			g_page_textures = GroupDialog_addPage( "Textures", GTK_WIDGET( frame ), TextureBrowserExportTitleCaller() );
+			g_page_textures = GroupDialog_addPage( "Textures", ui::Widget(GTK_WIDGET( frame )), TextureBrowserExportTitleCaller() );
 		}
 	}
 
@@ -3059,7 +3042,7 @@ void MainFrame::UpdateStatusText(){
 	m_idleRedrawStatusText.queueDraw();
 }
 
-void MainFrame::SetStatusText( CopiedString& status_text, const char* pText ){
+void MainFrame::SetStatusText( std::string& status_text, const char* pText ){
 	status_text = pText;
 	UpdateStatusText();
 }
@@ -3138,7 +3121,7 @@ void GlobalGL_sharedContextDestroyed(){
 
 void Layout_constructPreferences( PreferencesPage& page ){
 	{
-		const char* layouts[] = { "window1.bmp", "window2.bmp", "window3.bmp", "window4.bmp" };
+		const char* layouts[] = { "window1.png", "window2.png", "window3.png", "window4.png" };
 		page.appendRadioIcons(
 			"Window Layout",
 			STRING_ARRAY_RANGE( layouts ),
@@ -3324,10 +3307,10 @@ void MainFrame_Construct(){
 		const char* ENGINEPATH_ATTRIBUTE =
 #if defined( WIN32 )
 			"enginepath_win32"
-#elif defined( __linux__ ) || defined ( __FreeBSD__ )
-			"enginepath_linux"
 #elif defined( __APPLE__ )
 			"enginepath_macos"
+#elif defined( __linux__ ) || defined ( __FreeBSD__ )
+			"enginepath_linux"
 #else
 #error "unknown platform"
 #endif