Compilation fixes for !WXWIN_COMPATIBILITY_2_4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
e8448b790f
commit
a9711a4deb
@ -19,6 +19,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/dialog.h"
|
#include "wx/dialog.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
// wxFileDialog data
|
// wxFileDialog data
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "wx/colour.h"
|
#include "wx/colour.h"
|
||||||
#include "wx/font.h"
|
#include "wx/font.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
class wxFrame;
|
class wxFrame;
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ typedef void *wxTreeItemIdValue;
|
|||||||
|
|
||||||
class WXDLLEXPORT wxTreeItemId
|
class WXDLLEXPORT wxTreeItemId
|
||||||
{
|
{
|
||||||
|
friend bool operator==(const wxTreeItemId&, const wxTreeItemId&);
|
||||||
public:
|
public:
|
||||||
// ctors
|
// ctors
|
||||||
// 0 is invalid value for HTREEITEM
|
// 0 is invalid value for HTREEITEM
|
||||||
@ -63,8 +64,16 @@ public:
|
|||||||
#endif // WXWIN_COMPATIBILITY_2_4
|
#endif // WXWIN_COMPATIBILITY_2_4
|
||||||
|
|
||||||
wxTreeItemIdValue m_pItem;
|
wxTreeItemIdValue m_pItem;
|
||||||
|
bool operator!() const { return !IsOk(); }
|
||||||
|
operator bool() const { return IsOk(); }
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2)
|
||||||
|
{
|
||||||
|
return i1.m_pItem == i2.m_pItem;
|
||||||
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// wxTreeItemData is some (arbitrary) user class associated with some item. The
|
// wxTreeItemData is some (arbitrary) user class associated with some item. The
|
||||||
// main advantage of having this class (compared to old untyped interface) is
|
// main advantage of having this class (compared to old untyped interface) is
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/ctrlsub.h"
|
#include "wx/ctrlsub.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/listbox.h"
|
#include "wx/listbox.h"
|
||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
#include "wx/checklst.h"
|
#include "wx/checklst.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// implementation
|
// implementation
|
||||||
|
Loading…
Reference in New Issue
Block a user