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

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_