From 05e7ead34117d7cd9946e02dfc6a4f1079630f4f Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 26 Mar 2008 14:47:35 +0000 Subject: [PATCH] - Finished the Transcriptor - created 2 apps : - bbs2cpp which translates a bbs script into a c++ code - bbc which translates and compiles a bbs script ending with an exe ! --- kernel/appli/CMakeLists.txt | 4 + kernel/appli/bbc/CMakeLists.txt | 35 ++++ kernel/appli/bbc/CMakeLists.txt.in | 18 ++ kernel/appli/bbc/bbc.sh.in | 41 +++++ kernel/appli/bbc/main.cxx.in | 200 +++++++++++++++++++++++ kernel/appli/bbi/bbi.cxx | 4 +- kernel/appli/bbs2cpp/CMakeLists.txt | 14 ++ kernel/appli/bbs2cpp/bbs2cpp.cxx | 30 ++++ kernel/src/bbtkInterpreter.cxx | 30 ++-- kernel/src/bbtkInterpreter.h | 12 +- kernel/src/bbtkTranscriptor.cxx | 117 ++++++++----- kernel/src/bbtkTranscriptor.h | 57 +------ kernel/src/bbtkVirtualExec.h | 6 +- kernel/src/bbtkWx.cxx | 8 +- kernel/src/bbtkWx.h | 2 + packages/std/src/bbstdExecBbiCommand.cxx | 1 + packages/wx/src/bbwxCommandButton.cxx | 5 +- 17 files changed, 460 insertions(+), 124 deletions(-) create mode 100644 kernel/appli/bbc/CMakeLists.txt create mode 100644 kernel/appli/bbc/CMakeLists.txt.in create mode 100755 kernel/appli/bbc/bbc.sh.in create mode 100644 kernel/appli/bbc/main.cxx.in create mode 100644 kernel/appli/bbs2cpp/CMakeLists.txt create mode 100644 kernel/appli/bbs2cpp/bbs2cpp.cxx diff --git a/kernel/appli/CMakeLists.txt b/kernel/appli/CMakeLists.txt index 0a02f7d..44c49a7 100644 --- a/kernel/appli/CMakeLists.txt +++ b/kernel/appli/CMakeLists.txt @@ -22,3 +22,7 @@ SUBDIRS(bbCreateBlackBox) SUBDIRS(bbed) SUBDIRS(bbhelp) + +SUBDIRS(bbs2cpp) + +SUBDIRS(bbc) diff --git a/kernel/appli/bbc/CMakeLists.txt b/kernel/appli/bbc/CMakeLists.txt new file mode 100644 index 0000000..d121f00 --- /dev/null +++ b/kernel/appli/bbc/CMakeLists.txt @@ -0,0 +1,35 @@ +# Relative path to the data used by bbc from data root folder +SET(bbc_DATA_REL_PATH_FROM_DATA kernel/bbc) +# Relative path to the data used by bbc from bin folder +SET(bbc_DATA_REL_PATH_FROM_BIN ../${BBTK_DATA_REL_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}) + +IF(UNIX) + # Build tree + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/main.cxx.in + ${BBTK_DATA_BUILD_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}/main.cxx.in + COPYONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in + ${BBTK_DATA_BUILD_PATH}/${bbc_DATA_REL_PATH_FROM_DATA}/CMakeLists.txt.in + COPYONLY + ) + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/bbc.sh.in + ${BBTK_BINARY_DIR}/bin/bbc + @ONLY IMMEDIATE + ) + # Install tree + INSTALL( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/main.cxx.in ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.in + DESTINATION ${BBTK_DATA_INSTALL_PATH}/${bbc_DATA_REL_PATH_FROM_DATA} + ) + INSTALL( + PROGRAMS ${BBTK_BINARY_DIR}/bin/bbc + DESTINATION bin + ) + +ELSE(UNIX) + # TO DO : bat for win +ENDIF(UNIX) diff --git a/kernel/appli/bbc/CMakeLists.txt.in b/kernel/appli/bbc/CMakeLists.txt.in new file mode 100644 index 0000000..ed352d8 --- /dev/null +++ b/kernel/appli/bbc/CMakeLists.txt.in @@ -0,0 +1,18 @@ + +#----------------------------------------------------------------------------- +# Search for bbtk +FIND_PACKAGE(BBTK) +# If found +IF(BBTK_FOUND) + # Include USE_FILE which configures the use of the lib + INCLUDE(${BBTK_USE_FILE}) +ENDIF(BBTK_FOUND) +#----------------------------------------------------------------------------- + +#----------------------------------------------------------------------------- +# Build the program +# Usual add executable +ADD_EXECUTABLE(OUTPUT main) +# Link against the testLib libraries +TARGET_LINK_LIBRARIES(OUTPUT ${BBTK_LIBRARIES}) +#----------------------------------------------------------------------------- diff --git a/kernel/appli/bbc/bbc.sh.in b/kernel/appli/bbc/bbc.sh.in new file mode 100755 index 0000000..83eca03 --- /dev/null +++ b/kernel/appli/bbc/bbc.sh.in @@ -0,0 +1,41 @@ +#!/bin/bash +# compiles bbs files + +source ~/.bashrc + +if [ $# -lt 1 ] + then + echo "usage : bbc " + exit +fi + +# +CUR=${PWD} + +# bbc bin path +TMP=$(which $0|rev) +BINPATH=$(echo ${TMP#*/}|rev) +# data path +DATADIR=${BINPATH}/@bbc_DATA_REL_PATH_FROM_BIN@ + +# extract bbs file name +IN=$1 +TMP="${IN##*/}" +OUTPUT="${TMP%%.*}" +echo Output=\"${OUTPUT}\" + +WORKDIR=bbc_tmp +mkdir ${WORKDIR} + +sed s,OUTPUT,${OUTPUT},g ${DATADIR}/CMakeLists.txt.in > ${WORKDIR}/CMakeLists.txt +sed s,EXEC_FUNCTION,${OUTPUT},g ${DATADIR}/main.cxx.in > ${WORKDIR}/main.cxx +cd ${WORKDIR} +bbs2cpp ${IN} +cmake . +cmake . +cmake . +make +mv ${OUTPUT} ${CUR}/ +cd ${CUR} +rm -Rf ${WORKDIR} + diff --git a/kernel/appli/bbc/main.cxx.in b/kernel/appli/bbc/main.cxx.in new file mode 100644 index 0000000..b4ac527 --- /dev/null +++ b/kernel/appli/bbc/main.cxx.in @@ -0,0 +1,200 @@ +#ifdef _USE_WXWIDGETS_ + +//========================================================================== +// WITH WX +//========================================================================== +#include "bbtkInterpreter.h" +#include "bbtkWxBlackBox.h" +#include "bbtkWxGUIConsole.h" + +#include +#include +#include + +#include "EXEC_FUNCTION.h" + +static const wxCmdLineEntryDesc cmdLineDesc[] = +{ + { wxCMD_LINE_SWITCH, _T("d"), _T("debug"), _T("Debug messages on (message All 9)") }, + { wxCMD_LINE_SWITCH, _T("q"), _T("quiet"), _T("be quiet") }, + { wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("print help") }, + { wxCMD_LINE_SWITCH, _T("g"), _T("graphical-dialog"), _T("prompts the user for the parameters values using dialog boxes") }, + { wxCMD_LINE_SWITCH, _T("t"), _T("text-dialog"), _T("prompts the user for the parameters values in text mode") }, + { wxCMD_LINE_PARAM, NULL, NULL, _T("Input=Value"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE }, + { wxCMD_LINE_NONE } +}; + + + +class wxBBIApp : public wxApp +{ +public: + bool OnInit( ); + int OnExit() { delete mExecuter; return true; } + void OnInitCmdLine(wxCmdLineParser& parser); + bool OnCmdLineParsed(wxCmdLineParser& parser); + void Run(bbtk::Interpreter*); + + bbtk::Executer* mExecuter; + // int argc; + // std::vector argv; + bool command; + bool debug; + bool quiet; + bool help; + bool graphical_dialog; + bool text_dialog; + + std::map param_map; + +}; + +IMPLEMENT_APP(wxBBIApp); + +void wxBBIApp::OnInitCmdLine(wxCmdLineParser& parser) +{ + parser.SetDesc(cmdLineDesc); +} + +bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser) +{ + debug = ( parser.Found(_T("d")) ); + quiet = ( parser.Found(_T("q")) ); + help = ( parser.Found(_T("h")) ); + graphical_dialog = ( parser.Found(_T("g")) ); + text_dialog = ( parser.Found(_T("t")) ); + + // parse the arguments and consider those which contain a "=" + // as set input commands + int argc = parser.GetParamCount(); + for (int i=0; iSetInputs(param_map); + + if (help) mExecuter->SetNoExecMode(true); + + if (graphical_dialog) mExecuter->SetDialogMode(bbtk::VirtualExec::GraphicalDialog); + if (text_dialog) mExecuter->SetDialogMode(bbtk::VirtualExec::TextDialog); + + EXEC_FUNCTION(mExecuter); + + mExecuter->SetNoExecMode(false); + + if (help) + { + std::string package; + mExecuter->GetFactory()->HelpBlackBox("workspace",package,false); + } + } + catch (bbtk::Exception e) + { + wxString mess; + mess += bbtk::std2wx ( e.GetMessage() ); + wxMessageBox(mess,_T("Error"),wxOK | wxICON_ERROR); + bbtk::Wx::GetTopWindow()->Close(); + delete mExecuter; + return false; + } + if (help || !bbtk::Wx::IsSomeWindowAlive()) + { + return false; + } + return true; +} + + +#if defined(_WIN32) + +// How to have a Console and wxWidgets +// http://www.wxwidgets.org/wiki/index.php/MSVC_Setup_Guide +// In Visual C++ 6 (7 should be similar), to create an application that is both a console application +// (cout's to the console are visible) and has a wxWidgets GUI, +// you need to use the linker option "/subsystem:console" and the following code: +int main(int argc, char* argv[]) +{ + return WinMain(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), + SW_SHOWNORMAL); +} + +#endif // defined(_WIN32) + + +#else +//========================================================================== +// WITHOUT WX +//========================================================================== + +#include "bbtkInterpreter.h" + +int main(int argc, char* argv[]) +{ + + if (argc>2) return 0; + + std::cout << "BBI (Black Box Interpreter) - bbtk " + << bbtk::GetVersion()<< " - (c) Creatis 2007" + < 0); if (help_on_script) I->SetNoExecMode(true); - if (graphical_dialog) I->SetDialogMode(bbtk::Executer::GraphicalDialog); - if (text_dialog) I->SetDialogMode(bbtk::Executer::TextDialog); + if (graphical_dialog) I->SetDialogMode(bbtk::VirtualExec::GraphicalDialog); + if (text_dialog) I->SetDialogMode(bbtk::VirtualExec::TextDialog); std::vector::const_iterator i; bool error = false; diff --git a/kernel/appli/bbs2cpp/CMakeLists.txt b/kernel/appli/bbs2cpp/CMakeLists.txt new file mode 100644 index 0000000..519826f --- /dev/null +++ b/kernel/appli/bbs2cpp/CMakeLists.txt @@ -0,0 +1,14 @@ + +SET(SOURCES bbs2cpp ) +SET(EXENAME bbs2cpp ) + +IF(BBTK_USE_WXWIDGETS AND WIN32) + ADD_EXECUTABLE(${EXENAME} WIN32 ${SOURCES}) +# SET_TARGET_PROPERTIES(bbhelp PROPERTIES LINK_FLAGS /subsystem:console ) +ELSE(BBTK_USE_WXWIDGETS AND WIN32) + ADD_EXECUTABLE(${EXENAME} ${SOURCES}) +ENDIF(BBTK_USE_WXWIDGETS AND WIN32) + + +TARGET_LINK_LIBRARIES(${EXENAME} bbtk) +INSTALL_TARGETS(/bin/ ${EXENAME}) diff --git a/kernel/appli/bbs2cpp/bbs2cpp.cxx b/kernel/appli/bbs2cpp/bbs2cpp.cxx new file mode 100644 index 0000000..529a035 --- /dev/null +++ b/kernel/appli/bbs2cpp/bbs2cpp.cxx @@ -0,0 +1,30 @@ +#include "bbtkInterpreter.h" +#include "bbtkUtilities.h" + +int main(int argc, char* argv[]) +{ + if (argc<2) return 1; + + std::string file,path; + file = bbtk::Utilities::ExtractScriptName(argv[1],path); + file += ".h"; + bbtk::Interpreter* I = new bbtk::Interpreter(file); + + I->SetThrow(true); + + try + { + I->InterpretFile(argv[1]); + } + catch (bbtk::Exception e) + { + e.Print(); + } + + delete I; + + return 0; +} + +// EOF + diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index ab0075d..d112dba 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/03/26 08:51:43 $ - Version: $Revision: 1.56 $ + Date: $Date: 2008/03/26 14:47:36 $ + Version: $Revision: 1.57 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,8 @@ */ #include "bbtkInterpreter.h" +#include "bbtkExecuter.h" +#include "bbtkTranscriptor.h" #include "bbtkMessageManager.h" #include "bbtkConfigurationFile.h" #include "bbtkUtilities.h" @@ -42,7 +44,7 @@ namespace bbtk /** * */ - Interpreter::Interpreter() + Interpreter::Interpreter(const std::string& cpp_file) : mUser(0), mCommandLine(false), @@ -53,7 +55,14 @@ bufferNb =0; bbtk::MessageManager::RegisterMessageType("Interpreter","Messages of the interpreter",0); bbtkDebugMessageInc("Interpreter",9,"Interpreter::Interpreter()" <SetInterpreter(this); // For the time being, comment out previous line, and @@ -1003,7 +1012,7 @@ void Interpreter::SplitLine ( const std::string& str, std::vector& } else { - bbtkError("'"<& script_paths.push_back(full_path); } } + if (script_paths.empty()) + { + bbtkError("no '"<::iterator i; diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 02985af..d7f8731 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ $ Language: C++ - Date: $Date: 2008/03/26 08:27:19 $ - Version: $Revision: 1.22 $ + Date: $Date: 2008/03/26 14:47:36 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -28,8 +28,6 @@ #define __bbtkInterpreter_h__ #include "bbtkVirtualExec.h" -#include "bbtkExecuter.h" -#include "bbtkTranscriptor.h" #include #include @@ -131,7 +129,7 @@ namespace bbtk public: /// Constructor - Interpreter(); + Interpreter(const std::string& cpp_file = ""); /// Destructor ~Interpreter(); @@ -173,15 +171,13 @@ namespace bbtk //typedef Executer::DialogModeType DialogModeType; typedef VirtualExec::DialogModeType DialogModeType; - void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); } + void SetDialogMode(DialogModeType t) { mExecuter->SetDialogMode(t); } /// Sets the bool that indicates wether we are in command line context void SetCommandLine(bool v = true) { mCommandLine = v; } void SetThrow(bool b) { mThrow = b; } - - #ifdef _USE_WXWIDGETS_ /// Sets the user of the interpreter (if any) void SetUser(InterpreterUser* c) { mUser = c; } diff --git a/kernel/src/bbtkTranscriptor.cxx b/kernel/src/bbtkTranscriptor.cxx index ff0785b..e5e83b5 100644 --- a/kernel/src/bbtkTranscriptor.cxx +++ b/kernel/src/bbtkTranscriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkTranscriptor.cxx,v $ $ Language: C++ - Date: $Date: 2008/03/26 08:27:19 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/03/26 14:47:36 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -40,23 +40,53 @@ namespace bbtk * */ Transcriptor::Transcriptor(std::string filename) - : mPackage(0), - mRoot(0), + : mNoExecMode(false), mDialogMode(NoDialog) { //VirtualExec(); bbtkDebugMessageInc("Kernel",9,"Transcriptor::Transcriptor()" <UnRegisterBlackBox("workspace"); - delete mRoot; - } - if (mPackage) - { - //GetGlobalFactory()->UnLoadPackage("user"); - } - - if(m_Fp) - { - bbtkDebugDecTab("Kernel",9); - m_Fp << " }" << std::endl; - m_Fp.close(); - // delete m_Fp; - } - } + bbtkDebugMessageInc("Kernel",9,"Transcriptor::~Transcriptor()" <Reset( );" << std::endl; @@ -130,7 +159,7 @@ std::cout << "====================================================== delete Tran void Transcriptor::Create ( const std::string& nodeType, const std::string& nodeName) { - m_Fp << " e->Add(\"" << nodeType << "\", \"" + m_Fp << " e->Create(\"" << nodeType << "\", \"" << nodeName << "\");" << std::endl; } @@ -162,8 +191,8 @@ std::cout << "====================================================== delete Tran const std::string& help) { - m_Fp << " e->DefineInput(\""<< name << "\", " << box << ", " - << input << ", \"" << help << "\");" << std::endl; + m_Fp << " e->DefineInput(\""<< name << "\", \"" << box << "\", \"" + << input << "\", \"" << help << "\");" << std::endl; } @@ -199,27 +228,25 @@ std::cout << "====================================================== delete Tran void Transcriptor::Author(const std::string &authorName) { - m_Fp << " e->AddToAuthor(\"" << authorName << "\")" << std::endl; + m_Fp << " e->Author(\"" << authorName << "\");" << std::endl; } void Transcriptor::Category(const std::string &category) { - m_Fp << " e->AddToCategory(\"" << category << "\")" << std::endl; + m_Fp << " e->Category(\"" << category << "\");" << std::endl; } void Transcriptor::Description(const std::string &d) { - m_Fp << " e->AddToDescription(\"" << d << "\")" << std::endl; + m_Fp << " e->Description(\"" << d << "\");" << std::endl; } /// prints the list of the boxes of the current descriptor void Transcriptor::PrintBoxes() { - m_Fp << " e->PrintBoxes( )" << std::endl; + m_Fp << " e->PrintBoxes( );" << std::endl; } -// =========================End of Battlefield ======================================================================== - std::string Transcriptor::ShowGraph(const std::string &nameblackbox, const std::string &detailStr, const std::string &levelStr, @@ -254,7 +281,7 @@ void Transcriptor::ShowRelations(const std::string &nameblackbox, const std::str void Transcriptor::Print(const std::string & message) { - m_Fp << " e->Print(\"" <Print(\"" <SetMessageLevel(\"" <SetMessageLevel(\"" <HelpMessages()"<HelpMessages();"<LoadPackage(\"" <LoadPackage(\"" <UnLoadPackage(\"" <UnLoadPackage(\"" < -#include #include namespace bbtk @@ -66,13 +62,7 @@ namespace bbtk } bool GetNoExecMode() const { return mNoExecMode; } - /* - bool GetNoExecMode() const - { - // cannot compile, since ethos is 'const' ! - //m_Fp << "e->GetNoExecMode(true);" << std::endl; - } - */ + /// Sets the mode of dialog of the executer for Root inputs void SetDialogMode(DialogModeType t) { mDialogMode = t; } @@ -186,47 +176,6 @@ namespace bbtk private: - /// Gets the current working black box - ComplexBlackBoxDescriptor* Current() - { return mOpenDefinition.back().box; } - - /// Returns true when we are inside a define/endefine block - // bool InDefinitionBlock() { return (mOpenDefinition.size()>1); } - - //================================================================== - // ATTRIBUTES - - /// The factory used - // Factory* mFactory; - - /// The Root Package - Package* mPackage; - - /// The root ComplexBlackBox, in which operations are done when outside a define/endefine block - /// Its name in bbi is 'workspace' - ComplexBlackBoxDescriptor* mRoot; - - /// Struct that stores info on user defined complex black boxes - struct CBBDefinition - { - ComplexBlackBoxDescriptor* box; - std::string package; - CBBDefinition(ComplexBlackBoxDescriptor* d, const std::string& p ) - : box(d), package(p) {} - }; - - /// The stack of current working ComplexBlackBox - /// (is a stack for nested definitions) - /// only contains the root when outside a define/endefine block - std::deque mOpenDefinition; - - /// The stack of current working package - /// (is a stack for nested definitions) - std::deque mOpenPackage; - - /// flag which is true when we are inside a Define/EndDefine block - // bool mDefineFlag; - /// The input values of the Root ComplexBlackBox std::map mInputs; diff --git a/kernel/src/bbtkVirtualExec.h b/kernel/src/bbtkVirtualExec.h index cb98062..928a867 100644 --- a/kernel/src/bbtkVirtualExec.h +++ b/kernel/src/bbtkVirtualExec.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkVirtualExec.h,v $ $ Language: C++ - Date: $Date: 2008/03/26 08:27:19 $ - Version: $Revision: 1.9 $ + Date: $Date: 2008/03/26 14:47:36 $ + Version: $Revision: 1.10 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -52,6 +52,8 @@ namespace bbtk VirtualExec() : mInterpreter(0) {} + virtual ~VirtualExec() {} + /// Sets the interpreter who uses it void SetInterpreter(Interpreter* i) { mInterpreter = i; } /// Gets the interpreter who uses it diff --git a/kernel/src/bbtkWx.cxx b/kernel/src/bbtkWx.cxx index fc42e47..7ad8ad0 100644 --- a/kernel/src/bbtkWx.cxx +++ b/kernel/src/bbtkWx.cxx @@ -11,7 +11,13 @@ namespace bbtk static int mgNbWindowsAlive = 0; static int mgNbWindowsShown = 0; - + void Wx::CreateInvisibleTopWindow() + { + wxWindow* top = new wxFrame(0,-1,_T("TOP (YOU SHOULD NOT SEE ME !!)")); + top->Hide(); + Wx::SetTopWindow(top); + } + void Wx::ResetCursor() { if (!GetTopWindow()) return; diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h index 7d64a02..e160c3a 100644 --- a/kernel/src/bbtkWx.h +++ b/kernel/src/bbtkWx.h @@ -44,6 +44,7 @@ namespace bbtk static void EndBusyCursor(); static int mBeginBusyCallsCount; + static void CreateInvisibleTopWindow(); /// Returns the global parent of all bbtk windows static wxWindow* GetTopWindow(); /// Sets the global parent of all bbtk windows @@ -117,6 +118,7 @@ namespace bbtk static void ResetCursor() {} static void BeginBusyCursor() {} static void EndBusyCursor() {} + static void CreateInvisibleTopWindow() {} static wxWindow* GetTopWindow() { return 0; } static void SetTopWindow(wxWindow*) {} static void IncNbWindowsAlive() {} diff --git a/packages/std/src/bbstdExecBbiCommand.cxx b/packages/std/src/bbstdExecBbiCommand.cxx index af65ae7..fb85734 100755 --- a/packages/std/src/bbstdExecBbiCommand.cxx +++ b/packages/std/src/bbstdExecBbiCommand.cxx @@ -1,6 +1,7 @@ #include "bbstdExecBbiCommand.h" #include "bbstdPackage.h" #include "bbtkInterpreter.h" +#include "bbtkExecuter.h" namespace bbstd { diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx index 15021cb..2b943b2 100644 --- a/packages/wx/src/bbwxCommandButton.cxx +++ b/packages/wx/src/bbwxCommandButton.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxCommandButton.cxx,v $ Language: C++ - Date: $Date: 2008/03/19 14:58:14 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/03/26 14:47:37 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -27,6 +27,7 @@ #include "bbwxCommandButton.h" #include "bbwxPackage.h" #include "bbtkInterpreter.h" +#include "bbtkExecuter.h" -- 2.45.1