#3248 Clean code

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / bbtkwxGUIEditorGraphicBBS.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 4b9c0e5f0abcaefa0877995d2aff861386b46297..0ba3bbbf1c5d410109d359d5d770cf8ebc96fe7d 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -139,7 +139,9 @@ void wxGUIEditorGraphicBBS::initToolbar()
        wxBitmap bmp_redo(redo_xpm);
        wxBitmap bmp_editProperties(editProperties_xpm);
        wxBitmap bmp_showTree(showTree_xpm);
-       wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
+       
+//     wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
+       wxToolBar *toolbar =    CreateToolBar();
 
        //Adds a tool btn to the toolbar
        toolbar->AddTool(ID_NEW, _T("New"), bmp_new, wxNullBitmap, wxITEM_NORMAL,
@@ -566,6 +568,11 @@ void wxGUIEditorGraphicBBS::executeScript(std::string script) {
        command += " & ";
 #endif
 
+#ifdef __APPLE__
+    command = "source ~/.bbtk/profile_creatools; "+command;
+#endif
+
+
        printf("RaC wxGUIEditorGraphicBBS::executeScript %s \n", command.c_str());
        system(command.c_str());
 }
@@ -1558,16 +1565,21 @@ bool wxGUIEditorGraphicBBS::TryToOpenScript(std::string packageName ,std::string
        descriptor      = mapDesc[boxType];
 
        bool result=false;
-       
-       if (
-               ((descriptor->IsTypeOfScript_Application()==true) && (scriptApplication==true))
-               ||
-               ((descriptor->IsTypeOfScript_ComplexBox()==true) && (scriptComplexBox==true))           
-               )
+    descriptor->IsTypeOfScript_Application();  
+       if (descriptor!=NULL)
        {
-               result=true;
-               OpenScript(descriptor->GetScriptFileName(),boxType);
-       }
+               if ( 
+                       ((descriptor->IsTypeOfScript_Application()==true) && (scriptApplication==true))
+                       ||
+                       ((descriptor->IsTypeOfScript_ComplexBox()==true) && (scriptComplexBox==true))           
+                       )
+               {
+                       result=true;
+                       OpenScript(descriptor->GetScriptFileName(),boxType);
+               } // if descriptor Type
+       } else {
+               printf("EED ERROR wxGUIEditorGraphicBBS::TryToOpenScript >> The descriptor of this box not exists (packageName:%s  boxType:%s) this is not normal\n",packageName.c_str(), boxType.c_str() );
+       }  // if descriptor NULL
        
        return result;
 }