Compilation fixes for !WXWIN_COMPATIBILITY_2_4.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index f151ca999384ded80c6d6234cf0748699fd29b15..8d59f7fb70b0ceefd8272bd0b01c4195d979e89a 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -19,6 +19,7 @@
 #endif
 
 #include "wx/dialog.h"
 #endif
 
 #include "wx/dialog.h"

+#include "wx/arrstr.h"

 
 //----------------------------------------------------------------------------
 // wxFileDialog data
 
 //----------------------------------------------------------------------------
 // wxFileDialog data

diff --git a/include/wx/motif/menu.h b/include/wx/motif/menu.h
index 9db851bab5c9f80ca8c10214368dd80c6f79e932..e130a1257be8b2044d15ac413a8e2eae172c53b6 100644 (file)
--- a/include/wx/motif/menu.h
+++ b/include/wx/motif/menu.h
@@ -18,6 +18,7 @@
 
 #include "wx/colour.h"
 #include "wx/font.h"
 
 #include "wx/colour.h"
 #include "wx/font.h"

+#include "wx/arrstr.h"

 
 class wxFrame;
 
 
 class wxFrame;
 

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 8ef315f8360e2280e2d2066c0596a07a4c6da0d9..b9331b92a6f061914fd7c06c7fe5ccb730ea5dd4 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -38,6 +38,7 @@ typedef void *wxTreeItemIdValue;
 
 class WXDLLEXPORT wxTreeItemId
 {
 
 class WXDLLEXPORT wxTreeItemId
 {

+    friend bool operator==(const wxTreeItemId&, const wxTreeItemId&);

 public:
     // ctors
         // 0 is invalid value for HTREEITEM
 public:
     // ctors
         // 0 is invalid value for HTREEITEM


@@ -63,8 +64,16 @@ public:
 #endif // WXWIN_COMPATIBILITY_2_4
 
     wxTreeItemIdValue m_pItem;
 #endif // WXWIN_COMPATIBILITY_2_4
 
     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
 // main advantage of having this class (compared to old untyped interface) is
 // ----------------------------------------------------------------------------
 // wxTreeItemData is some (arbitrary) user class associated with some item. The
 // main advantage of having this class (compared to old untyped interface) is

diff --git a/src/common/ctrlsub.cpp b/src/common/ctrlsub.cpp
index 975812f8d44749c7b385f2105b83775082ca8722..93de1562dace551535e6d20e622a68d0aca30f03 100644 (file)
--- a/src/common/ctrlsub.cpp
+++ b/src/common/ctrlsub.cpp
@@ -32,6 +32,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"
 
 #ifndef WX_PRECOMP
     #include "wx/ctrlsub.h"

+    #include "wx/arrstr.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

diff --git a/src/common/lboxcmn.cpp b/src/common/lboxcmn.cpp
index 429aa9e5ffff89b6f4c3a502d985fc018250faa9..671c54c39a8273bc432aa2495ac5d9e26870c956 100644 (file)
--- a/src/common/lboxcmn.cpp
+++ b/src/common/lboxcmn.cpp
@@ -33,6 +33,7 @@
 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
     #include "wx/dynarray.h"
 #ifndef WX_PRECOMP
     #include "wx/listbox.h"
     #include "wx/dynarray.h"

+    #include "wx/arrstr.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================

diff --git a/src/motif/checklst.cpp b/src/motif/checklst.cpp
index 7546ec3927c86914cff00462c7c1860666251ee4..b86a9863bd02abfd35f5e2db633542ba8a654124 100644 (file)
--- a/src/motif/checklst.cpp
+++ b/src/motif/checklst.cpp
@@ -20,6 +20,7 @@
 #include "wx/defs.h"
 
 #include "wx/checklst.h"
 #include "wx/defs.h"
 
 #include "wx/checklst.h"

+#include "wx/arrstr.h"

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation