Move wxAdv library contents into wxCore
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:
@@ -35,7 +35,7 @@ enum wxSashEdgePosition {
|
||||
* wxSashEdge represents one of the four edges of a window.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSashEdge
|
||||
class WXDLLIMPEXP_CORE wxSashEdge
|
||||
{
|
||||
public:
|
||||
wxSashEdge()
|
||||
@@ -63,7 +63,7 @@ public:
|
||||
* of wxSashWindow.
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSashWindow: public wxWindow
|
||||
class WXDLLIMPEXP_CORE wxSashWindow: public wxWindow
|
||||
{
|
||||
public:
|
||||
// Default constructor
|
||||
@@ -186,9 +186,9 @@ private:
|
||||
wxDECLARE_NO_COPY_CLASS(wxSashWindow);
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_FWD_ADV wxSashEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxSashEvent;
|
||||
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, wxEVT_SASH_DRAGGED, wxSashEvent );
|
||||
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_SASH_DRAGGED, wxSashEvent );
|
||||
|
||||
enum wxSashDragStatus
|
||||
{
|
||||
@@ -196,7 +196,7 @@ enum wxSashDragStatus
|
||||
wxSASH_STATUS_OUT_OF_RANGE
|
||||
};
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSashEvent: public wxCommandEvent
|
||||
class WXDLLIMPEXP_CORE wxSashEvent: public wxCommandEvent
|
||||
{
|
||||
public:
|
||||
wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE)
|
||||
|
Reference in New Issue
Block a user