diff -Nru wxformbuilder-3.1.67/debian/changelog wxformbuilder-3.1.68/debian/changelog --- wxformbuilder-3.1.67/debian/changelog 2010-05-04 20:24:23.000000000 +0100 +++ wxformbuilder-3.1.68/debian/changelog 2010-05-04 20:24:23.000000000 +0100 @@ -1,39 +1,39 @@ -wxformbuilder (3.1.67-0ubuntu2~intrepid1) intrepid; urgency=low +wxformbuilder (3.1.68-0ubuntu1~intrepid1) intrepid; urgency=low - * Sync to upstream 3.1.67. + * Sync to upstream 3.1.68. - -- Ryan Mulder Thu, 18 Feb 2010 19:37:41 -0500 + -- Ryan Pusztai Tue, 04 May 2010 14:18:11 -0400 wxformbuilder (3.1.59-0ubuntu1) jaunty; urgency=low * Sync to upstream 3.1.59. (LP: #326747) -- Ryan Mulder Sat, 07 Feb 2009 20:51:58 -0500 - + wxformbuilder (3.0.57-0ubuntu2) jaunty; urgency=low * FTBFS on 9.04 armel. (LP: #310286) -- Ryan Mulder Sun, 21 Dec 2008 14:00:00 -0400 - + wxformbuilder (3.0.57-0ubuntu1) hardy; urgency=low * Sync to upstream 3.0.57. Bug fixes only. (LP: #218001) -- Ryan Mulder Tue, 15 Apr 2008 20:06:25 -0400 - + wxformbuilder (3.0.56-0ubuntu1) hardy; urgency=low * Sync to upstream 3.0.56 (RC8). Bug fixes only. (LP: #203781) -- Ryan Mulder Wed, 18 Mar 2008 20:06:25 -0400 - + wxformbuilder (3.0.55-0ubuntu1) hardy; urgency=low * Fixed build on architectures other than i386 and amd64. (LP: #192818) -- Ryan Mulder Wed, 13 Feb 2008 20:06:25 -0400 - + wxformbuilder (3.0.54-0ubuntu1) hardy; urgency=low * Initial Release. (LP: #181412) diff -Nru wxformbuilder-3.1.67/debian/control wxformbuilder-3.1.68/debian/control --- wxformbuilder-3.1.67/debian/control 2010-05-04 20:24:23.000000000 +0100 +++ wxformbuilder-3.1.68/debian/control 2010-05-04 20:24:23.000000000 +0100 @@ -15,5 +15,5 @@ use wxWidgets. It is a very WYSIWYG designer, because it uses the actual controls to show the result, not some fake representation. . - Features include generation of C++ or XRC code, custom plugin support, - and import of XRC code. + Features include generation of C++, Python, or XRC code, custom plugin + support, and import of XRC code. diff -Nru wxformbuilder-3.1.67/install/linux/create_src_tarball wxformbuilder-3.1.68/install/linux/create_src_tarball --- wxformbuilder-3.1.67/install/linux/create_src_tarball 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/install/linux/create_src_tarball 2010-05-04 19:19:50.000000000 +0100 @@ -27,26 +27,26 @@ basedir=. # create Makefiles - + # Build premake PREMAKE_DIR=sdk/premake make -C$PREMAKE_DIR/src -f../build/Makefile - + # Use premake to generate Makefiles $PREMAKE_DIR/bin/premake --linux --target gnu --unicode --disable-wx-debug --with-wx-shared --skip-symlink --rpath /usr/lib/wxformbuilder # remove premake, as it is no longer necessary rm -rf $PREMAKE_DIR - + # remove scripts that execute premake, as they are no longer necessary rm -f $basedir/create_build_files* # use a temporary directory - tmpdir=wxformbuilder_$1.orig + tmpdir=wxformbuilder-$1 #.orig cp -R $basedir ../$tmpdir cd .. - + tar czf wxformbuilder_$1.orig.tar.gz $tmpdir rm -rf $tmpdir } @@ -67,7 +67,7 @@ then echo "$version" # because I redirected cat to the while loop, bash spawned a subshell - # this means "version" will go out of scop at the end of the loop + # this means "version" will go out of scope at the end of the loop # so I need to do everything here if [ ${#version} -ge 7 ] then diff -Nru wxformbuilder-3.1.67/install/linux/debian/changelog wxformbuilder-3.1.68/install/linux/debian/changelog --- wxformbuilder-3.1.67/install/linux/debian/changelog 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/install/linux/debian/changelog 2010-05-04 20:24:23.000000000 +0100 @@ -1,33 +1,39 @@ +wxformbuilder (3.1.68-0ubuntu1~lucid1) lucid; urgency=low + + * Sync to upstream 3.1.68. + + -- Ryan Pusztai Tue, 04 May 2010 14:18:11 -0400 + wxformbuilder (3.1.59-0ubuntu1) jaunty; urgency=low * Sync to upstream 3.1.59. (LP: #326747) -- Ryan Mulder Sat, 07 Feb 2009 20:51:58 -0500 - + wxformbuilder (3.0.57-0ubuntu2) jaunty; urgency=low * FTBFS on 9.04 armel. (LP: #310286) -- Ryan Mulder Sun, 21 Dec 2008 14:00:00 -0400 - + wxformbuilder (3.0.57-0ubuntu1) hardy; urgency=low * Sync to upstream 3.0.57. Bug fixes only. (LP: #218001) -- Ryan Mulder Tue, 15 Apr 2008 20:06:25 -0400 - + wxformbuilder (3.0.56-0ubuntu1) hardy; urgency=low * Sync to upstream 3.0.56 (RC8). Bug fixes only. (LP: #203781) -- Ryan Mulder Wed, 18 Mar 2008 20:06:25 -0400 - + wxformbuilder (3.0.55-0ubuntu1) hardy; urgency=low * Fixed build on architectures other than i386 and amd64. (LP: #192818) -- Ryan Mulder Wed, 13 Feb 2008 20:06:25 -0400 - + wxformbuilder (3.0.54-0ubuntu1) hardy; urgency=low * Initial Release. (LP: #181412) diff -Nru wxformbuilder-3.1.67/install/linux/debian/control wxformbuilder-3.1.68/install/linux/debian/control --- wxformbuilder-3.1.67/install/linux/debian/control 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/install/linux/debian/control 2010-05-04 20:24:23.000000000 +0100 @@ -15,5 +15,5 @@ use wxWidgets. It is a very WYSIWYG designer, because it uses the actual controls to show the result, not some fake representation. . - Features include generation of C++ or XRC code, custom plugin support, - and import of XRC code. + Features include generation of C++, Python, or XRC code, custom plugin + support, and import of XRC code. diff -Nru wxformbuilder-3.1.67/install/linux/dsc.sh wxformbuilder-3.1.68/install/linux/dsc.sh --- wxformbuilder-3.1.67/install/linux/dsc.sh 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/install/linux/dsc.sh 2010-05-04 20:24:23.000000000 +0100 @@ -25,26 +25,81 @@ exit 1 fi +function pause() +{ + read -p “$*” +} + +# this function does the actual work of making the source package +# the version is passed to it as the first argument, below +function add_log_entry +{ + set -e + + # check for commandlike arguments + if [ -z "$2" ] + then + echo "User name missing" + exit 1 + fi + + if [ -z "$3" ] + then + echo "Email missing" + exit 1 + fi + + # use debchange + echo debchange -D lucid -v "$1-0ubuntu1~lucid1" -m + debchange -D lucid -v "$1-0ubuntu1~lucid1" -m +} + + # get source tarball debian/rules get-orig-source #extract it tar xzf wxformbuilder_*.orig.tar.gz -#determine version -changelog=`cd wxformbuilder_*.orig/install/linux && dpkg-parsechangelog` -version=`expr match "$changelog" '.*Version: \([0-9]\.[0-9]\{1,2\}\.[0-9]\+\).*'` - -#rename it -sourcedir=wxformbuilder-$version -mv wxformbuilder_*.orig $sourcedir -cp -R $sourcedir/install/linux/debian $sourcedir/debian - #save current dir currentdir=`pwd` -#enter source dir -cd $sourcedir +#save the source dir +cd wxformbuilder-* +sourcedir=`pwd` + +#determine version +#changelog="output/Changelog.txt" +#if [ ! -f $changelog ]; +#then +# echo "Sorry, could not find "$changelog". Need it to parse the version." +# exit 1 +#fi +# +#cat "$changelog" | +#while read line; +#do +# version=`expr match "$line" '.*\([0-9]\.[0-9]\{1,2\}\.[0-9]\+\)'` +# if [ -n "$version" ] +# then +# echo "$version" +# # because I redirected cat to the while loop, bash spawned a subshell +# # this means "version" will go out of scope at the end of the loop +# # so I need to do everything here +# if [ ${#version} -ge 7 ] +# then +# version=${version/0/} +# fi +# add_log_entry $version $1 $2 +# break +# fi +#done + +#copy the debian directory to the correct directory +cp -R install/linux/debian . + +#update the changelog by hand for now +nano debian/changelog #make debian source archive dpkg-buildpackage -S -sa -rfakeroot @@ -52,3 +107,6 @@ #cleanup cd $currentdir rm -r $sourcedir + +#upload the files to the PPA +dput ppa:wxformbuilder/release *.changes diff -Nru wxformbuilder-3.1.67/install/windows/wxFormBuilder.iss wxformbuilder-3.1.68/install/windows/wxFormBuilder.iss --- wxformbuilder-3.1.67/install/windows/wxFormBuilder.iss 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/install/windows/wxFormBuilder.iss 2010-05-04 19:19:50.000000000 +0100 @@ -9,9 +9,9 @@ #define UNICODE 1 -#define MyAppVer "3.1.67" +#define MyAppVer "3.1.68" #define MyAppName "wxFormBuilder" -#define MyAppPublisher "Jos Antonio Hurtado" +#define MyAppPublisher "José Antonio Hurtado" #define MyAppURL "http://wxformbuilder.org" #define MyAppExeName "wxFormBuilder.exe" #define wxFormBuilderMinVer "3.0.57" @@ -28,7 +28,7 @@ DefaultGroupName={#MyAppName} DisableProgramGroupPage=false #if defined UNICODE -OutputBaseFilename={#MyAppName}_v{#MyAppVer}-beta +OutputBaseFilename={#MyAppName}_v{#MyAppVer}-rc1 #else OutputBaseFilename={#MyAppName}_v{#MyAppVer}-9xME #endif @@ -58,7 +58,7 @@ #expr Exec( "create_source_package.bat", NULL, NULL, 1, SW_SHOWMINIMIZED ) [Messages] -BeveledLabel={#MyAppName} v{#MyAppVer}-Beta +BeveledLabel={#MyAppName} v{#MyAppVer}-RC1 [Tasks] Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked diff -Nru wxformbuilder-3.1.67/Makefile wxformbuilder-3.1.68/Makefile --- wxformbuilder-3.1.67/Makefile 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/Makefile 2010-05-04 20:24:23.000000000 +0100 @@ -15,7 +15,7 @@ Makefile: premake.lua src/controls/build/propgrid/premake.lua src/controls/build/wxFlatNotebook/premake.lua src/controls/build/wxScintilla/premake.lua sdk/plugin_interface/premake.lua sdk/tinyxml/ticpp.lua plugins/additional/premake.lua plugins/common/premake.lua plugins/containers/premake.lua plugins/layout/premake.lua plugins/wxAdditions/premake.lua src/premake.lua @echo ==== Regenerating Makefiles ==== - @premake --file $^ --linux --target gnu --unicode --disable-wx-debug --with-wx-shared --skip-symlink --rpath /usr/lib/wxformbuilder + @premake --file $^ src/controls/build/propgrid/premake.lua src/controls/build/wxFlatNotebook/premake.lua src/controls/build/wxScintilla/premake.lua sdk/plugin_interface/premake.lua sdk/tinyxml/ticpp.lua plugins/additional/premake.lua plugins/common/premake.lua plugins/containers/premake.lua plugins/layout/premake.lua plugins/wxAdditions/premake.lua src/premake.lua --linux --target gnu --unicode --disable-wx-debug --with-wx-shared --skip-symlink --rpath /usr/lib/wxformbuilder wxPropGrid: @echo ==== Building wxPropGrid ==== diff -Nru wxformbuilder-3.1.67/output/Changelog.txt wxformbuilder-3.1.68/output/Changelog.txt --- wxformbuilder-3.1.67/output/Changelog.txt 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/output/Changelog.txt 2010-05-04 20:24:23.000000000 +0100 @@ -1,5 +1,20 @@ wxFormBuilder ChangeLog ******************************************************************************** +05/04/2010 Version 3.01.68 (RC1) ++ Generation of inherited class (F6) preserves all user code changes now (so it can be used + more than once) (spedgenius). +* FS#456 - App crashes when you double click on file_path property. +* FS#459 - duplicate python code generated on toolbar add widget. ++ Any widget (wxWindow) can be added also to ToolBarForm (stand-alone toolbar class). +* Fixed disconnection of menu items' event handlers. +* Fixed positioning of newly created items in object tree. +^ Searching scope of find dialog reduced to active editor page only to avoid confusing messages + like multiple "not found". +* User-defined wrapping of static text is correctly generated also for XRC. ++ Implemented internationalization support (gettext) in Python code. +* FS#436 - Relative path in Linux when under a symlink not generating correctly when .xpm included. +^ Slightly changed some main frame's components colors to better respect colours used in OS theme. + 02/10/2010 Version 3.01.67 (Beta) * Fixed resolving of name conflicts in stand-alone toolbars and menubars. ^ Context menus are now generated as top-level menus in XRC so function wxXmlResource::LoadMenu() diff -Nru wxformbuilder-3.1.67/output/plugins/common/xml/menutoolbar.cppcode wxformbuilder-3.1.68/output/plugins/common/xml/menutoolbar.cppcode --- wxformbuilder-3.1.67/output/plugins/common/xml/menutoolbar.cppcode 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/output/plugins/common/xml/menutoolbar.cppcode 2010-05-04 19:19:50.000000000 +0100 @@ -150,11 +150,11 @@ - - + + - - + + diff -Nru wxformbuilder-3.1.67/output/resources/about.html wxformbuilder-3.1.68/output/resources/about.html --- wxformbuilder-3.1.67/output/resources/about.html 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/output/resources/about.html 2010-05-04 19:19:50.000000000 +0100 @@ -34,7 +34,7 @@ wxFormBuilder
- Version 3.1.67-beta (Unicode) + Version 3.1.68-rc1 (Unicode)
diff -Nru wxformbuilder-3.1.67/output/xml/default.cppcode wxformbuilder-3.1.68/output/xml/default.cppcode --- wxformbuilder-3.1.67/output/xml/default.cppcode 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/output/xml/default.cppcode 2010-05-04 19:19:50.000000000 +0100 @@ -80,6 +80,9 @@ #ifnotnull $maximum_size @{ $name->SetMaxSize( $maximum_size ); #nl @} + + #ifparenttypeequal "toolbar_form" + @{ AddControl( $name ); @} diff -Nru wxformbuilder-3.1.67/output/xml/default.pythoncode wxformbuilder-3.1.68/output/xml/default.pythoncode --- wxformbuilder-3.1.67/output/xml/default.pythoncode 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/output/xml/default.pythoncode 2010-05-04 19:19:50.000000000 +0100 @@ -38,6 +38,9 @@ #ifnotnull $maximum_size @{ self.$name.SetMaxSize( $maximum_size ) #nl @} + + #ifparenttypeequal "toolbar_form" + @{ self.AddControl( self.$name ) @} diff -Nru wxformbuilder-3.1.67/output/xml/objtypes.xml wxformbuilder-3.1.68/output/xml/objtypes.xml --- wxformbuilder-3.1.67/output/xml/objtypes.xml 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/output/xml/objtypes.xml 2010-05-04 19:19:50.000000000 +0100 @@ -62,6 +62,8 @@ + + @@ -183,7 +185,7 @@ - + diff -Nru wxformbuilder-3.1.67/plugins/common/common.cpp wxformbuilder-3.1.68/plugins/common/common.cpp --- wxformbuilder-3.1.67/plugins/common/common.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/plugins/common/common.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -530,6 +530,7 @@ ObjectToXrcFilter xrc(obj, _("wxStaticText"), name); xrc.AddWindowProperties(); xrc.AddProperty(_("label"),_("label"),XRC_TYPE_TEXT); + xrc.AddProperty(_("wrap"),_("wrap"),XRC_TYPE_INTEGER); return xrc.GetXrcObject(); } @@ -538,6 +539,7 @@ XrcToXfbFilter filter(xrcObj, _("wxStaticText")); filter.AddWindowProperties(); filter.AddProperty(_("label"),_("label"),XRC_TYPE_TEXT); + filter.AddProperty(_("wrap"),_("wrap"),XRC_TYPE_INTEGER); return filter.GetXfbObject(); } }; @@ -1458,7 +1460,7 @@ ABSTRACT_COMPONENT("Panel",PanelFormComponent) ABSTRACT_COMPONENT("Dialog",DialogFormComponent) ABSTRACT_COMPONENT("MenuBar",MenuBarFormComponent) -ABSTRACT_COMPONENT("ToolBar",ToolBarFormComponent) +WINDOW_COMPONENT("ToolBar",ToolBarFormComponent) WINDOW_COMPONENT("wxButton",ButtonComponent) WINDOW_COMPONENT("wxBitmapButton",BitmapButtonComponent) diff -Nru wxformbuilder-3.1.67/sdk/tinyxml/Makefile wxformbuilder-3.1.68/sdk/tinyxml/Makefile --- wxformbuilder-3.1.67/sdk/tinyxml/Makefile 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/sdk/tinyxml/Makefile 2010-05-04 19:19:50.000000000 +0100 @@ -39,10 +39,10 @@ endif OBJECTS := \ - $(OBJDIR)/tinyxml.o \ - $(OBJDIR)/ticpp.o \ $(OBJDIR)/tinystr.o \ + $(OBJDIR)/ticpp.o \ $(OBJDIR)/tinyxmlerror.o \ + $(OBJDIR)/tinyxml.o \ $(OBJDIR)/tinyxmlparser.o \ MKDIR_TYPE := msdos @@ -85,7 +85,7 @@ -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/tinyxml.o: tinyxml.cpp +$(OBJDIR)/tinystr.o: tinystr.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -95,12 +95,12 @@ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/tinystr.o: tinystr.cpp +$(OBJDIR)/tinyxmlerror.o: tinyxmlerror.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/tinyxmlerror.o: tinyxmlerror.cpp +$(OBJDIR)/tinyxml.o: tinyxml.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff -Nru wxformbuilder-3.1.67/sdk/tinyxml/tests/mocks/TicppMock.hh wxformbuilder-3.1.68/sdk/tinyxml/tests/mocks/TicppMock.hh --- wxformbuilder-3.1.67/sdk/tinyxml/tests/mocks/TicppMock.hh 1970-01-01 01:00:00.000000000 +0100 +++ wxformbuilder-3.1.68/sdk/tinyxml/tests/mocks/TicppMock.hh 2010-05-04 19:19:50.000000000 +0100 @@ -0,0 +1,58 @@ +#if !defined ( __TINY_XML_MOCK__ ) +#define __TINY_XML_MOCK__ + +namespace ticpp +{ + namespace mock + { + struct Element; + + struct Node + { + MOCK_METHOD0( Clear, void ( void ) ); + MOCK_METHOD1( SetValue, void( const std::string& ) ); + MOCK_METHOD1( InsertEndChild, void( const StrictMock< Element >& ) ); + MOCK_METHOD1( LinkEndChild, void( const StrictMock< Node >* ) ); + MOCK_METHOD1( LinkEndChild, void( const StrictMock< Element >* ) ); + MOCK_METHOD1( SetText, void ( const double ) ); + MOCK_METHOD1( SetText, void ( const std::string& ) ); + MOCK_METHOD1( GetValue, void ( std::string* ) ); + MOCK_CONST_METHOD0( GetText, std::string (void) ); + MOCK_METHOD1( SetIntText, void ( const unsigned int ) ); + MOCK_METHOD1( RemoveChild, void ( Node* ) ); + MOCK_CONST_METHOD0( ToElement, StrictMock< Element >* (void) ); + MOCK_CONST_METHOD0( FirstChild, StrictMock< Node >* (void) ); + MOCK_CONST_METHOD1( FirstChild, StrictMock< Node >* ( const std::string& value) ); + MOCK_CONST_METHOD2( FirstChild, StrictMock< Node >* ( const std::string& value, bool ) ); + MOCK_CONST_METHOD1( IterateChildren, StrictMock< Node >* ( StrictMock< Node >* ) ); + MOCK_CONST_METHOD0( FirstChildElement, StrictMock< Element >* () ); + MOCK_CONST_METHOD1( FirstChildElement, StrictMock< Element >* ( bool ) ); + MOCK_CONST_METHOD0( Value, std::string (void) ); + }; + + struct Element : public Node + { + Element( const std::string& ) : Node() + { + } + MOCK_CONST_METHOD1( GetAttribute, std::string ( const std::string& ) ); + MOCK_METHOD2( SetAttribute, void ( const std::string&, const int ) ); + MOCK_METHOD2( SetAttribute, void ( const std::string&, const std::string& ) ); + }; + + struct Document : public Node + { + Document(void) : Node() + { + } + Document( const std::string& ) : Node() + { + } + MOCK_METHOD0( SaveFile, void ( void ) ); + MOCK_METHOD1( LoadFile, void ( const std::string& ) ); + MOCK_METHOD1( Parse, void ( const std::string& ) ); + }; + } +} + +#endif // !defined ( __TINY_XML_MOCK__ ) diff -Nru wxformbuilder-3.1.67/sdk/tinyxml/ticpp.h wxformbuilder-3.1.68/sdk/tinyxml/ticpp.h --- wxformbuilder-3.1.67/sdk/tinyxml/ticpp.h 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/sdk/tinyxml/ticpp.h 2010-05-04 19:19:50.000000000 +0100 @@ -1397,11 +1397,12 @@ Document( const char* documentName ); /** - Constructor. - Create a document with a name. The name of the document is also the filename of the xml. - - @param documentName Name to set in the Document. - */ + * Constructor. + * Create a document with a name. The name of the document is also the filename of the xml. + * @param documentName Name to set in the Document. + * @note LoadFile() needs to be called to actually load the data from the file specified by documentName + * SaveFile() needs to be called to save data to file specified by documentName. + */ Document( const std::string& documentName ); /** @@ -1746,7 +1747,8 @@ { if ( throwIfNotFound ) { - TICPPTHROW( "Attribute does not exist" ); + const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) ); + TICPPTHROW( error ); } } else @@ -1778,7 +1780,8 @@ { if ( throwIfNotFound ) { - TICPPTHROW( "Attribute does not exist" ); + const std::string error( std::string( "Attribute '" ) + name + std::string( "' does not exist" ) ); + TICPPTHROW( error ); } else { diff -Nru wxformbuilder-3.1.67/src/codegen/codeparser.cpp wxformbuilder-3.1.68/src/codegen/codeparser.cpp --- wxformbuilder-3.1.67/src/codegen/codeparser.cpp 2010-05-04 20:24:23.000000000 +0100 +++ wxformbuilder-3.1.68/src/codegen/codeparser.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -133,8 +133,23 @@ if (userMembersStart != wxNOT_FOUND) { userMembersStart = code.find('\n', userMembersStart); - userMembersStart++; - m_userMemebers = code.Mid(userMembersStart); + if(userMembersStart == wxNOT_FOUND) + { + m_userMemebers = wxT(""); + } + else + { + userMembersStart++; + if(userMembersStart < (int)code.Len()) + { + m_userMemebers = code.Mid(userMembersStart); + } + else + { + m_userMemebers = wxT(""); + } + + } } else { @@ -147,11 +162,9 @@ int functionStart = 0; int functionEnd = 0; int previousFunctionEnd = 0; - int contentSize; wxString funcName, funcArg; Function *func; wxString Str, R; - int num; int loop = 0; while (1) diff -Nru wxformbuilder-3.1.67/src/codegen/cppcg.cpp wxformbuilder-3.1.68/src/codegen/cppcg.cpp --- wxformbuilder-3.1.67/src/codegen/cppcg.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/codegen/cppcg.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -1830,6 +1830,15 @@ void CppCodeGenerator::GenAddToolbar( PObjectInfo info, PObjectBase obj ) { + wxArrayString arrCode; + + GetAddToolbarCode( info, obj, arrCode ); + + for( size_t i = 0; i < arrCode.GetCount(); i++ ) m_source->WriteLn( arrCode[i] ); +} + +void CppCodeGenerator::GetAddToolbarCode( PObjectInfo info, PObjectBase obj, wxArrayString& codelines ) +{ wxString _template; PCodeInfo code_info = info->GetCodeInfo( wxT( "C++" ) ); @@ -1844,17 +1853,16 @@ wxString code = parser.ParseTemplate(); if ( !code.empty() ) { - m_source->WriteLn( code ); + if( codelines.Index( code ) == wxNOT_FOUND ) codelines.Add( code ); } } - + // Proceeding recursively with the base classes for ( unsigned int i = 0; i < info->GetBaseClassCount(); i++ ) { PObjectInfo base_info = info->GetBaseClass( i ); - GenAddToolbar( base_info, obj ); + GetAddToolbarCode( base_info, obj, codelines ); } - } /////////////////////////////////////////////////////////////////////// diff -Nru wxformbuilder-3.1.67/src/codegen/cppcg.h wxformbuilder-3.1.68/src/codegen/cppcg.h --- wxformbuilder-3.1.67/src/codegen/cppcg.h 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/codegen/cppcg.h 2010-05-04 19:19:50.000000000 +0100 @@ -219,6 +219,7 @@ * the template is found, and the objectbase for the control. */ void GenAddToolbar( PObjectInfo info, PObjectBase obj ); + void GetAddToolbarCode( PObjectInfo info, PObjectBase obj, wxArrayString& codelines ); void GenPrivateEventHandlers(const EventVector &events); diff -Nru wxformbuilder-3.1.67/src/codegen/pythoncg.cpp wxformbuilder-3.1.68/src/codegen/pythoncg.cpp --- wxformbuilder-3.1.67/src/codegen/pythoncg.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/codegen/pythoncg.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -120,7 +120,7 @@ { if ( m_i18n ) { - result << wxT("u\"") << PythonCodeGenerator::ConvertPythonString(value) << wxT("\""); + result << wxT("_(\"") << PythonCodeGenerator::ConvertPythonString(value) << wxT("\")"); } else { @@ -505,6 +505,14 @@ m_source->WriteLn( wxT("") ); } + // Write internationalization support + if( m_i18n ) + { + m_source->WriteLn( wxT("import gettext") ); + m_source->WriteLn( wxT("_ = gettext.gettext") ); + m_source->WriteLn( wxT("") ); + } + // Generating "defines" for macros GenDefines( project ); @@ -1294,15 +1302,24 @@ } } -void PythonCodeGenerator::GenAddToolbar(PObjectInfo info, PObjectBase obj) +void PythonCodeGenerator::GenAddToolbar( PObjectInfo info, PObjectBase obj ) +{ + wxArrayString arrCode; + + GetAddToolbarCode( info, obj, arrCode ); + + for( size_t i = 0; i < arrCode.GetCount(); i++ ) m_source->WriteLn( arrCode[i] ); +} + +void PythonCodeGenerator::GetAddToolbarCode( PObjectInfo info, PObjectBase obj, wxArrayString& codelines ) { wxString _template; - PCodeInfo code_info = info->GetCodeInfo( wxT("Python") ); + PCodeInfo code_info = info->GetCodeInfo( wxT( "Python" ) ); - if (!code_info) + if ( !code_info ) return; - _template = code_info->GetTemplate( wxT("toolbar_add") ); + _template = code_info->GetTemplate( wxT( "toolbar_add" ) ); if ( !_template.empty() ) { @@ -1310,15 +1327,15 @@ wxString code = parser.ParseTemplate(); if ( !code.empty() ) { - m_source->WriteLn(code); + if( codelines.Index( code ) == wxNOT_FOUND ) codelines.Add( code ); } } - + // Proceeding recursively with the base classes - for (unsigned int i=0; i< info->GetBaseClassCount(); i++) + for ( unsigned int i = 0; i < info->GetBaseClassCount(); i++ ) { - PObjectInfo base_info = info->GetBaseClass(i); - GenAddToolbar(base_info,obj); + PObjectInfo base_info = info->GetBaseClass( i ); + GetAddToolbarCode( base_info, obj, codelines ); } } diff -Nru wxformbuilder-3.1.67/src/codegen/pythoncg.h wxformbuilder-3.1.68/src/codegen/pythoncg.h --- wxformbuilder-3.1.67/src/codegen/pythoncg.h 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/codegen/pythoncg.h 2010-05-04 19:19:50.000000000 +0100 @@ -183,6 +183,7 @@ * the template is found, and the objectbase for the control. */ void GenAddToolbar( PObjectInfo info, PObjectBase obj ); + void GetAddToolbarCode( PObjectInfo info, PObjectBase obj, wxArrayString& codelines ); void GenVirtualEventHandlers( const EventVector &events, const wxString& eventHandlerPostfix ); diff -Nru wxformbuilder-3.1.67/src/controls/build/propgrid/Makefile wxformbuilder-3.1.68/src/controls/build/propgrid/Makefile --- wxformbuilder-3.1.67/src/controls/build/propgrid/Makefile 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/controls/build/propgrid/Makefile 2010-05-04 19:19:50.000000000 +0100 @@ -39,12 +39,12 @@ endif OBJECTS := \ - $(OBJDIR)/propgrid.o \ + $(OBJDIR)/advprops.o \ $(OBJDIR)/props.o \ $(OBJDIR)/extras.o \ - $(OBJDIR)/advprops.o \ $(OBJDIR)/odcombo.o \ $(OBJDIR)/manager.o \ + $(OBJDIR)/propgrid.o \ MKDIR_TYPE := msdos CMD := $(subst \,\\,$(ComSpec)$(COMSPEC)) @@ -86,7 +86,7 @@ -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/propgrid.o: ../../src/propgrid/propgrid.cpp +$(OBJDIR)/advprops.o: ../../src/propgrid/advprops.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -101,17 +101,17 @@ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/advprops.o: ../../src/propgrid/advprops.cpp +$(OBJDIR)/odcombo.o: ../../src/propgrid/odcombo.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/odcombo.o: ../../src/propgrid/odcombo.cpp +$(OBJDIR)/manager.o: ../../src/propgrid/manager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/manager.o: ../../src/propgrid/manager.cpp +$(OBJDIR)/propgrid.o: ../../src/propgrid/propgrid.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff -Nru wxformbuilder-3.1.67/src/controls/build/wxFlatNotebook/Makefile wxformbuilder-3.1.68/src/controls/build/wxFlatNotebook/Makefile --- wxformbuilder-3.1.67/src/controls/build/wxFlatNotebook/Makefile 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/controls/build/wxFlatNotebook/Makefile 2010-05-04 19:19:50.000000000 +0100 @@ -39,12 +39,12 @@ endif OBJECTS := \ - $(OBJDIR)/fnb_customize_dlg.o \ - $(OBJDIR)/fnb_resources.o \ $(OBJDIR)/popup_dlg.o \ + $(OBJDIR)/fnb_resources.o \ + $(OBJDIR)/wxFlatNotebook.o \ $(OBJDIR)/xh_fnb.o \ + $(OBJDIR)/fnb_customize_dlg.o \ $(OBJDIR)/renderer.o \ - $(OBJDIR)/wxFlatNotebook.o \ MKDIR_TYPE := msdos CMD := $(subst \,\\,$(ComSpec)$(COMSPEC)) @@ -86,7 +86,7 @@ -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/fnb_customize_dlg.o: ../../src/wxFlatNotebook/fnb_customize_dlg.cpp +$(OBJDIR)/popup_dlg.o: ../../src/wxFlatNotebook/popup_dlg.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -96,7 +96,7 @@ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/popup_dlg.o: ../../src/wxFlatNotebook/popup_dlg.cpp +$(OBJDIR)/wxFlatNotebook.o: ../../src/wxFlatNotebook/wxFlatNotebook.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -106,12 +106,12 @@ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/renderer.o: ../../src/wxFlatNotebook/renderer.cpp +$(OBJDIR)/fnb_customize_dlg.o: ../../src/wxFlatNotebook/fnb_customize_dlg.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/wxFlatNotebook.o: ../../src/wxFlatNotebook/wxFlatNotebook.cpp +$(OBJDIR)/renderer.o: ../../src/wxFlatNotebook/renderer.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff -Nru wxformbuilder-3.1.67/src/controls/build/wxScintilla/Makefile wxformbuilder-3.1.68/src/controls/build/wxScintilla/Makefile --- wxformbuilder-3.1.67/src/controls/build/wxScintilla/Makefile 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/controls/build/wxScintilla/Makefile 2010-05-04 19:19:50.000000000 +0100 @@ -39,97 +39,97 @@ endif OBJECTS := \ + $(OBJDIR)/ScintillaWX.o \ $(OBJDIR)/PlatWX.o \ $(OBJDIR)/wxscintilla.o \ - $(OBJDIR)/ScintillaWX.o \ - $(OBJDIR)/CharClassify.o \ - $(OBJDIR)/LexHaskell.o \ - $(OBJDIR)/LexInno.o \ - $(OBJDIR)/LexOthers.o \ - $(OBJDIR)/LexMatlab.o \ - $(OBJDIR)/LexScriptol.o \ + $(OBJDIR)/LexAda.o \ + $(OBJDIR)/LexFlagship.o \ + $(OBJDIR)/ViewStyle.o \ $(OBJDIR)/LexVerilog.o \ - $(OBJDIR)/LexAsm.o \ - $(OBJDIR)/LexYAML.o \ + $(OBJDIR)/LexBaan.o \ + $(OBJDIR)/LexPython.o \ + $(OBJDIR)/RunStyles.o \ + $(OBJDIR)/LexLisp.o \ + $(OBJDIR)/LexCsound.o \ + $(OBJDIR)/LexPascal.o \ + $(OBJDIR)/Document.o \ + $(OBJDIR)/LexMatlab.o \ $(OBJDIR)/LexCLW.o \ + $(OBJDIR)/LexPLM.o \ + $(OBJDIR)/LexHaskell.o \ + $(OBJDIR)/KeyMap.o \ $(OBJDIR)/LexCrontab.o \ - $(OBJDIR)/LexPOV.o \ - $(OBJDIR)/ScintillaBase.o \ - $(OBJDIR)/LexSmalltalk.o \ + $(OBJDIR)/LexEScript.o \ + $(OBJDIR)/CellBuffer.o \ + $(OBJDIR)/LexAsm.o \ + $(OBJDIR)/LexYAML.o \ + $(OBJDIR)/CharClassify.o \ + $(OBJDIR)/DocumentAccessor.o \ + $(OBJDIR)/LexBullant.o \ + $(OBJDIR)/LexCPP.o \ + $(OBJDIR)/LexMPT.o \ + $(OBJDIR)/LexOthers.o \ + $(OBJDIR)/LexMSSQL.o \ $(OBJDIR)/LexAPDL.o \ - $(OBJDIR)/LineMarker.o \ - $(OBJDIR)/LexAda.o \ + $(OBJDIR)/PositionCache.o \ + $(OBJDIR)/LexSQL.o \ + $(OBJDIR)/LexGui4Cli.o \ + $(OBJDIR)/ContractionState.o \ + $(OBJDIR)/Decoration.o \ + $(OBJDIR)/LexVHDL.o \ + $(OBJDIR)/LexPerl.o \ + $(OBJDIR)/Editor.o \ + $(OBJDIR)/LexOpal.o \ + $(OBJDIR)/Indicator.o \ + $(OBJDIR)/KeyWords.o \ $(OBJDIR)/LexNsis.o \ - $(OBJDIR)/AutoComplete.o \ - $(OBJDIR)/LexHTML.o \ - $(OBJDIR)/LexPython.o \ - $(OBJDIR)/RESearch.o \ - $(OBJDIR)/LexTCL.o \ - $(OBJDIR)/WindowAccessor.o \ - $(OBJDIR)/LexFlagship.o \ + $(OBJDIR)/LexSmalltalk.o \ $(OBJDIR)/LexMetapost.o \ - $(OBJDIR)/LexVB.o \ - $(OBJDIR)/LexTADS3.o \ + $(OBJDIR)/LexAsn1.o \ $(OBJDIR)/LexErlang.o \ - $(OBJDIR)/CallTip.o \ $(OBJDIR)/LexFortran.o \ - $(OBJDIR)/LexAU3.o \ - $(OBJDIR)/ExternalLexer.o \ + $(OBJDIR)/LexGAP.o \ $(OBJDIR)/LexBasic.o \ - $(OBJDIR)/LexOpal.o \ - $(OBJDIR)/LexMMIXAL.o \ - $(OBJDIR)/LexSpecman.o \ - $(OBJDIR)/LexConf.o \ - $(OBJDIR)/Decoration.o \ - $(OBJDIR)/LexGui4Cli.o \ + $(OBJDIR)/LineMarker.o \ $(OBJDIR)/LexTeX.o \ - $(OBJDIR)/LexCPP.o \ - $(OBJDIR)/LexForth.o \ - $(OBJDIR)/LexCsound.o \ - $(OBJDIR)/LexD.o \ $(OBJDIR)/XPM.o \ - $(OBJDIR)/LexMSSQL.o \ - $(OBJDIR)/LexProgress.o \ - $(OBJDIR)/LexPS.o \ - $(OBJDIR)/LexMPT.o \ - $(OBJDIR)/DocumentAccessor.o \ - $(OBJDIR)/LexCaml.o \ - $(OBJDIR)/LexPascal.o \ - $(OBJDIR)/LexKix.o \ - $(OBJDIR)/LexLua.o \ + $(OBJDIR)/LexScriptol.o \ + $(OBJDIR)/UniConversion.o \ + $(OBJDIR)/LexSpecman.o \ $(OBJDIR)/LexAVE.o \ - $(OBJDIR)/Editor.o \ - $(OBJDIR)/RunStyles.o \ $(OBJDIR)/PropSet.o \ - $(OBJDIR)/LexPerl.o \ - $(OBJDIR)/ViewStyle.o \ - $(OBJDIR)/Indicator.o \ - $(OBJDIR)/LexLisp.o \ - $(OBJDIR)/LexEScript.o \ - $(OBJDIR)/LexBaan.o \ - $(OBJDIR)/KeyWords.o \ - $(OBJDIR)/LexBullant.o \ - $(OBJDIR)/LexLout.o \ - $(OBJDIR)/ContractionState.o \ - $(OBJDIR)/CellBuffer.o \ - $(OBJDIR)/PositionCache.o \ + $(OBJDIR)/LexD.o \ $(OBJDIR)/LexEiffel.o \ $(OBJDIR)/LexPB.o \ - $(OBJDIR)/LexGAP.o \ - $(OBJDIR)/KeyMap.o \ - $(OBJDIR)/LexRuby.o \ + $(OBJDIR)/LexMMIXAL.o \ + $(OBJDIR)/LexCSS.o \ + $(OBJDIR)/CallTip.o \ + $(OBJDIR)/LexHTML.o \ + $(OBJDIR)/WindowAccessor.o \ + $(OBJDIR)/LexLout.o \ + $(OBJDIR)/LexProgress.o \ $(OBJDIR)/LexCmake.o \ + $(OBJDIR)/LexRuby.o \ + $(OBJDIR)/LexPOV.o \ + $(OBJDIR)/LexConf.o \ + $(OBJDIR)/LexVB.o \ + $(OBJDIR)/StyleContext.o \ + $(OBJDIR)/LexKix.o \ + $(OBJDIR)/AutoComplete.o \ + $(OBJDIR)/LexLua.o \ + $(OBJDIR)/LexTADS3.o \ + $(OBJDIR)/LexCaml.o \ + $(OBJDIR)/LexPS.o \ $(OBJDIR)/LexRebol.o \ - $(OBJDIR)/UniConversion.o \ - $(OBJDIR)/Style.o \ $(OBJDIR)/LexBash.o \ - $(OBJDIR)/StyleContext.o \ - $(OBJDIR)/LexAsn1.o \ - $(OBJDIR)/LexCSS.o \ - $(OBJDIR)/LexSQL.o \ - $(OBJDIR)/LexPLM.o \ - $(OBJDIR)/LexVHDL.o \ - $(OBJDIR)/Document.o \ + $(OBJDIR)/ScintillaBase.o \ + $(OBJDIR)/LexForth.o \ + $(OBJDIR)/LexTCL.o \ + $(OBJDIR)/LexAU3.o \ + $(OBJDIR)/Style.o \ + $(OBJDIR)/RESearch.o \ + $(OBJDIR)/LexInno.o \ + $(OBJDIR)/ExternalLexer.o \ $(OBJDIR)/LexSpice.o \ MKDIR_TYPE := msdos @@ -172,457 +172,457 @@ -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/PlatWX.o: ../../src/wxScintilla/PlatWX.cpp +$(OBJDIR)/ScintillaWX.o: ../../src/wxScintilla/ScintillaWX.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/wxscintilla.o: ../../src/wxScintilla/wxscintilla.cpp +$(OBJDIR)/PlatWX.o: ../../src/wxScintilla/PlatWX.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ScintillaWX.o: ../../src/wxScintilla/ScintillaWX.cpp +$(OBJDIR)/wxscintilla.o: ../../src/wxScintilla/wxscintilla.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/CharClassify.o: ../../src/wxScintilla/scintilla/src/CharClassify.cxx +$(OBJDIR)/LexAda.o: ../../src/wxScintilla/scintilla/src/LexAda.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexHaskell.o: ../../src/wxScintilla/scintilla/src/LexHaskell.cxx +$(OBJDIR)/LexFlagship.o: ../../src/wxScintilla/scintilla/src/LexFlagship.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexInno.o: ../../src/wxScintilla/scintilla/src/LexInno.cxx +$(OBJDIR)/ViewStyle.o: ../../src/wxScintilla/scintilla/src/ViewStyle.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexOthers.o: ../../src/wxScintilla/scintilla/src/LexOthers.cxx +$(OBJDIR)/LexVerilog.o: ../../src/wxScintilla/scintilla/src/LexVerilog.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexMatlab.o: ../../src/wxScintilla/scintilla/src/LexMatlab.cxx +$(OBJDIR)/LexBaan.o: ../../src/wxScintilla/scintilla/src/LexBaan.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexScriptol.o: ../../src/wxScintilla/scintilla/src/LexScriptol.cxx +$(OBJDIR)/LexPython.o: ../../src/wxScintilla/scintilla/src/LexPython.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexVerilog.o: ../../src/wxScintilla/scintilla/src/LexVerilog.cxx +$(OBJDIR)/RunStyles.o: ../../src/wxScintilla/scintilla/src/RunStyles.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexAsm.o: ../../src/wxScintilla/scintilla/src/LexAsm.cxx +$(OBJDIR)/LexLisp.o: ../../src/wxScintilla/scintilla/src/LexLisp.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexYAML.o: ../../src/wxScintilla/scintilla/src/LexYAML.cxx +$(OBJDIR)/LexCsound.o: ../../src/wxScintilla/scintilla/src/LexCsound.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCLW.o: ../../src/wxScintilla/scintilla/src/LexCLW.cxx +$(OBJDIR)/LexPascal.o: ../../src/wxScintilla/scintilla/src/LexPascal.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCrontab.o: ../../src/wxScintilla/scintilla/src/LexCrontab.cxx +$(OBJDIR)/Document.o: ../../src/wxScintilla/scintilla/src/Document.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPOV.o: ../../src/wxScintilla/scintilla/src/LexPOV.cxx +$(OBJDIR)/LexMatlab.o: ../../src/wxScintilla/scintilla/src/LexMatlab.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ScintillaBase.o: ../../src/wxScintilla/scintilla/src/ScintillaBase.cxx +$(OBJDIR)/LexCLW.o: ../../src/wxScintilla/scintilla/src/LexCLW.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexSmalltalk.o: ../../src/wxScintilla/scintilla/src/LexSmalltalk.cxx +$(OBJDIR)/LexPLM.o: ../../src/wxScintilla/scintilla/src/LexPLM.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexAPDL.o: ../../src/wxScintilla/scintilla/src/LexAPDL.cxx +$(OBJDIR)/LexHaskell.o: ../../src/wxScintilla/scintilla/src/LexHaskell.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LineMarker.o: ../../src/wxScintilla/scintilla/src/LineMarker.cxx +$(OBJDIR)/KeyMap.o: ../../src/wxScintilla/scintilla/src/KeyMap.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexAda.o: ../../src/wxScintilla/scintilla/src/LexAda.cxx +$(OBJDIR)/LexCrontab.o: ../../src/wxScintilla/scintilla/src/LexCrontab.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexNsis.o: ../../src/wxScintilla/scintilla/src/LexNsis.cxx +$(OBJDIR)/LexEScript.o: ../../src/wxScintilla/scintilla/src/LexEScript.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/AutoComplete.o: ../../src/wxScintilla/scintilla/src/AutoComplete.cxx +$(OBJDIR)/CellBuffer.o: ../../src/wxScintilla/scintilla/src/CellBuffer.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexHTML.o: ../../src/wxScintilla/scintilla/src/LexHTML.cxx +$(OBJDIR)/LexAsm.o: ../../src/wxScintilla/scintilla/src/LexAsm.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPython.o: ../../src/wxScintilla/scintilla/src/LexPython.cxx +$(OBJDIR)/LexYAML.o: ../../src/wxScintilla/scintilla/src/LexYAML.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/RESearch.o: ../../src/wxScintilla/scintilla/src/RESearch.cxx +$(OBJDIR)/CharClassify.o: ../../src/wxScintilla/scintilla/src/CharClassify.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexTCL.o: ../../src/wxScintilla/scintilla/src/LexTCL.cxx +$(OBJDIR)/DocumentAccessor.o: ../../src/wxScintilla/scintilla/src/DocumentAccessor.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/WindowAccessor.o: ../../src/wxScintilla/scintilla/src/WindowAccessor.cxx +$(OBJDIR)/LexBullant.o: ../../src/wxScintilla/scintilla/src/LexBullant.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexFlagship.o: ../../src/wxScintilla/scintilla/src/LexFlagship.cxx +$(OBJDIR)/LexCPP.o: ../../src/wxScintilla/scintilla/src/LexCPP.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexMetapost.o: ../../src/wxScintilla/scintilla/src/LexMetapost.cxx +$(OBJDIR)/LexMPT.o: ../../src/wxScintilla/scintilla/src/LexMPT.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexVB.o: ../../src/wxScintilla/scintilla/src/LexVB.cxx +$(OBJDIR)/LexOthers.o: ../../src/wxScintilla/scintilla/src/LexOthers.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexTADS3.o: ../../src/wxScintilla/scintilla/src/LexTADS3.cxx +$(OBJDIR)/LexMSSQL.o: ../../src/wxScintilla/scintilla/src/LexMSSQL.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexErlang.o: ../../src/wxScintilla/scintilla/src/LexErlang.cxx +$(OBJDIR)/LexAPDL.o: ../../src/wxScintilla/scintilla/src/LexAPDL.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/CallTip.o: ../../src/wxScintilla/scintilla/src/CallTip.cxx +$(OBJDIR)/PositionCache.o: ../../src/wxScintilla/scintilla/src/PositionCache.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexFortran.o: ../../src/wxScintilla/scintilla/src/LexFortran.cxx +$(OBJDIR)/LexSQL.o: ../../src/wxScintilla/scintilla/src/LexSQL.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexAU3.o: ../../src/wxScintilla/scintilla/src/LexAU3.cxx +$(OBJDIR)/LexGui4Cli.o: ../../src/wxScintilla/scintilla/src/LexGui4Cli.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ExternalLexer.o: ../../src/wxScintilla/scintilla/src/ExternalLexer.cxx +$(OBJDIR)/ContractionState.o: ../../src/wxScintilla/scintilla/src/ContractionState.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexBasic.o: ../../src/wxScintilla/scintilla/src/LexBasic.cxx +$(OBJDIR)/Decoration.o: ../../src/wxScintilla/scintilla/src/Decoration.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexOpal.o: ../../src/wxScintilla/scintilla/src/LexOpal.cxx +$(OBJDIR)/LexVHDL.o: ../../src/wxScintilla/scintilla/src/LexVHDL.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexMMIXAL.o: ../../src/wxScintilla/scintilla/src/LexMMIXAL.cxx +$(OBJDIR)/LexPerl.o: ../../src/wxScintilla/scintilla/src/LexPerl.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexSpecman.o: ../../src/wxScintilla/scintilla/src/LexSpecman.cxx +$(OBJDIR)/Editor.o: ../../src/wxScintilla/scintilla/src/Editor.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexConf.o: ../../src/wxScintilla/scintilla/src/LexConf.cxx +$(OBJDIR)/LexOpal.o: ../../src/wxScintilla/scintilla/src/LexOpal.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/Decoration.o: ../../src/wxScintilla/scintilla/src/Decoration.cxx +$(OBJDIR)/Indicator.o: ../../src/wxScintilla/scintilla/src/Indicator.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexGui4Cli.o: ../../src/wxScintilla/scintilla/src/LexGui4Cli.cxx +$(OBJDIR)/KeyWords.o: ../../src/wxScintilla/scintilla/src/KeyWords.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexTeX.o: ../../src/wxScintilla/scintilla/src/LexTeX.cxx +$(OBJDIR)/LexNsis.o: ../../src/wxScintilla/scintilla/src/LexNsis.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCPP.o: ../../src/wxScintilla/scintilla/src/LexCPP.cxx +$(OBJDIR)/LexSmalltalk.o: ../../src/wxScintilla/scintilla/src/LexSmalltalk.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexForth.o: ../../src/wxScintilla/scintilla/src/LexForth.cxx +$(OBJDIR)/LexMetapost.o: ../../src/wxScintilla/scintilla/src/LexMetapost.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCsound.o: ../../src/wxScintilla/scintilla/src/LexCsound.cxx +$(OBJDIR)/LexAsn1.o: ../../src/wxScintilla/scintilla/src/LexAsn1.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexD.o: ../../src/wxScintilla/scintilla/src/LexD.cxx +$(OBJDIR)/LexErlang.o: ../../src/wxScintilla/scintilla/src/LexErlang.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/XPM.o: ../../src/wxScintilla/scintilla/src/XPM.cxx +$(OBJDIR)/LexFortran.o: ../../src/wxScintilla/scintilla/src/LexFortran.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexMSSQL.o: ../../src/wxScintilla/scintilla/src/LexMSSQL.cxx +$(OBJDIR)/LexGAP.o: ../../src/wxScintilla/scintilla/src/LexGAP.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexProgress.o: ../../src/wxScintilla/scintilla/src/LexProgress.cxx +$(OBJDIR)/LexBasic.o: ../../src/wxScintilla/scintilla/src/LexBasic.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPS.o: ../../src/wxScintilla/scintilla/src/LexPS.cxx +$(OBJDIR)/LineMarker.o: ../../src/wxScintilla/scintilla/src/LineMarker.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexMPT.o: ../../src/wxScintilla/scintilla/src/LexMPT.cxx +$(OBJDIR)/LexTeX.o: ../../src/wxScintilla/scintilla/src/LexTeX.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/DocumentAccessor.o: ../../src/wxScintilla/scintilla/src/DocumentAccessor.cxx +$(OBJDIR)/XPM.o: ../../src/wxScintilla/scintilla/src/XPM.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCaml.o: ../../src/wxScintilla/scintilla/src/LexCaml.cxx +$(OBJDIR)/LexScriptol.o: ../../src/wxScintilla/scintilla/src/LexScriptol.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPascal.o: ../../src/wxScintilla/scintilla/src/LexPascal.cxx +$(OBJDIR)/UniConversion.o: ../../src/wxScintilla/scintilla/src/UniConversion.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexKix.o: ../../src/wxScintilla/scintilla/src/LexKix.cxx +$(OBJDIR)/LexSpecman.o: ../../src/wxScintilla/scintilla/src/LexSpecman.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexLua.o: ../../src/wxScintilla/scintilla/src/LexLua.cxx +$(OBJDIR)/LexAVE.o: ../../src/wxScintilla/scintilla/src/LexAVE.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexAVE.o: ../../src/wxScintilla/scintilla/src/LexAVE.cxx +$(OBJDIR)/PropSet.o: ../../src/wxScintilla/scintilla/src/PropSet.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/Editor.o: ../../src/wxScintilla/scintilla/src/Editor.cxx +$(OBJDIR)/LexD.o: ../../src/wxScintilla/scintilla/src/LexD.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/RunStyles.o: ../../src/wxScintilla/scintilla/src/RunStyles.cxx +$(OBJDIR)/LexEiffel.o: ../../src/wxScintilla/scintilla/src/LexEiffel.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/PropSet.o: ../../src/wxScintilla/scintilla/src/PropSet.cxx +$(OBJDIR)/LexPB.o: ../../src/wxScintilla/scintilla/src/LexPB.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPerl.o: ../../src/wxScintilla/scintilla/src/LexPerl.cxx +$(OBJDIR)/LexMMIXAL.o: ../../src/wxScintilla/scintilla/src/LexMMIXAL.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ViewStyle.o: ../../src/wxScintilla/scintilla/src/ViewStyle.cxx +$(OBJDIR)/LexCSS.o: ../../src/wxScintilla/scintilla/src/LexCSS.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/Indicator.o: ../../src/wxScintilla/scintilla/src/Indicator.cxx +$(OBJDIR)/CallTip.o: ../../src/wxScintilla/scintilla/src/CallTip.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexLisp.o: ../../src/wxScintilla/scintilla/src/LexLisp.cxx +$(OBJDIR)/LexHTML.o: ../../src/wxScintilla/scintilla/src/LexHTML.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexEScript.o: ../../src/wxScintilla/scintilla/src/LexEScript.cxx +$(OBJDIR)/WindowAccessor.o: ../../src/wxScintilla/scintilla/src/WindowAccessor.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexBaan.o: ../../src/wxScintilla/scintilla/src/LexBaan.cxx +$(OBJDIR)/LexLout.o: ../../src/wxScintilla/scintilla/src/LexLout.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/KeyWords.o: ../../src/wxScintilla/scintilla/src/KeyWords.cxx +$(OBJDIR)/LexProgress.o: ../../src/wxScintilla/scintilla/src/LexProgress.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexBullant.o: ../../src/wxScintilla/scintilla/src/LexBullant.cxx +$(OBJDIR)/LexCmake.o: ../../src/wxScintilla/scintilla/src/LexCmake.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexLout.o: ../../src/wxScintilla/scintilla/src/LexLout.cxx +$(OBJDIR)/LexRuby.o: ../../src/wxScintilla/scintilla/src/LexRuby.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/ContractionState.o: ../../src/wxScintilla/scintilla/src/ContractionState.cxx +$(OBJDIR)/LexPOV.o: ../../src/wxScintilla/scintilla/src/LexPOV.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/CellBuffer.o: ../../src/wxScintilla/scintilla/src/CellBuffer.cxx +$(OBJDIR)/LexConf.o: ../../src/wxScintilla/scintilla/src/LexConf.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/PositionCache.o: ../../src/wxScintilla/scintilla/src/PositionCache.cxx +$(OBJDIR)/LexVB.o: ../../src/wxScintilla/scintilla/src/LexVB.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexEiffel.o: ../../src/wxScintilla/scintilla/src/LexEiffel.cxx +$(OBJDIR)/StyleContext.o: ../../src/wxScintilla/scintilla/src/StyleContext.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPB.o: ../../src/wxScintilla/scintilla/src/LexPB.cxx +$(OBJDIR)/LexKix.o: ../../src/wxScintilla/scintilla/src/LexKix.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexGAP.o: ../../src/wxScintilla/scintilla/src/LexGAP.cxx +$(OBJDIR)/AutoComplete.o: ../../src/wxScintilla/scintilla/src/AutoComplete.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/KeyMap.o: ../../src/wxScintilla/scintilla/src/KeyMap.cxx +$(OBJDIR)/LexLua.o: ../../src/wxScintilla/scintilla/src/LexLua.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexRuby.o: ../../src/wxScintilla/scintilla/src/LexRuby.cxx +$(OBJDIR)/LexTADS3.o: ../../src/wxScintilla/scintilla/src/LexTADS3.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCmake.o: ../../src/wxScintilla/scintilla/src/LexCmake.cxx +$(OBJDIR)/LexCaml.o: ../../src/wxScintilla/scintilla/src/LexCaml.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexRebol.o: ../../src/wxScintilla/scintilla/src/LexRebol.cxx +$(OBJDIR)/LexPS.o: ../../src/wxScintilla/scintilla/src/LexPS.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/UniConversion.o: ../../src/wxScintilla/scintilla/src/UniConversion.cxx +$(OBJDIR)/LexRebol.o: ../../src/wxScintilla/scintilla/src/LexRebol.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/Style.o: ../../src/wxScintilla/scintilla/src/Style.cxx +$(OBJDIR)/LexBash.o: ../../src/wxScintilla/scintilla/src/LexBash.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexBash.o: ../../src/wxScintilla/scintilla/src/LexBash.cxx +$(OBJDIR)/ScintillaBase.o: ../../src/wxScintilla/scintilla/src/ScintillaBase.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/StyleContext.o: ../../src/wxScintilla/scintilla/src/StyleContext.cxx +$(OBJDIR)/LexForth.o: ../../src/wxScintilla/scintilla/src/LexForth.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexAsn1.o: ../../src/wxScintilla/scintilla/src/LexAsn1.cxx +$(OBJDIR)/LexTCL.o: ../../src/wxScintilla/scintilla/src/LexTCL.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexCSS.o: ../../src/wxScintilla/scintilla/src/LexCSS.cxx +$(OBJDIR)/LexAU3.o: ../../src/wxScintilla/scintilla/src/LexAU3.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexSQL.o: ../../src/wxScintilla/scintilla/src/LexSQL.cxx +$(OBJDIR)/Style.o: ../../src/wxScintilla/scintilla/src/Style.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexPLM.o: ../../src/wxScintilla/scintilla/src/LexPLM.cxx +$(OBJDIR)/RESearch.o: ../../src/wxScintilla/scintilla/src/RESearch.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/LexVHDL.o: ../../src/wxScintilla/scintilla/src/LexVHDL.cxx +$(OBJDIR)/LexInno.o: ../../src/wxScintilla/scintilla/src/LexInno.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/Document.o: ../../src/wxScintilla/scintilla/src/Document.cxx +$(OBJDIR)/ExternalLexer.o: ../../src/wxScintilla/scintilla/src/ExternalLexer.cxx -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff -Nru wxformbuilder-3.1.67/src/Makefile wxformbuilder-3.1.68/src/Makefile --- wxformbuilder-3.1.67/src/Makefile 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/Makefile 2010-05-04 19:19:50.000000000 +0100 @@ -39,52 +39,52 @@ endif OBJECTS := \ - $(OBJDIR)/maingui.o \ $(OBJDIR)/splashscreen.o \ - $(OBJDIR)/wxfbipc.o \ - $(OBJDIR)/encodingutils.o \ - $(OBJDIR)/stringutils.o \ - $(OBJDIR)/typeconv.o \ - $(OBJDIR)/annoyingdialog.o \ - $(OBJDIR)/debug.o \ - $(OBJDIR)/types.o \ - $(OBJDIR)/objectbase.o \ - $(OBJDIR)/database.o \ - $(OBJDIR)/xrcfilter.o \ - $(OBJDIR)/stack.o \ - $(OBJDIR)/about.o \ - $(OBJDIR)/customkeys.o \ - $(OBJDIR)/genericpanel.o \ - $(OBJDIR)/palette.o \ + $(OBJDIR)/maingui.o \ + $(OBJDIR)/codewriter.o \ + $(OBJDIR)/codegen.o \ + $(OBJDIR)/xrccg.o \ + $(OBJDIR)/codeparser.o \ + $(OBJDIR)/pythoncg.o \ + $(OBJDIR)/cppcg.o \ + $(OBJDIR)/appdata.o \ $(OBJDIR)/wxfbevent.o \ - $(OBJDIR)/mainframe.o \ - $(OBJDIR)/menueditor.o \ - $(OBJDIR)/title.o \ + $(OBJDIR)/bitmaps.o \ $(OBJDIR)/cmdproc.o \ - $(OBJDIR)/appdata.o \ + $(OBJDIR)/mainframe.o \ + $(OBJDIR)/about.o \ + $(OBJDIR)/palette.o \ $(OBJDIR)/wxfbmanager.o \ - $(OBJDIR)/bitmaps.o \ + $(OBJDIR)/title.o \ + $(OBJDIR)/menueditor.o \ + $(OBJDIR)/customkeys.o \ + $(OBJDIR)/genericpanel.o \ $(OBJDIR)/pythonpanel.o \ - $(OBJDIR)/objecttree.o \ - $(OBJDIR)/codeeditor.o \ - $(OBJDIR)/resizablepanel.o \ - $(OBJDIR)/visualeditor.o \ $(OBJDIR)/visualobj.o \ $(OBJDIR)/innerframe.o \ + $(OBJDIR)/visualeditor.o \ $(OBJDIR)/menubar.o \ + $(OBJDIR)/resizablepanel.o \ + $(OBJDIR)/geninhertclass_gui.o \ + $(OBJDIR)/geninhertclass.o \ + $(OBJDIR)/codeeditor.o \ $(OBJDIR)/xrcpreview.o \ $(OBJDIR)/dataobject.o \ - $(OBJDIR)/geninhertclass.o \ - $(OBJDIR)/geninhertclass_gui.o \ - $(OBJDIR)/cpppanel.o \ + $(OBJDIR)/objecttree.o \ $(OBJDIR)/objinspect.o \ $(OBJDIR)/xrcpanel.o \ - $(OBJDIR)/cppcg.o \ - $(OBJDIR)/codeparser.o \ - $(OBJDIR)/codewriter.o \ - $(OBJDIR)/xrccg.o \ - $(OBJDIR)/pythoncg.o \ - $(OBJDIR)/codegen.o \ + $(OBJDIR)/cpppanel.o \ + $(OBJDIR)/types.o \ + $(OBJDIR)/objectbase.o \ + $(OBJDIR)/xrcfilter.o \ + $(OBJDIR)/database.o \ + $(OBJDIR)/encodingutils.o \ + $(OBJDIR)/typeconv.o \ + $(OBJDIR)/stringutils.o \ + $(OBJDIR)/wxfbipc.o \ + $(OBJDIR)/debug.o \ + $(OBJDIR)/annoyingdialog.o \ + $(OBJDIR)/stack.o \ $(OBJDIR)/md5.o \ MKDIR_TYPE := msdos @@ -127,67 +127,67 @@ -@if exist $(subst /,\,$(OBJDIR)) rmdir /s /q $(subst /,\,$(OBJDIR)) endif -$(OBJDIR)/maingui.o: maingui.cpp +$(OBJDIR)/splashscreen.o: splashscreen.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/splashscreen.o: splashscreen.cpp +$(OBJDIR)/maingui.o: maingui.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/wxfbipc.o: utils/wxfbipc.cpp +$(OBJDIR)/codewriter.o: codegen/codewriter.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/encodingutils.o: utils/encodingutils.cpp +$(OBJDIR)/codegen.o: codegen/codegen.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/stringutils.o: utils/stringutils.cpp +$(OBJDIR)/xrccg.o: codegen/xrccg.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/typeconv.o: utils/typeconv.cpp +$(OBJDIR)/codeparser.o: codegen/codeparser.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/annoyingdialog.o: utils/annoyingdialog.cpp +$(OBJDIR)/pythoncg.o: codegen/pythoncg.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/debug.o: utils/debug.cpp +$(OBJDIR)/cppcg.o: codegen/cppcg.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/types.o: model/types.cpp +$(OBJDIR)/appdata.o: rad/appdata.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/objectbase.o: model/objectbase.cpp +$(OBJDIR)/wxfbevent.o: rad/wxfbevent.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/database.o: model/database.cpp +$(OBJDIR)/bitmaps.o: rad/bitmaps.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/xrcfilter.o: model/xrcfilter.cpp +$(OBJDIR)/cmdproc.o: rad/cmdproc.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/stack.o: dbg_stack_trace/stack.cpp +$(OBJDIR)/mainframe.o: rad/mainframe.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" @@ -197,162 +197,162 @@ @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/customkeys.o: rad/customkeys.cpp +$(OBJDIR)/palette.o: rad/palette.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/genericpanel.o: rad/genericpanel.cpp +$(OBJDIR)/wxfbmanager.o: rad/wxfbmanager.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/palette.o: rad/palette.cpp +$(OBJDIR)/title.o: rad/title.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/wxfbevent.o: rad/wxfbevent.cpp +$(OBJDIR)/menueditor.o: rad/menueditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/mainframe.o: rad/mainframe.cpp +$(OBJDIR)/customkeys.o: rad/customkeys.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/menueditor.o: rad/menueditor.cpp +$(OBJDIR)/genericpanel.o: rad/genericpanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/title.o: rad/title.cpp +$(OBJDIR)/pythonpanel.o: rad/pythonpanel/pythonpanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/cmdproc.o: rad/cmdproc.cpp +$(OBJDIR)/visualobj.o: rad/designer/visualobj.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/appdata.o: rad/appdata.cpp +$(OBJDIR)/innerframe.o: rad/designer/innerframe.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/wxfbmanager.o: rad/wxfbmanager.cpp +$(OBJDIR)/visualeditor.o: rad/designer/visualeditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/bitmaps.o: rad/bitmaps.cpp +$(OBJDIR)/menubar.o: rad/designer/menubar.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/pythonpanel.o: rad/pythonpanel/pythonpanel.cpp +$(OBJDIR)/resizablepanel.o: rad/designer/resizablepanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/objecttree.o: rad/objecttree/objecttree.cpp +$(OBJDIR)/geninhertclass_gui.o: rad/geninheritclass/geninhertclass_gui.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/codeeditor.o: rad/codeeditor/codeeditor.cpp +$(OBJDIR)/geninhertclass.o: rad/geninheritclass/geninhertclass.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/resizablepanel.o: rad/designer/resizablepanel.cpp +$(OBJDIR)/codeeditor.o: rad/codeeditor/codeeditor.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/visualeditor.o: rad/designer/visualeditor.cpp +$(OBJDIR)/xrcpreview.o: rad/xrcpreview/xrcpreview.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/visualobj.o: rad/designer/visualobj.cpp +$(OBJDIR)/dataobject.o: rad/dataobject/dataobject.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/innerframe.o: rad/designer/innerframe.cpp +$(OBJDIR)/objecttree.o: rad/objecttree/objecttree.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/menubar.o: rad/designer/menubar.cpp +$(OBJDIR)/objinspect.o: rad/inspector/objinspect.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/xrcpreview.o: rad/xrcpreview/xrcpreview.cpp +$(OBJDIR)/xrcpanel.o: rad/xrcpanel/xrcpanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/dataobject.o: rad/dataobject/dataobject.cpp +$(OBJDIR)/cpppanel.o: rad/cpppanel/cpppanel.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/geninhertclass.o: rad/geninheritclass/geninhertclass.cpp +$(OBJDIR)/types.o: model/types.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/geninhertclass_gui.o: rad/geninheritclass/geninhertclass_gui.cpp +$(OBJDIR)/objectbase.o: model/objectbase.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/cpppanel.o: rad/cpppanel/cpppanel.cpp +$(OBJDIR)/xrcfilter.o: model/xrcfilter.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/objinspect.o: rad/inspector/objinspect.cpp +$(OBJDIR)/database.o: model/database.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/xrcpanel.o: rad/xrcpanel/xrcpanel.cpp +$(OBJDIR)/encodingutils.o: utils/encodingutils.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/cppcg.o: codegen/cppcg.cpp +$(OBJDIR)/typeconv.o: utils/typeconv.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/codeparser.o: codegen/codeparser.cpp +$(OBJDIR)/stringutils.o: utils/stringutils.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/codewriter.o: codegen/codewriter.cpp +$(OBJDIR)/wxfbipc.o: utils/wxfbipc.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/xrccg.o: codegen/xrccg.cpp +$(OBJDIR)/debug.o: utils/debug.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/pythoncg.o: codegen/pythoncg.cpp +$(OBJDIR)/annoyingdialog.o: utils/annoyingdialog.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" -$(OBJDIR)/codegen.o: codegen/codegen.cpp +$(OBJDIR)/stack.o: dbg_stack_trace/stack.cpp -@$(CMD_MKOBJDIR) @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" diff -Nru wxformbuilder-3.1.67/src/rad/appdata.cpp wxformbuilder-3.1.68/src/rad/appdata.cpp --- wxformbuilder-3.1.67/src/rad/appdata.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/rad/appdata.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -2670,9 +2670,16 @@ THROW_WXFBEX( wxT( "You must save the project when using a relative path for output files" ) ); } - path.SetCwd( projectPath ); - - path.MakeAbsolute(); + path = wxFileName( projectPath + + wxFileName::GetPathSeparator() + + pathEntry + + wxFileName::GetPathSeparator() ); + + path.Normalize(); + + // this approach is probably incorrect if the fb project is located under a symlink + /*path.SetCwd( projectPath ); + path.MakeAbsolute();*/ } } diff -Nru wxformbuilder-3.1.67/src/rad/designer/visualeditor.cpp wxformbuilder-3.1.68/src/rad/designer/visualeditor.cpp --- wxformbuilder-3.1.67/src/rad/designer/visualeditor.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/rad/designer/visualeditor.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -328,6 +328,15 @@ // Create the menubar later menubar = child; } + else if( !toolbar && (m_form->GetObjectTypeName() == wxT("toolbar_form")) ) + { + Generate( m_form, m_back->GetFrameContentPanel(), m_back->GetFrameContentPanel() ); + + ObjectBaseMap::iterator it = m_baseobjects.find( m_form.get() ); + toolbar = wxDynamicCast( it->second, wxToolBar ); + + break; + } else { // Recursively generate the ObjectTree @@ -342,26 +351,19 @@ wxLogError ( ex.what() ); } } - - // Attach the status bar (if any) to the frame - if ( child->GetClassName() == wxT("wxStatusBar") ) - { - ObjectBaseMap::iterator it = m_baseobjects.find( child.get() ); - statusbar = wxDynamicCast( it->second, wxStatusBar ); - } - + // Attach the toolbar (if any) to the frame - if( !toolbar && (m_form->GetObjectTypeName() == wxT("toolbar_form")) ) + if (child->GetClassName() == wxT("wxToolBar") ) { - Generate( m_form, m_back->GetFrameContentPanel(), m_back->GetFrameContentPanel() ); - - ObjectBaseMap::iterator it = m_baseobjects.find( m_form.get() ); + ObjectBaseMap::iterator it = m_baseobjects.find( child.get() ); toolbar = wxDynamicCast( it->second, wxToolBar ); } - else if (child->GetClassName() == wxT("wxToolBar") ) + + // Attach the status bar (if any) to the frame + if ( child->GetClassName() == wxT("wxStatusBar") ) { ObjectBaseMap::iterator it = m_baseobjects.find( child.get() ); - toolbar = wxDynamicCast( it->second, wxToolBar ); + statusbar = wxDynamicCast( it->second, wxStatusBar ); } } @@ -463,7 +465,7 @@ // New wxparent for the window's children wxWindow* new_wxparent = ( createdWindow ? createdWindow : wxparent ); - + // Recursively generate the children for ( unsigned int i = 0; i < obj->GetChildCount(); i++ ) { @@ -741,7 +743,7 @@ nextObj = nextObj->GetParent(); } - m_back->SetSelectedSizer( sizer ); + m_back->SetSelectedSizer( sizer ); m_back->SetSelectedItem( item ); m_back->SetSelectedObject( obj ); m_back->SetSelectedPanel( selPanel ); @@ -1068,14 +1070,14 @@ HighlightSelection( dc ); }*/ - wxWindow *aux = m_window; - while (!aux->IsKindOf(CLASSINFO(DesignerWindow))) aux = aux->GetParent(); - DesignerWindow *dsgnWin = (DesignerWindow*) aux; - if (dsgnWin->GetActivePanel() == m_window) - { - wxPaintDC dc(m_window); - dsgnWin->HighlightSelection(dc); - } + wxWindow *aux = m_window; + while (!aux->IsKindOf(CLASSINFO(DesignerWindow))) aux = aux->GetParent(); + DesignerWindow *dsgnWin = (DesignerWindow*) aux; + if (dsgnWin->GetActivePanel() == m_window) + { + wxPaintDC dc(m_window); + dsgnWin->HighlightSelection(dc); + } event.Skip(); } diff -Nru wxformbuilder-3.1.67/src/rad/inspector/objinspect.cpp wxformbuilder-3.1.68/src/rad/inspector/objinspect.cpp --- wxformbuilder-3.1.67/src/rad/inspector/objinspect.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/rad/inspector/objinspect.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////// // // wxFormBuilder - A Visual Dialog Editor for wxWidgets. -// Copyright (C) 2005 Jos Antonio Hurtado +// Copyright (C) 2005 José Antonio Hurtado // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -18,7 +18,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // // Written by -// Jos Antonio Hurtado - joseantonio.hurtado@gmail.com +// José Antonio Hurtado - joseantonio.hurtado@gmail.com // Juan Antonio Ortega - jortegalalmolda@gmail.com // /////////////////////////////////////////////////////////////////////////////// @@ -1354,7 +1354,7 @@ } wxPGId pgid = m_pg->GetPropertyByLabel(prop->GetName()); - if (!pgid.IsOk()) return; // Puede que no se est mostrando ahora esa pgina + if (!pgid.IsOk()) return; // Puede que no se esté mostrando ahora esa página wxPGProperty *pgProp = pgid.GetPropertyPtr(); switch (prop->GetType()) @@ -1490,9 +1490,13 @@ void ObjectInspector::OnPropertyGridDblClick(wxPropertyGridEvent& event) { - wxString propName = event.GetPropertyPtr()->GetLabel(); - AutoGenerateId(AppData()->GetSelectedObject(), AppData()->GetSelectedObject()->GetProperty(propName), wxT("DblClk")); - m_pg->Refresh(); + PObjectBase obj = AppData()->GetSelectedObject(); + if( obj ) + { + wxString propName = event.GetPropertyPtr()->GetLabel(); + AutoGenerateId(obj, obj->GetProperty(propName), wxT("DblClk")); + m_pg->Refresh(); + } } void ObjectInspector::OnEventGridDblClick(wxPropertyGridEvent& event) @@ -1515,7 +1519,7 @@ void ObjectInspector::AutoGenerateId(PObjectBase objectChanged, PProperty propChanged, wxString reason) { - if(objectChanged) + if(objectChanged && propChanged) { PProperty prop; if((propChanged->GetName() == wxT("name") && reason == wxT("PropChange")) || @@ -1525,7 +1529,6 @@ prop = AppData()->GetProjectData()->GetProperty( wxT("event_generation") ); if ( prop ) { - if(prop->GetValueAsString() == wxT("table")) { prop = objectChanged->GetProperty(wxT("id")); diff -Nru wxformbuilder-3.1.67/src/rad/mainframe.cpp wxformbuilder-3.1.68/src/rad/mainframe.cpp --- wxformbuilder-3.1.67/src/rad/mainframe.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/rad/mainframe.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -230,7 +230,7 @@ SetTitle( wxT( "wxFormBuilder" ) ); - SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); + //SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) ); SetMenuBar( CreateFBMenuBar() ); CreateStatusBar( 3 ); @@ -939,7 +939,7 @@ file = fn.GetName(); } - SetTitle( wxString::Format( wxT("%s%s - wxFormBuilder v3.1 - Beta"), AppData()->IsModified() ? wxT("*") : wxT(""), file.c_str() ) ); + SetTitle( wxString::Format( wxT("%s%s - wxFormBuilder v3.1 - RC1"), AppData()->IsModified() ? wxT("*") : wxT(""), file.c_str() ) ); GetStatusBar()->SetStatusText( filename, STATUS_FIELD_PATH ); // Enable/Disable toolbar and menu entries @@ -1395,11 +1395,19 @@ void MainFrame::OnFind( wxFindDialogEvent& event ) { - for ( int page = 0; page < m_notebook->GetPageCount(); ++page ) + /*for ( int page = 0; page < m_notebook->GetPageCount(); ++page ) { event.StopPropagation(); event.SetClientData( m_findDialog ); m_notebook->GetPage( page )->GetEventHandler()->ProcessEvent( event ); + }*/ + + wxWindow *page = m_notebook->GetCurrentPage(); + if( page ) + { + event.StopPropagation(); + event.SetClientData( m_findDialog ); + page->GetEventHandler()->ProcessEvent( event ); } } @@ -1550,7 +1558,7 @@ // que no responde ante los eventos de la aplicación m_palette = new wxFbPalette( parent, -1 ); m_palette->Create(); - m_palette->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); + //m_palette->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); return m_palette; } diff -Nru wxformbuilder-3.1.67/src/rad/objecttree/objecttree.cpp wxformbuilder-3.1.68/src/rad/objecttree/objecttree.cpp --- wxformbuilder-3.1.67/src/rad/objecttree/objecttree.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/rad/objecttree/objecttree.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -269,7 +269,25 @@ if (is_root) new_parent = m_tcObjects->AddRoot(wxT(""),-1,-1,item_data); else - new_parent = m_tcObjects->AppendItem(parent,wxT(""),-1,-1,item_data); + { + unsigned int pos = 0; + + PObjectBase parent_obj = obj->GetParent(); + // find a proper position where the added object should be displayed at + if( parent_obj->GetObjectInfo()->GetObjectType()->IsItem() ) + { + parent_obj = parent_obj->GetParent(); + pos = parent_obj->GetChildPosition( obj->GetParent() ); + } + else + pos = parent_obj->GetChildPosition( obj ); + + // insert tree item to proper position + if( pos > 0 ) + new_parent = m_tcObjects->InsertItem(parent, pos, wxT(""), -1, -1, item_data); + else + new_parent = m_tcObjects->AppendItem(parent,wxT(""),-1,-1,item_data); + } // Add the item to the map m_map.insert( ObjectItemMap::value_type( obj, new_parent ) ); diff -Nru wxformbuilder-3.1.67/src/rad/palette.cpp wxformbuilder-3.1.68/src/rad/palette.cpp --- wxformbuilder-3.1.67/src/rad/palette.cpp 2010-02-19 00:27:02.000000000 +0000 +++ wxformbuilder-3.1.68/src/rad/palette.cpp 2010-05-04 19:19:50.000000000 +0100 @@ -131,20 +131,20 @@ wxString pkg_name = pkg->GetPackageName(); wxPanel *panel = new wxPanel( m_notebook, -1 ); - panel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); + //panel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); wxBoxSizer *sizer = new wxBoxSizer( wxHORIZONTAL ); wxPanel *tbPanel = new wxPanel( panel, -1 ); - tbPanel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); + //tbPanel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); wxBoxSizer *tbSizer = new wxBoxSizer( wxHORIZONTAL ); wxPanel *sbPanel = new wxPanel( panel, -1 ); - sbPanel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); + //sbPanel->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); wxBoxSizer *sbSizer = new wxBoxSizer( wxHORIZONTAL ); wxToolBar *toolbar = new wxToolBar( tbPanel, -1, wxDefaultPosition, wxDefaultSize, wxTB_NODIVIDER | wxTB_FLAT ); toolbar->SetToolBitmapSize( wxSize( 22, 22 ) ); - toolbar->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); + //toolbar->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DFACE ) ); PopulateToolbar( pkg, toolbar ); m_tv.push_back( toolbar );