Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/radiant/groupdialog.h b/radiant/groupdialog.h
index c9947a67440cbee184aace6dbef11ffd9c80fa3d..f136f382c02f116f2c62123f5467f6f315a51b11 100644 (file)
--- a/radiant/groupdialog.h
+++ b/radiant/groupdialog.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1999-2007 id Software, Inc. and contributors.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
    This file is part of GtkRadiant.
@@ -19,88 +19,30 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _GROUPDIALOG_H_
-#define _GROUPDIALOG_H_
+#if !defined( INCLUDED_GROUPDIALOG_H )
+#define INCLUDED_GROUPDIALOG_H
 
-#define DlgXBorder 5
-#define DlgYBorder 5
+#include <uilib/uilib.h>
+#include "property.h"
+#include "generic/callback.h"
 
+void GroupDialog_Construct();
+void GroupDialog_Destroy();
 
-enum
-{
-       EntList,
-       EntComment,
-// Spawnflags
-       EntCheck1,
-       EntCheck2,
-       EntCheck3,
-       EntCheck4,
-       EntCheck5,
-       EntCheck6,
-       EntCheck7,
-       EntCheck8,
-// Extra Spawnflags for Halflife Support
-       EntCheck9,
-       EntCheck10,
-       EntCheck11,
-       EntCheck12,
-       EntCheck13,
-       EntCheck14,
-       EntCheck15,
-       EntCheck16,
+void GroupDialog_constructWindow( ui::Window main_window );
+void GroupDialog_destroyWindow();
+ui::Window GroupDialog_getWindow();
+void GroupDialog_show();
 
-       EntCheck17,
-       EntCheck18,
-       EntCheck19,
-       EntCheck20,
+inline void RawStringExport( const char* string, const Callback<void(const char *)> &importer ){
+       importer( string );
+}
+typedef ConstPointerCaller<char, void(const Callback<void(const char *)> &), RawStringExport> RawStringExportCaller;
+ui::Widget GroupDialog_addPage( const char* tabLabel, ui::Widget widget, const Callback<void(const Callback<void(const char *)> &)>& title );
 
-       EntProps,
-       EntDir0,
-       EntDir45,
-       EntDir90,
-       EntDir135,
-       EntDir180,
-       EntDir225,
-       EntDir270,
-       EntDir315,
-       EntDirUp,
-       EntDirDown,
-       EntDelProp,
-       EntKeyLabel,
-       EntKeyField,
-       EntValueLabel,
-       EntValueField,
-       EntColor,
-       EntAssignSounds,
-       EntAssignModels,
-       EntTab,
+void GroupDialog_showPage( ui::Widget page );
+void GroupDialog_updatePageTitle( ui::Widget page );
+bool GroupDialog_isShown();
+ui::Widget GroupDialog_getPage();
 
-       EntLast,
-};
-
-extern GtkWidget* EntWidgets[EntLast];
-
-//extern int rgIds[EntLast];
-
-
-class GroupDlg
-{
-public:
-GroupDlg ();
-void Create();
-
-void Show()
-{ gtk_widget_show( m_pWidget ); };
-void Hide()
-{ gtk_widget_hide( m_pWidget ); };
-
-public:
-GtkWidget* m_pNotebook;
-GtkWidget* m_pWidget;
-GtkWidget* m_pTree;
-GtkCTreeNode* m_hWorld;   //leo: not used keeping because of the win32 version
-};
-
-extern GroupDlg *g_pGroupDlg;
-
-#endif // _GROUPDIALOG_H_
+#endif