jyapayne/wxc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove custom classes in original wx headers

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2023-02-06 10:40:04 -07:00
commit 02ce738d3e
No known key found for this signature in database
GPG key ID: 6BFE655FA5ABD1E1
13 changed files with 466 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

16
wxheaders/wx/app.h
View file

@ -16,7 +16,7 @@
// headers we have to include here
// ----------------------------------------------------------------------------
#include "wxext/event_ext.h" // for the base class
#include "wx/event.h" // for the base class
#include "wx/eventfilter.h" // (and another one)
#include "wx/build.h"
#include "wx/cmdargs.h" // for wxCmdLineArgsArray used by wxApp::argv
@ -70,7 +70,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
// wxAppConsoleBase: wxApp for non-GUI applications
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandlerExt,
class WXDLLIMPEXP_BASE wxAppConsoleBase : public wxEvtHandler,
public wxEventFilter
{
public:
@ -546,16 +546,11 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxAppConsoleBase);
};
#include "wxext/appconsole_ext.h"
#if defined(__UNIX__) && !defined(__WINDOWS__)
#include "wx/unix/app.h"
#else
// this has to be a class and not a typedef as we forward declare it
class wxAppConsole : public wxAppConsoleBaseExt {
public:
using wxAppConsoleBaseExt::wxAppConsoleBaseExt;
};
class wxAppConsole : public wxAppConsoleBase { };
#endif
// ----------------------------------------------------------------------------
@ -564,11 +559,9 @@ protected:
#if wxUSE_GUI
class WXDLLIMPEXP_CORE wxAppBase : public wxAppConsole
{
public:
using wxAppConsole::wxAppConsole;
wxAppBase();
virtual ~wxAppBase();
@ -750,8 +743,6 @@ protected:
// now include the declaration of the real class
// ----------------------------------------------------------------------------
#include "wxext/app_ext.h"
#if defined(__WXMSW__)
#include "wx/msw/app.h"
#elif defined(__WXMOTIF__)
@ -766,7 +757,6 @@ protected:
#include "wx/x11/app.h"
#elif defined(__WXMAC__)
#include "wx/osx/app.h"
#include "wxext/osx/app_ext.h"
#elif defined(__WXQT__)
#include "wx/qt/app.h"
#endif

9
wxheaders/wx/frame.h
View file

@ -15,7 +15,7 @@
// headers
// ----------------------------------------------------------------------------
#include "wxext/toplevel_ext.h" // the base class
#include "wx/toplevel.h" // the base class
#include "wx/statusbr.h"
// the default names for various classes
@ -53,7 +53,7 @@ class WXDLLIMPEXP_FWD_CORE wxToolBar;
// CreateXXXBar() is called.
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindowExt
class WXDLLIMPEXP_CORE wxFrameBase : public wxTopLevelWindow
{
public:
// construction
@ -181,7 +181,7 @@ public:
virtual bool IsClientAreaChild(const wxWindow *child) const wxOVERRIDE
{
return !IsOneOfBars(child) && wxTopLevelWindowExt::IsClientAreaChild(child);
return !IsOneOfBars(child) && wxTopLevelWindow::IsClientAreaChild(child);
}
protected:
@ -255,8 +255,6 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxFrameBase);
};
#include "wxext/frame_ext.h"
// include the real class declaration
#if defined(__WXUNIVERSAL__)
#include "wx/univ/frame.h"
@ -271,7 +269,6 @@ protected:
#include "wx/motif/frame.h"
#elif defined(__WXMAC__)
#include "wx/osx/frame.h"
#include "wxext/osx/frame_ext.h"
#elif defined(__WXQT__)
#include "wx/qt/frame.h"
#endif

2
wxheaders/wx/generic/panelg.h
View file

@ -13,7 +13,7 @@
#include "wx/bitmap.h"
class WXDLLIMPEXP_CORE wxPanel : public wxPanelBaseExt
class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
{
public:
wxPanel() { }

3
wxheaders/wx/osx/app.h
View file

@ -31,7 +31,7 @@ bool WXDLLIMPEXP_CORE wxYield();
// Represents the application. Derive OnInit and declare
// a new App object to start application
class WXDLLIMPEXP_CORE wxApp: public wxAppBaseExt
class WXDLLIMPEXP_CORE wxApp: public wxAppBase
{
wxDECLARE_DYNAMIC_CLASS(wxApp);
@ -64,7 +64,6 @@ protected:
wxMacAutoreleasePool* m_macPool;
public:
using wxAppBaseExt::wxAppBaseExt;
static bool sm_isEmbedded;
// Implementation

2
wxheaders/wx/osx/frame.h
View file

@ -17,7 +17,7 @@
class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
class WXDLLIMPEXP_CORE wxFrame: public wxFrameBaseExt
class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
{
public:
// construction

2
wxheaders/wx/osx/window.h
View file

@ -25,7 +25,7 @@ class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
#endif
class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBaseExt
class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
{
wxDECLARE_DYNAMIC_CLASS(wxWindowMac);

10
wxheaders/wx/panel.h
View file

@ -16,9 +16,7 @@
// headers and forward declarations
// ----------------------------------------------------------------------------
#include "wx/wx.h"
#include "wxext/window_ext.h"
#include "wxext/window_ext_inc.h"
#include "wx/window.h"
#include "wx/containr.h"
class WXDLLIMPEXP_FWD_CORE wxControlContainer;
@ -29,7 +27,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxPanelNameStr[];
// wxPanel contains other controls and implements TAB traversal between them
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindowExt>
class WXDLLIMPEXP_CORE wxPanelBase : public wxNavigationEnabled<wxWindow>
{
public:
wxPanelBase() { }
@ -62,8 +60,6 @@ private:
wxDECLARE_NO_COPY_CLASS(wxPanelBase);
};
#include "wxext/panel_ext.h"
#if defined(__WXUNIVERSAL__)
#include "wx/univ/panel.h"
#elif defined(__WXMSW__)
@ -71,8 +67,6 @@ private:
#else
#define wxHAS_GENERIC_PANEL
#include "wx/generic/panelg.h"
#include "wxext/generic/panelg_ext.h"
#endif
#endif // _WX_PANELH_BASE_

3
wxheaders/wx/unix/app.h
View file

@ -15,10 +15,9 @@ class wxFDIOHandler;
class wxWakeUpPipe;
// wxApp subclass implementing event processing for console applications
class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBaseExt
class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBase
{
public:
using wxAppConsoleBaseExt::wxAppConsoleBaseExt;
wxAppConsole();
virtual ~wxAppConsole();

8
wxheaders/wx/window.h
View file

@ -15,7 +15,7 @@
// headers which we must include here
// ----------------------------------------------------------------------------
#include "wxext/event_ext.h" // the base class
#include "wx/event.h" // the base class
#include "wx/list.h" // defines wxWindowList
@ -172,7 +172,7 @@ extern WXDLLIMPEXP_DATA_BASE(wxList) wxPendingDelete;
// temporarily switches event handlers).
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandlerExt
class WXDLLIMPEXP_CORE wxWindowBase : public wxEvtHandler
{
public:
// creating the window
@ -2066,8 +2066,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
// now include the declaration of wxWindow class
// ----------------------------------------------------------------------------
#include "wxext/window_ext.h"
// include the declaration of the platform-specific class
#if defined(__WXMSW__)
#ifdef __WXUNIVERSAL__
@ -2128,8 +2126,6 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
#include "wx/univ/window.h"
#endif // wxUniv
#include "wxext/window_ext_inc.h"
// ----------------------------------------------------------------------------
// inline functions which couldn't be declared in the class body because of
// forward dependencies