Merge branch 'transfilterfix' into 'master'

[xonotic/netradiant.git] / radiant / entity.h

diff --git a/radiant/entity.h b/radiant/entity.h
index eaf73cbb47041be9664248e8db6361cb2e28ed5c..a2a9f7527925462bd1a6315da24eb03839592ef9 100644 (file)
--- a/radiant/entity.h
+++ b/radiant/entity.h
@@ -22,21 +22,26 @@
 #if !defined( INCLUDED_ENTITY_H )
 #define INCLUDED_ENTITY_H
 
-template<typename Element> class BasicVector3;
+#include <uilib/uilib.h>
+
+template<typename Element>
+class BasicVector3;
+
 typedef BasicVector3<float> Vector3;
-void Entity_createFromSelection( const char* name, const Vector3& origin );
 
-void Scene_EntitySetKeyValue_Selected( const char* key, const char* value );
-void Scene_EntitySetClassname_Selected( const char* classname );
+void Entity_createFromSelection(const char *name, const Vector3 &origin);
+
+void Scene_EntitySetKeyValue_Selected(const char *key, const char *value);
 
+void Scene_EntitySetClassname_Selected(const char *classname);
 
-typedef struct _GtkWidget GtkWidget;
-const char* misc_model_dialog( GtkWidget* parent );
 
-typedef struct _GtkMenu GtkMenu;
-void Entity_constructMenu( GtkMenu* menu );
+const char *misc_model_dialog(ui::Widget parent);
+
+void Entity_constructMenu(ui::Menu menu);
 
 void Entity_Construct();
+
 void Entity_Destroy();
 
 #endif