backwards compatibility aliases can be used in the wxPython namespace

[wxWidgets.git] / samples / console / console.cpp

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index ff621318bb67357ec383e7a50191dc8166ed104c..00eed652179694249227741aa193403f16ac9653 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -59,7 +59,7 @@
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME
-    #define TEST_FTP
+ //   #define TEST_FTP  --FIXME! (RN)
     #define TEST_HASH
     #define TEST_HASHMAP
     #define TEST_HASHSET
@@ -74,11 +74,10 @@
     #define TEST_PRINTF
     #define TEST_REGCONF
     #define TEST_REGEX
-    #define TEST_REGEX
     #define TEST_REGISTRY
     #define TEST_SCOPEGUARD
     #define TEST_SNGLINST
-    #define TEST_SOCKETS
+//    #define TEST_SOCKETS  --FIXME! (RN)
     #define TEST_STREAMS
     #define TEST_STRINGS
     #define TEST_TEXTSTREAM
@@ -86,7 +85,7 @@
     #define TEST_TIMER
     #define TEST_UNICODE
     // #define TEST_VCARD            -- don't enable this (VZ)
-    #define TEST_VOLUME
+//    #define TEST_VOLUME   --FIXME! (RN)
     #define TEST_WCHAR
     #define TEST_ZIP
     #define TEST_ZLIB
@@ -3372,14 +3371,14 @@ struct Object
 
 static void TestScopeGuard()
 {
-    ON_BLOCK_EXIT0(function0);
-    ON_BLOCK_EXIT1(function1, 17);
-    ON_BLOCK_EXIT2(function2, 3.14, 'p');
+    wxON_BLOCK_EXIT0(function0);
+    wxON_BLOCK_EXIT1(function1, 17);
+    wxON_BLOCK_EXIT2(function2, 3.14, 'p');
 
     Object obj;
-    ON_BLOCK_EXIT_OBJ0(obj, &Object::method0);
-    ON_BLOCK_EXIT_OBJ1(obj, &Object::method1, 7);
-    ON_BLOCK_EXIT_OBJ2(obj, &Object::method2, 2.71, 'e');
+    wxON_BLOCK_EXIT_OBJ0(obj, &Object::method0);
+    wxON_BLOCK_EXIT_OBJ1(obj, &Object::method1, 7);
+    wxON_BLOCK_EXIT_OBJ2(obj, &Object::method2, 2.71, 'e');
 
     wxScopeGuard dismissed = wxMakeGuard(function0);
     dismissed.Dismiss();