* Finishing renaming of interface.[ch] to EXPP_interface.[ch]:

    removed old files -- should solve compile problems.
* Updated Window.c to access a variable in Draw.c

5 files changed, 3 insertions, 168 deletions

diff --git a/source/blender/python/api2_2x/Draw.h b/source/blender/python/api2_2x/Draw.h
index 2220a48c4c4..4b69807da57 100644
--- a/source/blender/python/api2_2x/Draw.h
+++ b/source/blender/python/api2_2x/Draw.h
@@ -66,7 +66,7 @@
 #include "modules.h"
 
 /*@ hack to flag that window redraw has happened inside slider callback: */
-int EXPP_disable_force_draw;
+int EXPP_disable_force_draw = 0;
 
 /* From Window.h, used here by py_slider_update() */
 PyObject *M_Window_Redraw(PyObject *self, PyObject *args);
diff --git a/source/blender/python/api2_2x/Window.c b/source/blender/python/api2_2x/Window.c
index 66374a3f992..3f0a345dc98 100644
--- a/source/blender/python/api2_2x/Window.c
+++ b/source/blender/python/api2_2x/Window.c
@@ -65,7 +65,7 @@ PyObject *M_Window_Redraw(PyObject *self, PyObject *args)
           st = sa->spacedata.first;
           if (st->text->flags & TXT_FOLLOW) /* follow cursor display */
             pop_space_text(st);
-          if (/*disable_force_draw*/0) { /* XXX Blender.Draw ... */
+          if (EXPP_disable_force_draw) { /* from Draw.[ch] ... */
             scrarea_queue_redraw(sa);
           }
 
diff --git a/source/blender/python/api2_2x/Window.h b/source/blender/python/api2_2x/Window.h
index 2fc649bd2a9..b6ac60d7f36 100644
--- a/source/blender/python/api2_2x/Window.h
+++ b/source/blender/python/api2_2x/Window.h
@@ -54,7 +54,7 @@
 #include "modules.h"
 
 /* Used in Draw.c */
-int EXPP_disable_force_draw= 0;
+extern int EXPP_disable_force_draw;
 
 /* Callback used by the file and image selector access functions */
 static PyObject *(*EXPP_FS_PyCallback)(PyObject *arg) = NULL;
diff --git a/source/blender/python/api2_2x/interface.c b/source/blender/python/api2_2x/interface.c
deleted file mode 100644
index 671160c000e..00000000000
--- a/source/blender/python/api2_2x/interface.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* 
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * This is a new part of Blender.
- *
- * Contributor(s): Michel Selten
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
-*/
-
-#include <stdio.h>
-
-#include <Python.h>
-
-#include <BKE_global.h>
-#include <BKE_main.h>
-#include <DNA_ID.h>
-#include <DNA_camera_types.h>
-#include <DNA_lamp_types.h>
-#include <DNA_material_types.h>
-#include <DNA_object_types.h>
-#include <DNA_scene_types.h>
-#include <DNA_scriptlink_types.h>
-#include <DNA_world_types.h>
-
-#include "gen_utils.h"
-#include "modules.h"
-
-void initBlenderApi2_2x (void)
-{
-	printf ("initBlenderApi2_2x\n");
-	g_blenderdict = NULL;
-	initBlender ();
-}
-
-ScriptLink * setScriptLinks(ID *id, short event)
-{
-	ScriptLink  * scriptlink;
-	PyObject    * link;
-	Object      * object;
-	int           obj_id;
-
-	obj_id = MAKE_ID2 (id->name[0], id->name[1]);
-	printf ("In setScriptLinks (id=%s, event=%d)\n",id->name, event);
-
-	switch (obj_id)
-	{
-		case ID_OB:
-			object = GetObjectByName (GetIdName (id));
-			if (object == NULL)
-			{
-				return NULL;
-			}
-			link = ObjectCreatePyObject (object);
-			scriptlink = &(object->scriptlink);
-			break;
-		case ID_LA:
-			scriptlink = NULL;
-			Py_INCREF(Py_None);
-			link = Py_None;
-			break;
-		case ID_CA:
-			scriptlink = NULL;
-			Py_INCREF(Py_None);
-			link = Py_None;
-			break;
-		case ID_MA:
-			scriptlink = NULL;
-			Py_INCREF(Py_None);
-			link = Py_None;
-			break;
-		case ID_WO:
-			scriptlink = NULL;
-			Py_INCREF(Py_None);
-			link = Py_None;
-			break;
-		case ID_SCE:
-			scriptlink = NULL;
-			Py_INCREF(Py_None);
-			link = Py_None;
-			break;
-		default:
-			Py_INCREF(Py_None);
-			link = Py_None;
-			return NULL;
-	}
-
-	if (scriptlink == NULL)
-	{
-		/* This is probably not an internal error anymore :)
-TODO: Check this
-		printf ("Internal error, unable to create PyBlock for script link\n");
-		*/
-		Py_INCREF(Py_False);
-		PyDict_SetItemString(g_blenderdict, "bylink", Py_False);
-		return NULL;
-	}
-	else
-	{
-		Py_INCREF(Py_True);
-		PyDict_SetItemString(g_blenderdict, "bylink", Py_True);
-	}
-
-	PyDict_SetItemString(g_blenderdict, "link", link);
-	PyDict_SetItemString(g_blenderdict, "event",
-			Py_BuildValue("s", event_to_name(event)));
-
-	return (scriptlink);
-}
diff --git a/source/blender/python/api2_2x/interface.h b/source/blender/python/api2_2x/interface.h
deleted file mode 100644
index e61e6c2d2dc..00000000000
--- a/source/blender/python/api2_2x/interface.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* 
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * This is a new part of Blender.
- *
- * Contributor(s): Michel Selten
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
-*/
-
-#include <DNA_ID.h>
-
-void initBlenderApi2_2x (void);
-ScriptLink * setScriptLinks(ID *id, short event);