Skip to content

Commit

Permalink
Update wxLua to 3.0.0.6 + compilation patch.
Browse files Browse the repository at this point in the history
Now using the fork at https://github.com/pkulchenko/wxlua as the primary
project has not issued a release in nearly 7 years. The fork has made
many updates, including:

* Better compatibility with newer versions of wxWidgets
* Fixed platform inconsistencies with bit library, which led to
  incorrect md5 calculations on Mac (see mrichards42#61, pkulchenko/wxlua#43). The
  md5 sums have been renegerated and are now correct on all platforms.

To fix builds with wxWidgets < 3.1.2, we also include the fix for
pkulchenko/wxlua#46.

Generated with:

$ rsync -r --delete \
    --exclude="premake4.lua" \
    --exclude="wxluasetup_xword.h" \
    --exclude="Makefile*" \
    --exclude="CMakeLists.txt" \
    wxlua-3.0.0.6/wxLua/modules/wxbind \
    wxlua-3.0.0.6/wxLua/modules/wxlua \
    xword/lua/
$ rsync -r --delete \
    wxlua-3.0.0.6/wxLua/art \
    xword/lua/wxlua/
$ cp wxlua-3.0.0.6/wxLua/bindings/genwxbind.lua xword/src/xwordbind/

Along with manual edits to wxluasetup_xword.h to sync with the latest
set of config options in wxluasetup.h (i.e. disable new entries).

Regenerated bindings in src/xwordbind/.

Disabled webview in src/xwordlua.hpp and replaced obsolete reference to
wxBG_STYLE_CUSTOM in sizedtext.lua.
  • Loading branch information
jpd236 committed Nov 25, 2019
1 parent 40d9623 commit 499f7b2
Show file tree
Hide file tree
Showing 82 changed files with 47,424 additions and 13,678 deletions.
20 changes: 10 additions & 10 deletions lua/wxbind/include/wxadv_bind.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
// Check if the version of binding generator used to create this is older than
// the current version of the bindings.
// See 'bindings/genwxbind.lua' and 'modules/wxlua/wxldefs.h'
#if WXLUA_BINDING_VERSION > 30
#if WXLUA_BINDING_VERSION > 35
# error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
#endif //WXLUA_BINDING_VERSION > 30
#endif //WXLUA_BINDING_VERSION > 35
// ---------------------------------------------------------------------------

// binding class
Expand All @@ -43,13 +43,13 @@ extern WXDLLIMPEXP_BINDWXADV wxLuaBinding* wxLuaBinding_wxadv_init();
// Includes
// ---------------------------------------------------------------------------

#if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
#if (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)
#include "wx/wave.h"
#endif // (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
#endif // (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)

#if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
#if (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave)
#include "wx/sound.h"
#endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
#endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave)

#if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
#include "wx/animate.h"
Expand Down Expand Up @@ -106,13 +106,13 @@ extern WXDLLIMPEXP_BINDWXADV wxLuaBinding* wxLuaBinding_wxadv_init();
// Lua Tag Method Values and Tables for each Class
// ---------------------------------------------------------------------------

#if (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
#if (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)
extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxWave;
#endif // (wxLUA_USE_wxWave) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE)
#endif // (defined(__WXMSW__) && !wxCHECK_VERSION(2,6,0) && wxUSE_WAVE) && (wxLUA_USE_wxWave)

#if (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
#if (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave)
extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxSound;
#endif // (wxLUA_USE_wxWave) && (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND)
#endif // (wxCHECK_VERSION(2,6,0) && wxUSE_SOUND) && (wxLUA_USE_wxWave)

#if wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL
extern WXDLLIMPEXP_DATA_BINDWXADV(int) wxluatype_wxAnimation;
Expand Down
5 changes: 3 additions & 2 deletions lua/wxbind/include/wxaui_bind.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
// Check if the version of binding generator used to create this is older than
// the current version of the bindings.
// See 'bindings/genwxbind.lua' and 'modules/wxlua/wxldefs.h'
#if WXLUA_BINDING_VERSION > 30
#if WXLUA_BINDING_VERSION > 35
# error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
#endif //WXLUA_BINDING_VERSION > 30
#endif //WXLUA_BINDING_VERSION > 35
// ---------------------------------------------------------------------------

// binding class
Expand Down Expand Up @@ -59,6 +59,7 @@ extern WXDLLIMPEXP_BINDWXAUI wxLuaBinding* wxLuaBinding_wxaui_init();
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockInfo;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiDockUIPart;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiFloatingFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiGenericTabArt;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIChildFrame;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIClientWindow;
extern WXDLLIMPEXP_DATA_BINDWXAUI(int) wxluatype_wxAuiMDIParentFrame;
Expand Down
36 changes: 22 additions & 14 deletions lua/wxbind/include/wxbase_bind.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ extern WXDLLIMPEXP_BINDWXBASE wxDateTime::TimeZone wxLua_wxDateTime_TimeZone_Loc
// Check if the version of binding generator used to create this is older than
// the current version of the bindings.
// See 'bindings/genwxbind.lua' and 'modules/wxlua/wxldefs.h'
#if WXLUA_BINDING_VERSION > 30
#if WXLUA_BINDING_VERSION > 35
# error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
#endif //WXLUA_BINDING_VERSION > 30
#endif //WXLUA_BINDING_VERSION > 35
// ---------------------------------------------------------------------------

// binding class
Expand All @@ -59,15 +59,15 @@ extern WXDLLIMPEXP_BINDWXBASE wxLuaBinding* wxLuaBinding_wxbase_init();
// Includes
// ---------------------------------------------------------------------------

#if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
#if (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) && (wxUSE_STREAMS)
#include "wx/fs_inet.h"
#endif // (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) && (wxUSE_STREAMS)

#if (wxUSE_FILESYSTEM) && (wxUSE_STREAMS)
#include "wx/filesys.h"
#include "wx/fs_arc.h"
#include "wx/fs_filter.h"
#endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)

#if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
#include "wx/fs_inet.h"
#endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
#endif // (wxUSE_FILESYSTEM) && (wxUSE_STREAMS)

#include "sys/stat.h"
#include "wx/dynlib.h"
Expand Down Expand Up @@ -183,25 +183,27 @@ extern WXDLLIMPEXP_BINDWXBASE wxLuaBinding* wxLuaBinding_wxbase_init();
// Lua Tag Method Values and Tables for each Class
// ---------------------------------------------------------------------------

#if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
#if (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) && (wxUSE_STREAMS)
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxInternetFSHandler;
#endif // (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS) && (wxUSE_STREAMS)

#if (wxUSE_FILESYSTEM) && (wxUSE_STREAMS)
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArchiveFSHandler;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFSFile;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileSystem;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileSystemHandler;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFilterFSHandler;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxLocalFSHandler;
#endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)

#if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxInternetFSHandler;
#endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM) && (wxUSE_FS_INET && wxUSE_SOCKETS)
#endif // (wxUSE_FILESYSTEM) && (wxUSE_STREAMS)

extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientData;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxClientDataContainer;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibrary;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibraryDetails;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxDynamicLibraryDetailsArray;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxEvent;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxEventFilter;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxEventLoopBase;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxEvtHandler;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileType;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxFileType_MessageParameters;
Expand All @@ -223,6 +225,10 @@ extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStringTokenizer;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxString_iterator;
#endif // wxCHECK_VERSION(2,9,0)

#if wxCHECK_VERSION(2,9,2)
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxVersionInfo;
#endif // wxCHECK_VERSION(2,9,2)

#if wxLUA_USE_wxArrayInt
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxArrayInt;
#endif // wxLUA_USE_wxArrayInt
Expand Down Expand Up @@ -342,6 +348,8 @@ extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStringTokenizer;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxMemoryInputStream;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxOutputStream;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxStreamBase;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxTextInputStream;
extern WXDLLIMPEXP_DATA_BINDWXBASE(int) wxluatype_wxTextOutputStream;
#endif // wxUSE_STREAMS


Expand Down
34 changes: 34 additions & 0 deletions lua/wxbind/include/wxbinddefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#define WXMAKINGDLL_WXBINDPROPGRID
#define WXMAKINGDLL_WXBINDRICHTEXT
#define WXMAKINGDLL_WXBINDSTC
#define WXMAKINGDLL_WXBINDWEBVIEW
#define WXMAKINGDLL_WXBINDXML
#define WXMAKINGDLL_WXBINDXRC
#endif // WXMAKINGDLL_WXBIND
Expand Down Expand Up @@ -256,6 +257,26 @@

// --------------------------------------------------------------------------

#if defined(WXMAKINGDLL_BINDWXWEBVIEW) || defined(WXMAKINGDLL_WXBINDWEBVIEW)
#define WXDLLIMPEXP_BINDWXWEBVIEW WXEXPORT
#define WXDLLIMPEXP_DATA_BINDWXWEBVIEW(type) WXEXPORT type
#elif defined(WXUSINGDLL)
#define WXDLLIMPEXP_BINDWXWEBVIEW WXIMPORT
#define WXDLLIMPEXP_DATA_BINDWXWEBVIEW(type) WXIMPORT type
#else // not making nor using DLL
#define WXDLLIMPEXP_BINDWXWEBVIEW
#define WXDLLIMPEXP_DATA_BINDWXWEBVIEW(type) type
#endif

// Forward declare classes with this macro
#if defined(HAVE_VISIBILITY) || (defined(__WINDOWS__) && defined(__GNUC__))
#define WXDLLIMPEXP_FWD_BINDWXWEBVIEW
#else
#define WXDLLIMPEXP_FWD_BINDWXWEBVIEW WXDLLIMPEXP_BINDWXWEBVIEW
#endif

// --------------------------------------------------------------------------

#if defined(WXMAKINGDLL_BINDWXXML) || defined(WXMAKINGDLL_WXBINDXML)
#define WXDLLIMPEXP_BINDWXXML WXEXPORT
#define WXDLLIMPEXP_DATA_BINDWXXML(type) WXEXPORT type
Expand Down Expand Up @@ -369,6 +390,9 @@
#ifndef wxLUA_USEBINDING_WXSTC
#define wxLUA_USEBINDING_WXSTC 1
#endif
#ifndef wxLUA_USEBINDING_WXWEBVIEW
#define wxLUA_USEBINDING_WXWEBVIEW 1
#endif
#ifndef wxLUA_USEBINDING_WXXML
#define wxLUA_USEBINDING_WXXML 1
#endif
Expand Down Expand Up @@ -492,6 +516,14 @@
#define WXLUA_IMPLEMENT_BIND_WXSTC
#endif // wxLUA_USEBINDING_WXSTC

#if wxLUA_USEBINDING_WXWEBVIEW && wxUSE_WEBVIEW
#define WXLUA_DECLARE_BIND_WXWEBVIEW extern WXDLLIMPEXP_BINDWXWEBVIEW wxLuaBinding* wxLuaBinding_wxwebview_init(); // modules/wxbind
#define WXLUA_IMPLEMENT_BIND_WXWEBVIEW wxLuaBinding_wxwebview_init();
#else
#define WXLUA_DECLARE_BIND_WXWEBVIEW
#define WXLUA_IMPLEMENT_BIND_WXWEBVIEW
#endif // wxLUA_USEBINDING_WXWEBVIEW && wxUSE_WEBVIEW

#if wxLUA_USEBINDING_WXXML && wxUSE_XML
#define WXLUA_DECLARE_BIND_WXXML extern WXDLLIMPEXP_BINDWXXML wxLuaBinding* wxLuaBinding_wxxml_init(); // modules/wxbind
#define WXLUA_IMPLEMENT_BIND_WXXML wxLuaBinding_wxxml_init();
Expand Down Expand Up @@ -526,6 +558,7 @@
WXLUA_DECLARE_BIND_WXAUI \
WXLUA_DECLARE_BIND_WXMEDIA \
WXLUA_DECLARE_BIND_WXRICHTEXT \
WXLUA_DECLARE_BIND_WXWEBVIEW \
WXLUA_DECLARE_BIND_WXGL \
WXLUA_DECLARE_BIND_WXSTC

Expand Down Expand Up @@ -554,6 +587,7 @@
WXLUA_IMPLEMENT_BIND_WXAUI \
WXLUA_IMPLEMENT_BIND_WXMEDIA \
WXLUA_IMPLEMENT_BIND_WXRICHTEXT \
WXLUA_IMPLEMENT_BIND_WXWEBVIEW \
WXLUA_IMPLEMENT_BIND_WXGL \
WXLUA_IMPLEMENT_BIND_WXSTC

Expand Down
Loading

0 comments on commit 499f7b2

Please sign in to comment.