Skip to content

Commit

Permalink
xlights_2024.16
Browse files Browse the repository at this point in the history
  • Loading branch information
dkulp committed Sep 17, 2024
1 parent 467798d commit 26e8f71
Show file tree
Hide file tree
Showing 158 changed files with 2,152 additions and 921 deletions.
Binary file modified bin/wxrc-3.3
Binary file not shown.
8 changes: 4 additions & 4 deletions include/lua.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@

#define LUA_VERSION_MAJOR "5"
#define LUA_VERSION_MINOR "4"
#define LUA_VERSION_RELEASE "6"
#define LUA_VERSION_RELEASE "7"

#define LUA_VERSION_NUM 504
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 6)
#define LUA_VERSION_RELEASE_NUM (LUA_VERSION_NUM * 100 + 7)

#define LUA_VERSION "Lua " LUA_VERSION_MAJOR "." LUA_VERSION_MINOR
#define LUA_RELEASE LUA_VERSION "." LUA_VERSION_RELEASE
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2023 Lua.org, PUC-Rio"
#define LUA_COPYRIGHT LUA_RELEASE " Copyright (C) 1994-2024 Lua.org, PUC-Rio"
#define LUA_AUTHORS "R. Ierusalimschy, L. H. de Figueiredo, W. Celes"


Expand Down Expand Up @@ -497,7 +497,7 @@ struct lua_Debug {


/******************************************************************************
* Copyright (C) 1994-2023 Lua.org, PUC-Rio.
* Copyright (C) 1994-2024 Lua.org, PUC-Rio.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
Expand Down
9 changes: 9 additions & 0 deletions include/luaconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,15 @@

#endif


/*
** LUA_IGMARK is a mark to ignore all after it when building the
** module name (e.g., used to build the luaopen_ function name).
** Typically, the suffix after the mark is the module version,
** as in "mod-v1.2.so".
*/
#define LUA_IGMARK "-"

/* }================================================================== */


Expand Down
43 changes: 41 additions & 2 deletions include/wx-3.3/wx/app.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,18 @@ class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler,
// Called from wxExit() function, should terminate the application a.s.a.p.
virtual void Exit();

// Allows to set a custom process exit code if a fatal error happens.
// This code is 255 by default, but can be changed if necessary, notably
// set to -1 (which still maps to 255 under most systems, but to 127 when
// using MSVC) if compatibility with the previous wx versions is important.
static void SetFatalErrorExitCode(int code) { ms_fatalErrorExitCode = code; }
static int GetFatalErrorExitCode() { return ms_fatalErrorExitCode; }

// Allows to set a custom process exit code if OnInit() returns false.
// By default, this exit code is 255, as for the fatal errors.
virtual void SetErrorExitCode(int code) { m_exitCode = code; }
int GetErrorExitCode() const { return m_exitCode; }


// application info: name, description, vendor
// -------------------------------------------
Expand Down Expand Up @@ -423,8 +435,7 @@ class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler,
// version does the normal processing (i.e. shows the usual assert failure
// dialog box)
//
// the arguments are the location of the failed assert (func may be empty
// if the compiler doesn't support C99 __FUNCTION__), the text of the
// the arguments are the location of the failed assert, the text of the
// assert itself and the user-specified message
virtual void OnAssertFailure(const wxChar *file,
int line,
Expand Down Expand Up @@ -539,6 +550,14 @@ class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler,
// set it
bool m_fullyConstructed = false;

// Exit code to use if a fatal error occurs when the application object
// doesn't exist yet or is already destroyed.
static int ms_fatalErrorExitCode;

// Exit code to use if OnInit() returns false.
int m_exitCode = ms_fatalErrorExitCode;


friend class WXDLLIMPEXP_FWD_BASE wxEvtHandler;

// the application object is a singleton anyhow, there is no sense in
Expand Down Expand Up @@ -674,6 +693,26 @@ class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole
// Change the theme used by the application, return true on success.
virtual bool SetNativeTheme(const wxString& WXUNUSED(theme)) { return false; }

// Request using system appearance (which is automatic for most platforms
// but not MSW) or explicitly request dark or light appearance for this
// application.
enum class Appearance
{
System,
Light,
Dark
};

enum class AppearanceResult
{
Failure,
Ok,
CannotChange
};

virtual AppearanceResult SetAppearance(Appearance WXUNUSED(appearance))
{ return AppearanceResult::Failure; }


// command line parsing (GUI-specific)
// ------------------------------------------------------------------------
Expand Down
31 changes: 19 additions & 12 deletions include/wx-3.3/wx/aui/auibar.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@

#include "wx/bmpbndl.h"
#include "wx/control.h"
#include "wx/custombgwin.h"
#include "wx/sizer.h"
#include "wx/pen.h"

class WXDLLIMPEXP_FWD_CORE wxClientDC;
class WXDLLIMPEXP_FWD_CORE wxReadOnlyDC;
class WXDLLIMPEXP_FWD_AUI wxAuiPaneInfo;

enum wxAuiToolBarStyle
Expand Down Expand Up @@ -326,12 +328,12 @@ class WXDLLIMPEXP_AUI wxAuiToolBarArt
int state) = 0;

virtual wxSize GetLabelSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item) = 0;

virtual wxSize GetToolSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item) = 0;

Expand Down Expand Up @@ -417,12 +419,12 @@ class WXDLLIMPEXP_AUI wxAuiGenericToolBarArt : public wxAuiToolBarArt
int state) override;

virtual wxSize GetLabelSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item) override;

virtual wxSize GetToolSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxAuiToolBarItem& item) override;

Expand Down Expand Up @@ -460,7 +462,7 @@ class WXDLLIMPEXP_AUI wxAuiGenericToolBarArt : public wxAuiToolBarArt



class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
class WXDLLIMPEXP_AUI wxAuiToolBar : public wxCustomBackgroundWindow<wxControl>
{
public:
wxAuiToolBar() { Init(); }
Expand Down Expand Up @@ -627,6 +629,12 @@ class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
protected:
void Init();

// Override to return the minimum acceptable size because under wxMSW this
// function returns DEFAULT_ITEM_HEIGHT (see wxControl::DoGetBestSize())
// which is not suitable as height/width for a horizontal/vertical toolbar
// if icon sizes are much smaller than DEFAULT_ITEM_HEIGHT.
virtual wxSize DoGetBestSize() const override;

virtual void OnCustomRender(wxDC& WXUNUSED(dc),
const wxAuiToolBarItem& WXUNUSED(item),
const wxRect& WXUNUSED(rect)) { }
Expand All @@ -650,7 +658,6 @@ class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
void OnIdle(wxIdleEvent& evt);
void OnDPIChanged(wxDPIChangedEvent& evt);
void OnPaint(wxPaintEvent& evt);
void OnEraseBackground(wxEraseEvent& evt);
void OnLeftDown(wxMouseEvent& evt);
void OnLeftUp(wxMouseEvent& evt);
void OnRightDown(wxMouseEvent& evt);
Expand Down Expand Up @@ -694,11 +701,7 @@ class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
bool m_overflowVisible;

// This function is only kept for compatibility, don't use in the new code.
bool RealizeHelper(wxClientDC& dc, bool horizontal)
{
RealizeHelper(dc, horizontal ? wxHORIZONTAL : wxVERTICAL);
return true;
}
bool RealizeHelper(wxClientDC& dc, bool horizontal);

static bool IsPaneValid(long style, const wxAuiPaneInfo& pane);
bool IsPaneValid(long style) const;
Expand All @@ -711,7 +714,11 @@ class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
// Common part of OnLeaveWindow() and OnCaptureLost().
void DoResetMouseState();

wxSize RealizeHelper(wxClientDC& dc, wxOrientation orientation);
wxSize RealizeHelper(wxReadOnlyDC& dc, wxOrientation orientation);

void UpdateBackgroundBitmap(const wxSize& size);

wxBitmap m_backgroundBitmap;

wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxAuiToolBar);
Expand Down
2 changes: 1 addition & 1 deletion include/wx-3.3/wx/aui/auibook.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class WXDLLIMPEXP_AUI wxAuiTabContainer
void SetTabOffset(size_t offset);

// Is the tab visible?
bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd);
bool IsTabVisible(int tabPage, int tabOffset, wxReadOnlyDC* dc, wxWindow* wnd);

// Make the tab visible if it wasn't already
void MakeTabVisible(int tabPage, wxWindow* win);
Expand Down
7 changes: 4 additions & 3 deletions include/wx-3.3/wx/aui/tabart.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class wxAuiNotebookPage;
class wxAuiNotebookPageArray;
class wxWindow;
class wxDC;
class wxReadOnlyDC;


// tab art class
Expand Down Expand Up @@ -85,7 +86,7 @@ class WXDLLIMPEXP_AUI wxAuiTabArt
wxRect* outRect) = 0;

virtual wxSize GetTabSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmapBundle& bitmap,
Expand Down Expand Up @@ -174,7 +175,7 @@ class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt
wxWindow* wnd) override;

wxSize GetTabSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmapBundle& bitmap,
Expand Down Expand Up @@ -277,7 +278,7 @@ class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt
wxWindow* wnd) override;

wxSize GetTabSize(
wxDC& dc,
wxReadOnlyDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmapBundle& bitmap,
Expand Down
10 changes: 10 additions & 0 deletions include/wx-3.3/wx/buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,17 @@ class wxScopedCharTypeBuffer
DecRef();
}

// For some reasong clang-tidy gives a warning about using freed memory
// here even when this is not at all the case, seemingly because it doesn't
// follow reference counting logic, i.e. it assumes that it's possible to
// delete the data even when it's still referenced.
//
// Suppress the warning as it's extremely annoying to get it for every use
// of wxCharBuffer.
//
// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDelete)
CharType *data() { return m_data->Get(); }
// NOLINTNEXTLINE(clang-analyzer-cplusplus.NewDelete)
const CharType *data() const { return m_data->Get(); }
operator const CharType *() const { return data(); }
CharType operator[](size_t n) const { return data()[n]; }
Expand Down
16 changes: 15 additions & 1 deletion include/wx-3.3/wx/checkbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,27 @@ class WXDLLIMPEXP_CORE wxCheckBoxBase : public wxControl
// background colour of the checkbox itself under the other platforms.
virtual void SetTransparentPartColour(const wxColour& WXUNUSED(col)) { }

// do the window-specific processing before processing the update event
// (mainly for deciding whether wxUpdateUIEvent::Is3State() is set)
virtual void DoPrepareUpdateWindowUI(wxUpdateUIEvent& event) const override
{ event.Allow3rdState(Is3State()); }

// wxCheckBox-specific processing after processing the update event
virtual void DoUpdateWindowUI(wxUpdateUIEvent& event) override
{
wxControl::DoUpdateWindowUI(event);

if ( event.GetSetChecked() )
SetValue(event.GetChecked());
{
if ( Is3State() )
{
Set3StateValue(event.Get3StateValue());
}
else
{
SetValue(event.GetChecked());
}
}
}

protected:
Expand Down
2 changes: 1 addition & 1 deletion include/wx-3.3/wx/control.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class WXDLLIMPEXP_CORE wxControlBase : public wxWindow
// ------------------------------

// replaces parts of the given (multiline) string with an ellipsis if needed
static wxString Ellipsize(const wxString& label, const wxDC& dc,
static wxString Ellipsize(const wxString& label, const wxReadOnlyDC& dc,
wxEllipsizeMode mode, int maxWidth,
int flags = wxELLIPSIZE_FLAGS_DEFAULT);

Expand Down
14 changes: 14 additions & 0 deletions include/wx-3.3/wx/cpp.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,20 @@
#define __WXFUNCTION__ __func__
#endif /* __WXFUNCTION__ already defined */

/*
Expands to the current function's full signature, if available.
Falls back to the function name (i.e., __func__) if not available.
*/
#ifndef __WXFUNCTION_SIG__
#if defined(__VISUALC__)
#define __WXFUNCTION_SIG__ __FUNCSIG__
#elif defined(__GNUG__)
#define __WXFUNCTION_SIG__ __PRETTY_FUNCTION__
#else
#define __WXFUNCTION_SIG__ __func__
#endif
#endif /* __WXFUNCTION_SIG__ already defined */

/*
wxCALL_FOR_EACH(what, ...) calls the macro from its first argument, what(pos, x),
Expand Down
10 changes: 6 additions & 4 deletions include/wx-3.3/wx/datetime.h
Original file line number Diff line number Diff line change
Expand Up @@ -1728,9 +1728,11 @@ class WXDLLIMPEXP_BASE wxDateTimeChristianHolidays : public wxDateTimeUSCatholic

inline bool wxDateTime::IsInStdRange() const
{
// currently we don't know what is the real type of time_t so prefer to err
// on the safe side and limit it to 32 bit values which is safe everywhere
return m_time >= 0l && (m_time / TIME_T_FACTOR) < wxINT32_MAX;
// if sizeof(time_t) is greater than 32 bits, we assume it
// is safe to return values exceeding wxINT32_MAX

return m_time >= 0l &&
( (sizeof(time_t) > 4 ) || ( (m_time / TIME_T_FACTOR) < wxINT32_MAX) );
}

/* static */
Expand Down Expand Up @@ -1837,7 +1839,7 @@ inline time_t wxDateTime::GetTicks() const
return (time_t)-1;
}

return (time_t)((m_time / (long)TIME_T_FACTOR).ToLong()) + WX_TIME_BASE_OFFSET;
return (time_t)((m_time / TIME_T_FACTOR).GetValue()) + WX_TIME_BASE_OFFSET;
}

inline bool wxDateTime::SetToLastWeekDay(WeekDay weekday,
Expand Down
Loading

0 comments on commit 26e8f71

Please sign in to comment.