Permalink
Browse files

11/14/2011 Version 3.03.00 (Beta)

* Fixed improper placement of a comma at the end of the C/C++ enum list - Andrea Zanellato.
+ Added support for wxWizard - Andrea Zanellato.
+ Added support for PHP code generation - JGM.
  • Loading branch information...
1 parent e06f796 commit 967907981a5c2710ffadc41e242f99075282a170 michalbliznak committed Nov 14, 2011
Showing with 9,456 additions and 658 deletions.
  1. +42 −0 build/premake/plugin-interface.lua
  2. +40 −0 build/premake/plugins/additional.lua
  3. +35 −0 build/premake/plugins/common.lua
  4. +35 −0 build/premake/plugins/containers.lua
  5. +36 −0 build/premake/plugins/forms.lua
  6. +35 −0 build/premake/plugins/layout.lua
  7. +57 −0 build/premake/plugins/wxadditions-mini.lua
  8. +70 −0 build/premake/solution.lua
  9. +30 −0 build/premake/ticpp.lua
  10. +57 −0 build/premake/utilities.lua
  11. +35 −0 build/premake/wxflatnotebook.lua
  12. +82 −0 build/premake/wxformbuilder.lua
  13. +35 −0 build/premake/wxpropgrid.lua
  14. +48 −0 build/premake/wxscintilla.lua
  15. +246 −0 build/premake/wxwidgets.lua
  16. +89 −0 create_build_files4.bat
  17. +81 −0 create_build_files4.sh
  18. +1 −1 install/windows/wxFormBuilder.iss
  19. +72 −67 output/Changelog.txt
  20. +358 −0 output/plugins/additional/xml/additional.phpcode
  21. +263 −0 output/plugins/common/xml/common.phpcode
  22. +0 −176 output/plugins/common/xml/forms.xml
  23. +311 −0 output/plugins/common/xml/menutoolbar.phpcode
  24. +207 −0 output/plugins/containers/xml/containers.phpcode
  25. 0 output/plugins/{common → forms}/icons/dialog.xpm
  26. 0 output/plugins/{common → forms}/icons/doc_mdi_parent_frame.xpm
  27. 0 output/plugins/{common → forms}/icons/doc_parent_frame.xpm
  28. 0 output/plugins/{common → forms}/icons/document.xpm
  29. 0 output/plugins/{common → forms}/icons/frame.xpm
  30. BIN output/plugins/{common → forms}/icons/frame16x16.png
  31. +80 −0 output/plugins/forms/icons/menubar.xpm
  32. 0 output/plugins/{common → forms}/icons/panel.xpm
  33. +91 −0 output/plugins/forms/icons/toolbar.xpm
  34. +266 −0 output/plugins/forms/icons/wizard.xpm
  35. +78 −0 output/plugins/forms/icons/wizpage.xpm
  36. +142 −0 output/plugins/{common → forms}/xml/forms.cppcode
  37. +670 −0 output/plugins/forms/xml/forms.phpcode
  38. +141 −0 output/plugins/{common → forms}/xml/forms.pythoncode
  39. +224 −0 output/plugins/forms/xml/forms.xml
  40. +173 −0 output/plugins/layout/xml/layout.phpcode
  41. +2 −1 output/resources/about.html
  42. BIN output/resources/icons/php.png
  43. BIN output/resources/icons/python.png
  44. +186 −0 output/xml/default.phpcode
  45. +9 −0 output/xml/default.xml
  46. +2 −0 output/xml/icons.xml
  47. +11 −0 output/xml/objtypes.xml
  48. +4 −0 output/xml/properties.phpcode
  49. +4 −0 plugins/additional/additional.cpp
  50. +0 −276 plugins/common/common.cpp
  51. +4 −2 plugins/containers/containers.cpp
  52. +471 −0 plugins/forms/forms.cpp
  53. +238 −0 plugins/forms/premake.lua
  54. +1 −0 plugins/premake.lua
  55. +14 −8 plugins/wxAdditions/wxAdditions_mini.cpp
  56. +1 −0 premake.lua
  57. +296 −0 sdk/plugin_interface/forms/wizard.cpp
  58. +813 −0 sdk/plugin_interface/forms/wizard.fbp
  59. +174 −0 sdk/plugin_interface/forms/wizard.h
  60. +1 −1 sdk/plugin_interface/premake.lua
  61. +2 −1 src/codegen/codegen.cpp
  62. +13 −1 src/codegen/codewriter.cpp
  63. +18 −4 src/codegen/codewriter.h
  64. +51 −20 src/codegen/cppcg.cpp
  65. +1,574 −0 src/codegen/phpcg.cpp
  66. +243 −0 src/codegen/phpcg.h
  67. +42 −12 src/codegen/pythoncg.cpp
  68. +7 −0 src/maingui.cpp
  69. +48 −7 src/model/database.cpp
  70. +5 −0 src/model/objectbase.cpp
  71. +6 −2 src/rad/about.cpp
  72. +31 −2 src/rad/appdata.cpp
  73. +69 −2 src/rad/codeeditor/codeeditor.cpp
  74. +17 −2 src/rad/codeeditor/codeeditor.h
  75. +34 −2 src/rad/cpppanel/cpppanel.cpp
  76. +10 −1 src/rad/cpppanel/cpppanel.h
  77. +16 −1 src/rad/customkeys.cpp
  78. +10 −3 src/rad/designer/innerframe.cpp
  79. +120 −6 src/rad/designer/visualeditor.cpp
  80. +8 −1 src/rad/designer/visualeditor.h
  81. +3 −3 src/rad/designer/visualobj.cpp
  82. +2 −2 src/rad/geninheritclass/geninhertclass_gui.cpp
  83. +31 −16 src/rad/inspector/objinspect.cpp
  84. +20 −1 src/rad/inspector/wxfbadvprops.cpp
  85. +11 −2 src/rad/inspector/wxfbadvprops.h
  86. +71 −19 src/rad/mainframe.cpp
  87. +2 −0 src/rad/mainframe.h
  88. +9 −1 src/rad/palette.cpp
  89. +390 −0 src/rad/phppanel/phppanel.cpp
  90. +89 −0 src/rad/phppanel/phppanel.h
  91. +33 −3 src/rad/pythonpanel/pythonpanel.cpp
  92. +10 −2 src/rad/pythonpanel/pythonpanel.h
  93. +24 −4 src/rad/xrcpanel/xrcpanel.cpp
  94. +10 −2 src/rad/xrcpanel/xrcpanel.h
  95. +28 −0 src/rad/xrcpreview/xrcpreview.cpp
  96. +7 −1 src/utils/stringutils.cpp
  97. +12 −2 src/utils/typeconv.cpp
  98. +12 −1 src/utils/wxfbipc.cpp
  99. +2 −0 src/utils/wxfbipc.h
  100. +5 −0 wizard_TODO.txt
@@ -0,0 +1,42 @@
+-----------------------------------------------------------------------------
+-- Name: plugin_interface.lua
+-- Purpose: Plugin Interface library project script.
+-- Author: Andrea Zanellato zanellato.andrea@gmail.com
+-- Modified by:
+-- Created: 2011/10/20
+-- Copyright: (c) wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "plugin-interface"
+ kind "StaticLib"
+ files
+ {
+ "../../sdk/plugin_interface/**.h",
+ "../../sdk/plugin_interface/**.cpp",
+ "../../sdk/plugin_interface/**.fbp"
+ }
+ includedirs {"../../sdk/tinyxml"}
+ libdirs {"../../sdk/lib"}
+ targetdir "../../sdk/lib/"
+ flags {"ExtraWarnings"}
+ defines {"TIXML_USE_TICPP"}
+ links {"TiCPP"}
+ targetsuffix ( "-" .. wxVersion )
+
+configuration "not windows"
+ buildoptions {"-fPIC"}
+
+ -- Visual C++ 2005/2008
+configuration "vs*"
+ defines {"_CRT_SECURE_NO_DEPRECATE"}
+
+configuration "Debug"
+ targetname ( CustomPrefix .. wxDebugSuffix .. "_plugin-interface" )
+ wx_config { Debug="yes" }
+
+configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ targetname ( CustomPrefix .. "_plugin-interface" )
+ wx_config {}
+
+
@@ -0,0 +1,40 @@
+-----------------------------------------------------------------------------
+-- Name: additional.lua
+-- Purpose: Additional controls plugin project build script.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 21/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "additional-components-plugin"
+ kind "SharedLib"
+ targetname "additional"
+ files {"../../../plugins/additional/additional.cpp"}
+ includedirs
+ {
+ "../../../sdk/tinyxml", "../../../sdk/plugin_interface"
+ }
+ defines {"BUILD_DLL", "TIXML_USE_TICPP"}
+ flags {"ExtraWarnings"}
+ links {"plugin-interface", "TiCPP"}
+
+ local libs = ""
+if wxUseMediaCtrl then
+ defines {"USE_MEDIACTRL"}
+ libs = "media"
+end
+ configuration "not windows"
+ targetdir "../../../output/lib/wxformbuilder"
+
+ configuration "windows"
+ targetprefix "lib"
+ targetdir "../../../output/plugins/additional"
+
+ configuration "Debug"
+ targetsuffix ( DebugSuffix )
+ wx_config { Libs=libs, Debug="yes" }
+
+ configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ wx_config { Libs=libs }
@@ -0,0 +1,35 @@
+-----------------------------------------------------------------------------
+-- Name: common.lua
+-- Purpose: Common controls plugin project build script.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 21/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "common-components-plugin"
+ kind "SharedLib"
+ targetname "common"
+ files {"../../../plugins/common/common.cpp"}
+ includedirs
+ {
+ "../../../sdk/tinyxml", "../../../sdk/plugin_interface"
+ }
+ defines {"BUILD_DLL", "TIXML_USE_TICPP"}
+ flags {"ExtraWarnings"}
+ links {"plugin-interface", "TiCPP"}
+
+ configuration "not windows"
+ targetdir "../../../output/lib/wxformbuilder"
+
+ configuration "windows"
+ targetprefix "lib"
+ targetdir "../../../output/plugins/common"
+
+ configuration "Debug"
+ targetsuffix ( DebugSuffix )
+ wx_config { Debug="yes" }
+
+ configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ wx_config {}
@@ -0,0 +1,35 @@
+-----------------------------------------------------------------------------
+-- Name: containers.lua
+-- Purpose: Container controls plugin project build script.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 21/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "containers-components-plugin"
+ kind "SharedLib"
+ targetname "containers"
+ files {"../../../plugins/containers/containers.cpp"}
+ includedirs
+ {
+ "../../../sdk/tinyxml", "../../../sdk/plugin_interface"
+ }
+ defines {"BUILD_DLL", "TIXML_USE_TICPP"}
+ flags {"ExtraWarnings"}
+ links {"plugin-interface", "TiCPP"}
+
+ configuration "not windows"
+ targetdir "../../../output/lib/wxformbuilder"
+
+ configuration "windows"
+ targetprefix "lib"
+ targetdir "../../../output/plugins/containers"
+
+ configuration "Debug"
+ targetsuffix ( DebugSuffix )
+ wx_config { Debug="yes" }
+
+ configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ wx_config {}
@@ -0,0 +1,36 @@
+-----------------------------------------------------------------------------
+-- Name: forms.lua
+-- Purpose: Form controls plugin project build script.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 22/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "forms-components-plugin"
+ kind "SharedLib"
+ targetname "forms"
+ files {"../../../plugins/forms/forms.cpp"}
+ includedirs
+ {
+ "../../../sdk/tinyxml", "../../../sdk/plugin_interface"
+ }
+ defines {"BUILD_DLL", "TIXML_USE_TICPP"}
+ flags {"ExtraWarnings"}
+ links {"plugin-interface", "TiCPP"}
+
+ configuration "not windows"
+ targetdir "../../../output/lib/wxformbuilder"
+
+ configuration "windows"
+ targetprefix "lib"
+ targetdir "../../../output/plugins/layout"
+
+ configuration "Debug"
+ targetsuffix ( DebugSuffix )
+ wx_config { Debug="yes" }
+
+ configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ wx_config {}
+
@@ -0,0 +1,35 @@
+-----------------------------------------------------------------------------
+-- Name: layout.lua
+-- Purpose: Layout controls plugin project build script.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 21/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "layout-components-plugin"
+ kind "SharedLib"
+ targetname "layout"
+ files {"../../../plugins/layout/layout.cpp"}
+ includedirs
+ {
+ "../../../sdk/tinyxml", "../../../sdk/plugin_interface"
+ }
+ defines {"BUILD_DLL", "TIXML_USE_TICPP"}
+ flags {"ExtraWarnings"}
+ links {"plugin-interface", "TiCPP"}
+
+ configuration "not windows"
+ targetdir "../../../output/lib/wxformbuilder"
+
+ configuration "windows"
+ targetprefix "lib"
+ targetdir "../../../output/plugins/layout"
+
+ configuration "Debug"
+ targetsuffix ( DebugSuffix )
+ wx_config { Debug="yes" }
+
+ configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ wx_config {}
@@ -0,0 +1,57 @@
+-----------------------------------------------------------------------------
+-- Name: wxadditions-mini.lua
+-- Purpose: wxAdditions mini plugin project build script.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 21/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "wxadditions-mini-plugin"
+ kind "SharedLib"
+ targetname "wxadditions-mini"
+ files
+ {
+ "../../../plugins/wxAdditions/wxAdditions_mini.cpp"
+ }
+ includedirs
+ {
+ "../../../src/controls/include",
+ "../../../sdk/tinyxml", "../../../sdk/plugin_interface"
+ }
+ defines {"BUILD_DLL", "TIXML_USE_TICPP"}
+ flags {"ExtraWarnings"}
+ links {"plugin-interface", "TiCPP", "wxFlatNotebook"}
+
+if wxVersion < "2.9" then
+ defines {"SCI_NAMESPACE", "__WX__"}
+ links {"wxPropertyGrid", "wxScintilla"}
+else
+ excludes
+ {
+ "../../../src/controls/include/wx/propgrid/**.h",
+ "../../../src/controls/include/wx/wxScintilla/**.h",
+ "../../../src/controls/src/propgrid/**.cpp",
+ "../../../src/controls/src/wxScintilla/**.cpp"
+ }
+end
+ configuration {"codelite", "not windows"}
+ linkoptions {"-Wl,-rpath,$$``ORIGIN"}
+
+ configuration {"codeblocks", "not windows"}
+ linkoptions {"-Wl,-rpath,$``ORIGIN"}
+
+ configuration "not windows"
+ targetdir "../../../output/lib/wxformbuilder"
+
+ configuration "windows"
+ targetprefix "lib"
+ targetdir "../../../output/plugins/wxAdditions"
+
+ configuration "Debug"
+ targetsuffix ( DebugSuffix )
+ wx_config { Debug="yes" }
+
+ configuration "Release"
+ buildoptions {"-fno-strict-aliasing"}
+ wx_config {}
@@ -0,0 +1,70 @@
+-----------------------------------------------------------------------------
+-- Name: solution.lua
+-- Purpose: Generic Premake 4 solution defining common configurations
+-- for all projects it contains.
+-- Author: Andrea Zanellato
+-- Modified by:
+-- Created: 19/10/2011
+-- Copyright: (c) 2011 wxFormBuilder Team
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+solution "wxFormBuilder-Solution"
+ language "C++"
+ configurations {"Debug", "Release"}
+
+ local scriptDir = os.getcwd()
+
+ dofile( scriptDir .. "/wxwidgets.lua" )
+
+ local wxver = string.gsub( wxVersion, '%.', '' )
+ location ( "../../build/" .. wxVersion .. "/" .. _ACTION )
+ BuildDir = solution().location
+ CustomPrefix = "wxfb_" .. wxTarget .. wxUnicodeSign
+
+if wxVersion < "2.9" then
+ DebugSuffix = "d-" .. wxver
+else
+ DebugSuffix = "-" .. wxver
+end
+ os.chdir( BuildDir )
+
+--if wxCompiler == "gcc" and os.is("windows") then
+-- flags {"NoImportLib"}
+--end
+
+if wxUseUnicode then
+ flags {"Unicode"}
+ defines {"UNICODE", "_UNICODE"}
+end
+ configuration "windows"
+ defines {"WIN32", "_WINDOWS"}
+
+ configuration "Debug"
+ defines {"DEBUG", "_DEBUG"}
+ flags {"Symbols"}
+
+ if wxCompiler == "gcc" then
+ buildoptions {"-O0"}
+ end
+
+ configuration "Release"
+ defines {"NDEBUG"}
+ flags {"OptimizeSpeed"}
+
+ dofile( scriptDir .. "/ticpp.lua" )
+ dofile( scriptDir .. "/plugin-interface.lua" )
+ dofile( scriptDir .. "/wxflatnotebook.lua" )
+
+if wxVersion < "2.9" then
+ dofile( scriptDir .. "/wxpropgrid.lua" )
+ dofile( scriptDir .. "/wxscintilla.lua" )
+end
+ dofile( scriptDir .. "/plugins/additional.lua" )
+ dofile( scriptDir .. "/plugins/common.lua" )
+ dofile( scriptDir .. "/plugins/containers.lua" )
+ dofile( scriptDir .. "/plugins/forms.lua" )
+ dofile( scriptDir .. "/plugins/layout.lua" )
+ dofile( scriptDir .. "/plugins/wxadditions-mini.lua" )
+ dofile( scriptDir .. "/wxformbuilder.lua" )
+ dofile( scriptDir .. "/utilities.lua" )
+
@@ -0,0 +1,30 @@
+-----------------------------------------------------------------------------
+-- Name: ticpp.lua
+-- Purpose: TinyXML project script.
+-- Author: RJP Computing <rjpcomputing@gmail.com>
+-- Modified by: Andrea Zanellato zanellato.andrea@gmail.com
+-- Created: 2008/21/01
+-- Copyright: (c) 2009 RJP Computing
+-- Licence: GNU General Public License Version 2
+-----------------------------------------------------------------------------
+project "TiCPP"
+ kind "StaticLib"
+ targetname "ticpp"
+ targetdir "../../sdk/lib"
+ files {"../../sdk/tinyxml/*.cpp", "../../sdk/tinyxml/*.h"}
+ excludes {"xmltest.cpp"}
+ defines {"TIXML_USE_TICPP"}
+
+ configuration "not windows"
+ buildoptions {"-fPIC"}
+
+ configuration "vs*"
+ defines {"_CRT_SECURE_NO_DEPRECATE"}
+
+ configuration "vs2008 or vs2010"
+ -- multi-process building
+ flags ("NoMinimalRebuild")
+ buildoptions ("/MP")
+
+ configuration "Debug"
+ targetsuffix "d"
Oops, something went wrong.

0 comments on commit 9679079

Please sign in to comment.