Merge commit '667d3275589dac91b5bfe96f0244183007be6efd' into master-merge

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

diff --git a/radiant/gtkdlgs.h b/radiant/gtkdlgs.h
index 05f8b8b9ea38c31b9d42cac79d0f4664b8610e56..551102a4c5edccd25687409ad303128229685e4f 100644 (file)
--- a/radiant/gtkdlgs.h
+++ b/radiant/gtkdlgs.h
@@ -31,6 +31,7 @@
 #if !defined( INCLUDED_GTKDLGS_H )
 #define INCLUDED_GTKDLGS_H
 
+#include "globaldefs.h"
 #include "qerplugin.h"
 #include "string/string.h"
 
@@ -38,7 +39,7 @@ EMessageBoxReturn DoLightIntensityDlg( int *intensity );
 EMessageBoxReturn DoShaderTagDlg( CopiedString *tag, const char* title );
 EMessageBoxReturn DoShaderInfoDlg( const char* name, const char* filename, const char* title );
 EMessageBoxReturn DoTextureLayout( float *fx, float *fy );
-void DoTextEditor( const char* filename, int cursorpos );
+void DoTextEditor( const char* filename, int cursorpos, int length, bool external_editor );
 
 void DoProjectSettings();
 
@@ -47,13 +48,8 @@ void DoSides( int type, int axis );
 void DoAbout();
 
 
-#ifdef WIN32
-extern bool g_TextEditor_useWin32Editor;
-#else
 #include "string/stringfwd.h"
-extern bool g_TextEditor_useCustomEditor;
 extern CopiedString g_TextEditor_editorCommand;
-#endif
 
 
 #endif