Warning cleanup

[inkscape.git] / src / ui / dialog / scriptdialog.cpp

diff --git a/src/ui/dialog/scriptdialog.cpp b/src/ui/dialog/scriptdialog.cpp
index a8c0286d68f3cfcaa41182306c75be5c58a8dfdf..304362f60b3d2b84583c3ac07de8da11a1d5b0ac 100644 (file)
--- a/src/ui/dialog/scriptdialog.cpp
+++ b/src/ui/dialog/scriptdialog.cpp
@@ -1,7 +1,10 @@
-/*
- *   Other dudes from The Inkscape Organization
+/**
+ *  Dialog for executing and monitoring script execution
+ *  
+ * Author:  
+ *   Bob Jamison
  *
- * Copyright (C) 2004, 2005 Authors
+ * Copyright (C) 2004-2007 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -40,7 +43,7 @@ class ScriptDialogImpl : public ScriptDialog
     /**
      * Constructor
      */
-    ScriptDialogImpl();
+    ScriptDialogImpl(Behavior::BehaviorFactory behavior_factory);
 
     /**
      * Destructor
@@ -101,10 +104,10 @@ static char *defaultPythonCodeStr =
 #if defined(WITH_PYTHON)
     "# This is a sample Python script.\n"
     "# To run it, select 'Execute Python' from the File menu above.\n"
-    "desktop = inkscape.getDesktop()\n"
-    "dialogmanager = inkscape.getDialogManager()\n"
-    "document = desktop.getDocument()\n"
-    "document.hello()\n"
+    "desktop = inkscape.activeDesktop\n"
+    "dialogmanager = desktop.dialogManager\n"
+    "document = inkscape.activeDocument\n"
+    "inkscape.hello()\n"
     "dialogmanager.showAbout()\n"
 #elif defined(WITH_PERL)
     "# This is a sample Perl script.\n"
@@ -158,9 +161,12 @@ lang)
     Glib::ustring error;
     Inkscape::Extension::Script::InkscapeScript engine;
     bool ok = engine.interpretScript(script, output, error, lang);
-    if (!ok) return;
     outputText.get_buffer()->set_text(output);
     errorText.get_buffer()->set_text(error);
+    if (!ok)
+        {
+        //do we want something here?
+        }
 }
 
 /**
@@ -186,7 +192,8 @@ void ScriptDialogImpl::executePerl()
 /**
  * Constructor
  */
-ScriptDialogImpl::ScriptDialogImpl()
+ScriptDialogImpl::ScriptDialogImpl(Behavior::BehaviorFactory behavior_factory) :
+    ScriptDialog(behavior_factory)
 {
     Gtk::VBox *mainVBox = get_vbox();
 
@@ -243,9 +250,9 @@ ScriptDialogImpl::ScriptDialogImpl()
 /**
  * Factory method.  Use this to create a new ScriptDialog
  */
-ScriptDialog *ScriptDialog::create()
+ScriptDialog *ScriptDialog::create(Behavior::BehaviorFactory behavior_factory)
 {
-    ScriptDialog *dialog = new ScriptDialogImpl();
+    ScriptDialog *dialog = new ScriptDialogImpl(behavior_factory);
     return dialog;
 }