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

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