Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move wxAdv library contents into wxCore

Browse Source 
This basically removes the "adv" library, even though it's still
preserved for compatibility with user make/project files referring to
it.

It is done because the distinction between "adv" and "core" was never
really clear (e.g. why wxTreeCtrl was in core but wxTreeListCtrl in
adv?) and it prevented some core classes from using adv ones.
This commit is contained in:
Vadim Zeitlin
2018-08-27 16:34:34 +02:00
parent b38813a5e9
commit 3ffa651a34
314 changed files with 9761 additions and 11422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/treelist.h
View File

@@ -22,10 +22,10 @@
#include "wx/window.h"
#include "wx/withimages.h"
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewEvent;
class WXDLLIMPEXP_FWD_CORE wxDataViewCtrl;
class WXDLLIMPEXP_FWD_CORE wxDataViewEvent;
extern WXDLLIMPEXP_DATA_ADV(const char) wxTreeListCtrlNameStr[];
extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeListCtrlNameStr[];
class wxTreeListCtrl;
class wxTreeListModel;
@@ -75,8 +75,8 @@ public:
typedef wxVector<wxTreeListItem> wxTreeListItems;
// Some special "items" that can be used with InsertItem():
extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_FIRST;
extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_LAST;
extern WXDLLIMPEXP_DATA_CORE(const wxTreeListItem) wxTLI_FIRST;
extern WXDLLIMPEXP_DATA_CORE(const wxTreeListItem) wxTLI_LAST;
// ----------------------------------------------------------------------------
// wxTreeListItemComparator: defines order of wxTreeListCtrl items.
@@ -117,7 +117,7 @@ private:
// with wxDataViewCtrl directly but doing this makes your unportable to possible
// future non-wxDataViewCtrl-based implementations of this class.
class WXDLLIMPEXP_ADV wxTreeListCtrl
class WXDLLIMPEXP_CORE wxTreeListCtrl
: public wxCompositeWindow< wxNavigationEnabled<wxWindow> >,
public wxWithImages
{
@@ -454,7 +454,7 @@ private:
// wxTreeListEvent: event generated by wxTreeListCtrl.
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxTreeListEvent : public wxNotifyEvent
class WXDLLIMPEXP_CORE wxTreeListEvent : public wxNotifyEvent
{
public:
// Default ctor is provided for wxRTTI needs only but should never be used.
@@ -529,7 +529,7 @@ typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&);
wx__DECLARE_EVT1(wxEVT_TREELIST_##name, id, wxTreeListEventHandler(fn))
#define wxDECLARE_TREELIST_EVENT(name) \
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, \
wxEVT_TREELIST_##name, \
wxTreeListEvent)