GetId of wxTreeItemData returns a wxTreeItemId, not a wxTreeItem. From the wiki...

[wxWidgets.git] / tests / mbconv / main.cpp

diff --git a/tests/mbconv/main.cpp b/tests/mbconv/main.cpp
index 38b9af29a0a6805bb59081b3e69b08a9a5d33076..6c509c838ddb354f85f3a1ef3258bbf87099f4d5 100644 (file)
--- a/tests/mbconv/main.cpp
+++ b/tests/mbconv/main.cpp
@@ -11,7 +11,16 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#include "wx/wx.h"
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+#endif // WX_PRECOMP
+
 #include "wx/strconv.h"
 #include "wx/string.h"
 
@@ -33,7 +42,7 @@ private:
 
     void WC2CP1250();
 
-    DECLARE_NO_COPY_CLASS(MBConvTestCase);
+    DECLARE_NO_COPY_CLASS(MBConvTestCase)
 };
 
 // register in the unnamed registry so that these tests are run by default
@@ -51,7 +60,7 @@ void MBConvTestCase::WC2CP1250()
     } data[] =
     {
         { L"hello", "hello" },  // test that it works in simplest case
-        { L"½ of ½ is ¼", NULL }, // this should fail as cp1250 doesn't have 1/2
+        { L"\xBD of \xBD is \xBC", NULL }, // this should fail as cp1250 doesn't have 1/2
     };
 
     wxCSConv cs1250(wxFONTENCODING_CP1250);
@@ -64,7 +73,7 @@ void MBConvTestCase::WC2CP1250()
         }
         else
         {
-            CPPUNIT_ASSERT( cs1250.cWC2MB(d.wc) == NULL );
+            CPPUNIT_ASSERT( (const char*)cs1250.cWC2MB(d.wc) == NULL );
         }
     }
 }