Skip to content

Commit

Permalink
2024.19
Browse files Browse the repository at this point in the history
  • Loading branch information
dkulp committed Nov 23, 2024
1 parent 26e8f71 commit f031f32
Show file tree
Hide file tree
Showing 128 changed files with 809 additions and 1,286 deletions.
Binary file modified bin/wxrc-3.3
Binary file not shown.
18 changes: 2 additions & 16 deletions include/wx-3.3/wx/any.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ union wxAnyValueBuffer
{
union Alignment
{
#if wxHAS_INT64
wxInt64 m_int64;
#endif
long double m_longDouble;
void ( *m_funcPtr )(void);
void ( wxAnyValueBuffer::*m_mFuncPtr )(void);
Expand Down Expand Up @@ -410,14 +408,8 @@ _WX_ANY_DEFINE_SUB_TYPE(T, CLSTYPE)\
// Integer value types
//

#ifdef wxLongLong_t
typedef wxLongLong_t wxAnyBaseIntType;
typedef wxULongLong_t wxAnyBaseUintType;
#else
typedef long wxAnyBaseIntType;
typedef unsigned long wxAnyBaseUintType;
#endif

typedef wxLongLong_t wxAnyBaseIntType;
typedef wxULongLong_t wxAnyBaseUintType;

class WXDLLIMPEXP_BASE wxAnyValueTypeImplInt :
public wxAnyValueTypeImplBase<wxAnyBaseIntType>
Expand Down Expand Up @@ -453,17 +445,13 @@ WX_ANY_DEFINE_SUB_TYPE(signed long, Int)
WX_ANY_DEFINE_SUB_TYPE(signed int, Int)
WX_ANY_DEFINE_SUB_TYPE(signed short, Int)
WX_ANY_DEFINE_SUB_TYPE(signed char, Int)
#ifdef wxLongLong_t
WX_ANY_DEFINE_SUB_TYPE(wxLongLong_t, Int)
#endif

WX_ANY_DEFINE_SUB_TYPE(unsigned long, Uint)
WX_ANY_DEFINE_SUB_TYPE(unsigned int, Uint)
WX_ANY_DEFINE_SUB_TYPE(unsigned short, Uint)
WX_ANY_DEFINE_SUB_TYPE(unsigned char, Uint)
#ifdef wxLongLong_t
WX_ANY_DEFINE_SUB_TYPE(wxULongLong_t, Uint)
#endif


//
Expand Down Expand Up @@ -916,9 +904,7 @@ class wxAny
WXANY_IMPLEMENT_INT_EQ_OP(signed short, unsigned short)
WXANY_IMPLEMENT_INT_EQ_OP(signed int, unsigned int)
WXANY_IMPLEMENT_INT_EQ_OP(signed long, unsigned long)
#ifdef wxLongLong_t
WXANY_IMPLEMENT_INT_EQ_OP(wxLongLong_t, wxULongLong_t)
#endif

wxGCC_WARNING_SUPPRESS(float-equal)

Expand Down
4 changes: 2 additions & 2 deletions include/wx-3.3/wx/archive.h
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ class wxArchiveIterator

wxArchiveIterator& operator =(const wxArchiveIterator& it) {
if (it.m_rep)
it.m_rep.AddRef();
it.m_rep->AddRef();
if (m_rep)
this->m_rep.UnRef();
m_rep->UnRef();
m_rep = it.m_rep;
return *this;
}
Expand Down
4 changes: 2 additions & 2 deletions include/wx-3.3/wx/arrstr.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ inline int wxCMPFUNC_CONV wxNaturalStringSortDescending(const wxString& s1, cons

typedef int (wxCMPFUNC_CONV *CMPFUNCwxString)(wxString*, wxString*);

class WXDLLIMPEXP_BASE wxArrayString : public wxBaseArray<wxString>
class WXDLLIMPEXP_BASE wxWARN_UNUSED wxArrayString : public wxBaseArray<wxString>
{
public:
// type of function used by wxArrayString::Sort()
Expand Down Expand Up @@ -155,7 +155,7 @@ class WXDLLIMPEXP_BASE wxSortedArrayString : public wxSortedArrayStringBase
#include <iterator>
#include "wx/afterstd.h"

class WXDLLIMPEXP_BASE wxArrayString
class WXDLLIMPEXP_BASE wxWARN_UNUSED wxArrayString
{
public:
// type of function used by wxArrayString::Sort()
Expand Down
8 changes: 5 additions & 3 deletions include/wx-3.3/wx/aui/auibook.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxBookCtrlEvent
class WXDLLIMPEXP_AUI wxAuiNotebookPage
{
public:
wxWindow* window; // page's associated window
wxWindow* window = nullptr; // page's associated window
wxString caption; // caption displayed on the tab
wxString tooltip; // tooltip displayed when hovering over tab title
wxBitmapBundle bitmap;// tab's bitmap
wxRect rect; // tab's hit rectangle
bool active; // true if the page is currently active
bool hover; // true if mouse hovering over tab
bool active = false; // true if the page is currently active
bool hover = false; // true if mouse hovering over tab
};

class WXDLLIMPEXP_AUI wxAuiTabContainerButton
Expand Down Expand Up @@ -334,6 +334,8 @@ class WXDLLIMPEXP_AUI wxAuiNotebook : public wxCompositeBookCtrlBase

const wxAuiManager& GetAuiManager() const { return m_mgr; }

void SetManagerFlags(unsigned int flags) { m_mgr.SetFlags(flags); }

// Sets the normal font
void SetNormalFont(const wxFont& font);

Expand Down
20 changes: 18 additions & 2 deletions include/wx-3.3/wx/aui/framemanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ class wxAuiPaneInfo;
class wxAuiDockInfo;
class wxAuiDockArt;
class wxAuiManagerEvent;
class wxAuiSerializer;
class wxAuiDeserializer;

using wxAuiDockUIPartArray = wxBaseArray<wxAuiDockUIPart>;
using wxAuiDockInfoArray = wxBaseArray<wxAuiDockInfo>;
Expand Down Expand Up @@ -452,6 +454,12 @@ class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler

void Update();

// Serialize or restore the whole layout using the provided serializer.
void SaveLayout(wxAuiSerializer& serializer) const;
void LoadLayout(wxAuiDeserializer& deserializer);

// Older functions using bespoke text format, prefer using the ones using
// wxAuiSerializer and wxAuiDeserializer above instead in the new code.
wxString SavePaneInfo(const wxAuiPaneInfo& pane);
void LoadPaneInfo(wxString panePart, wxAuiPaneInfo &pane);
wxString SavePerspective();
Expand All @@ -477,13 +485,17 @@ class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler
wxRect CalculateHintRect(
wxWindow* paneWindow,
const wxPoint& pt,
const wxPoint& offset);
const wxPoint& offset = wxPoint{});

void DrawHintRect(
wxWindow* paneWindow,
const wxPoint& pt,
const wxPoint& offset);
const wxPoint& offset = wxPoint{});

void UpdateHint(const wxRect& rect);

// These functions are public for compatibility reasons, but should never
// be called directly, use UpdateHint() above instead.
virtual void ShowHint(const wxRect& rect);
virtual void HideHint();

Expand Down Expand Up @@ -622,6 +634,10 @@ class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler
// m_actionPart. If m_actionPart is null, returns wxNOT_FOUND.
int GetActionPartIndex() const;

// This flag is set to true if Update() is called while the window is
// minimized, in which case we postpone updating it until it is restored.
bool m_updateOnRestore = false;

#ifndef SWIG
wxDECLARE_EVENT_TABLE();
wxDECLARE_CLASS(wxAuiManager);
Expand Down
109 changes: 109 additions & 0 deletions include/wx-3.3/wx/aui/serializer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/aui/serializer.h
// Purpose: Declaration of wxAuiSerializer and wxAuiDeserializer classes.
// Author: Vadim Zeitlin
// Created: 2024-01-20
// Copyright: (c) 2024 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////

#ifndef _WX_AUI_SERIALIZER_H_
#define _WX_AUI_SERIALIZER_H_

// ----------------------------------------------------------------------------
// Classes used to save/load wxAuiManager layout.
// ----------------------------------------------------------------------------

// wxAuiSerializer is used with wxAuiManager::SaveLayout().
//
// This is an abstract base class, you need to inherit from it and override its
// pure virtual functions in your derived class.
//
// If any of the functions of the derived class throw an exception, it is
// propagated out of wxAuiManager::SaveLayout() and it's callers responsibility
// to handle it.
class wxAuiSerializer
{
public:
// Trivial default ctor.
wxAuiSerializer() = default;

// Trivial but virtual dtor for a base class.
virtual ~wxAuiSerializer() = default;


// Called before doing anything else, does nothing by default.
virtual void BeforeSave() { }

// Called before starting to save information about the panes, does nothing
// by default.
virtual void BeforeSavePanes() { }

// Save information about the given pane.
virtual void SavePane(const wxAuiPaneInfo& pane) = 0;

// Called after the last call to SavePane(), does nothing by default.
virtual void AfterSavePanes() { }

// Called before starting to save information about the docks, does nothing
// by default.
virtual void BeforeSaveDocks() { }

// Save information about the given dock.
virtual void SaveDock(const wxAuiDockInfo& dock) = 0;

// Called after the last call to SaveDock(), does nothing by default.
virtual void AfterSaveDocks() { }

// Called after saving everything, does nothing by default.
virtual void AfterSave() { }
};

// wxAuiDeserializer is used with wxAuiManager::LoadLayout().
//
// As wxAuiSerializer, this is an abstract base class, you need to inherit from
// it and override its pure virtual functions in your derived class.
//
// Derived class function also may throw and, if any of them other than
// AfterLoad() does, the existing layout is not changed, i.e.
// wxAuiManager::LoadLayout() is exception-safe.
class wxAuiDeserializer
{
public:
// Ctor takes the manager for which we're restoring the layout, it must
// remain valid for the lifetime of this object.
explicit wxAuiDeserializer(wxAuiManager& manager) : m_manager(manager) { }

// Trivial but virtual dtor for a base class.
virtual ~wxAuiDeserializer() = default;


// Called before doing anything else, does nothing by default.
virtual void BeforeLoad() { }

// Load information about all the panes previously saved with SavePane().
virtual std::vector<wxAuiPaneInfo> LoadPanes() = 0;

// Create the window to be managed by the given pane: this is called if any
// of the panes returned by LoadPanes() doesn't exist in the existing
// layout and allows to create windows on the fly.
//
// If this function returns nullptr, the pane is not added to the manager.
virtual wxWindow* CreatePaneWindow(const wxAuiPaneInfo& WXUNUSED(pane))
{
return nullptr;
}

// Load information about all the docks previously saved with SaveDock().
virtual std::vector<wxAuiDockInfo> LoadDocks() = 0;

// Called after restoring everything, calls Update() on the manager by
// default.
virtual void AfterLoad() { m_manager.Update(); }

protected:
// The manager for which we're restoring the layout.
wxAuiManager& m_manager;
};

#endif // _WX_AUI_SERIALIZER_H_
12 changes: 12 additions & 0 deletions include/wx-3.3/wx/aui/tabart.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ class WXDLLIMPEXP_AUI wxAuiTabArt
virtual void SetColour(const wxColour& colour) = 0;
virtual void SetActiveColour(const wxColour& colour) = 0;

// These functions should be overridden in the derived class to return the
// actually used fonts, but they're not pure virtual for compatibility
// reasons.
virtual wxFont GetNormalFont() const { return wxFont{}; }
virtual wxFont GetSelectedFont() const { return wxFont{}; }

virtual void DrawBorder(
wxDC& dc,
wxWindow* wnd,
Expand Down Expand Up @@ -138,6 +144,9 @@ class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt
void SetColour(const wxColour& colour) override;
void SetActiveColour(const wxColour& colour) override;

wxFont GetNormalFont() const override;
wxFont GetSelectedFont() const override;

void DrawBorder(
wxDC& dc,
wxWindow* wnd,
Expand Down Expand Up @@ -241,6 +250,9 @@ class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt
void SetColour(const wxColour& colour) override;
void SetActiveColour(const wxColour& colour) override;

wxFont GetNormalFont() const override;
wxFont GetSelectedFont() const override;

void DrawBorder(
wxDC& dc,
wxWindow* wnd,
Expand Down
6 changes: 5 additions & 1 deletion include/wx-3.3/wx/bitmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,11 @@ class WXDLLIMPEXP_CORE wxBitmapBase : public wxGDIObject,
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_PICT_RESOURCE
#include "wx/osx/bitmap.h"
#elif defined(__WXQT__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#ifdef __WINDOWS__
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE
#else
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#endif
#include "wx/qt/bitmap.h"
#endif

Expand Down
38 changes: 0 additions & 38 deletions include/wx-3.3/wx/chkconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,6 @@
# endif
#endif /* !defined(wxUSE_LOG) */

#ifndef wxUSE_LONGLONG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_LONGLONG must be defined, please read comment near the top of this file."
# else
# define wxUSE_LONGLONG 0
# endif
#endif /* !defined(wxUSE_LONGLONG) */

#ifndef wxUSE_MIMETYPE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MIMETYPE must be defined, please read comment near the top of this file."
Expand Down Expand Up @@ -1431,17 +1423,6 @@
# endif
#endif /* wxUSE_FS_INET */

#if wxUSE_STOPWATCH || wxUSE_DATETIME
# if !wxUSE_LONGLONG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_STOPWATCH and wxUSE_DATETIME require wxUSE_LONGLONG"
# else
# undef wxUSE_LONGLONG
# define wxUSE_LONGLONG 1
# endif
# endif
#endif /* wxUSE_STOPWATCH */

#if wxUSE_MIMETYPE && !wxUSE_TEXTFILE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_MIMETYPE requires wxUSE_TEXTFILE"
Expand Down Expand Up @@ -2333,17 +2314,6 @@
# endif
#endif /* wxUSE_PRIVATE_FONTS */

#if wxUSE_MEDIACTRL
# if !wxUSE_LONGLONG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxMediaCtrl requires wxUSE_LONGLONG"
# else
# undef wxUSE_LONGLONG
# define wxUSE_LONGLONG 1
# endif
# endif
#endif /* wxUSE_MEDIACTRL */

#if wxUSE_STC
# if !wxUSE_STOPWATCH
# ifdef wxABORT_ON_CONFIG_ERROR
Expand Down Expand Up @@ -2373,14 +2343,6 @@
# define wxUSE_RICHTEXT 0
# endif
# endif
# if !wxUSE_LONGLONG
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxRichTextCtrl requires wxUSE_LONGLONG"
# else
# undef wxUSE_LONGLONG
# define wxUSE_LONGLONG 1
# endif
# endif
# if !wxUSE_VARIANT
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxRichTextCtrl requires wxUSE_VARIANT"
Expand Down
6 changes: 5 additions & 1 deletion include/wx-3.3/wx/cursor.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ class WXDLLIMPEXP_CORE wxCursorBase : public wxGDIImage
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_MACCURSOR_RESOURCE
#include "wx/osx/cursor.h"
#elif defined(__WXQT__)
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR
#ifdef __WINDOWS__
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR_RESOURCE
#else
#define wxCURSOR_DEFAULT_TYPE wxBITMAP_TYPE_CUR
#endif
#include "wx/qt/cursor.h"
#endif

Expand Down
Loading

0 comments on commit f031f32

Please sign in to comment.