quick fixes

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index ff621318bb67357ec383e7a50191dc8166ed104c..990b1f09624d38b2f384a351e8de401102d4d6da 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -44,6 +44,11 @@
    tests individually in the "#else" branch below.
  */
 
    tests individually in the "#else" branch below.
  */
 

+//Sanity check
+#ifdef wxUSE_GUI
+#   undef wxUSE_GUI
+#endif
+

 // what to test (in alphabetic order)? uncomment the line below to do all tests
 //#define TEST_ALL
 #ifdef TEST_ALL
 // what to test (in alphabetic order)? uncomment the line below to do all tests
 //#define TEST_ALL
 #ifdef TEST_ALL


@@ -59,7 +64,7 @@
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME
     #define TEST_FILECONF
     #define TEST_FILENAME
     #define TEST_FILETIME

-    #define TEST_FTP
+//    #define TEST_FTP

     #define TEST_HASH
     #define TEST_HASHMAP
     #define TEST_HASHSET
     #define TEST_HASH
     #define TEST_HASHMAP
     #define TEST_HASHSET


@@ -74,11 +79,10 @@
     #define TEST_PRINTF
     #define TEST_REGCONF
     #define TEST_REGEX
     #define TEST_PRINTF
     #define TEST_REGCONF
     #define TEST_REGEX

-    #define TEST_REGEX

     #define TEST_REGISTRY
     #define TEST_SCOPEGUARD
     #define TEST_SNGLINST
     #define TEST_REGISTRY
     #define TEST_SCOPEGUARD
     #define TEST_SNGLINST

-    #define TEST_SOCKETS
+//    #define TEST_SOCKETS

     #define TEST_STREAMS
     #define TEST_STRINGS
     #define TEST_TEXTSTREAM
     #define TEST_STREAMS
     #define TEST_STRINGS
     #define TEST_TEXTSTREAM