some fixes in TestSocketServer()

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

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index 600939b3cb0c3b64c9f28a89166e782022240b55..58d11022cf4da42d2226dd4488f733bfd43e8f9f 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -785,6 +785,8 @@ static void TestSocketServer()
 
         delete socket;
     }
 
         delete socket;
     }

+
+    delete server;

 }
 
 static void TestSocketClient()
 }
 
 static void TestSocketClient()


@@ -2606,9 +2608,9 @@ int main(int argc, char **argv)
 #endif // TEST_MIME
 
 #ifdef TEST_SOCKETS
 #endif // TEST_MIME
 
 #ifdef TEST_SOCKETS

-    if ( 1 )
-        TestSocketServer();

     if ( 0 )
     if ( 0 )

+        TestSocketServer();
+    if ( 1 )

     {
         TestSocketClient();
         TestProtocolFtp();
     {
         TestSocketClient();
         TestProtocolFtp();

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index d5f42bacd484920eaca4ee829055fe2e2e3eb2a8..128f20e49576ef124ba70a001739ec7cb2eea747 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -282,7 +282,9 @@ void MyCanvas::OnDraw(wxDC& dc)
   dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
   dc.DrawEllipse(250, 250, 100, 50);
   dc.DrawRoundedRectangle(150, 150, 100, 50, 20);
 
   dc.DrawEllipse(250, 250, 100, 50);

+#if wxUSE_SPLINES

   dc.DrawSpline(50, 200, 50, 100, 200, 10);
   dc.DrawSpline(50, 200, 50, 100, 200, 10);

+#endif // wxUSE_SPLINES

   dc.DrawLine(50, 230, 200, 230);
   dc.DrawText("This is a test string", 50, 230);
 
   dc.DrawLine(50, 230, 200, 230);
   dc.DrawText("This is a test string", 50, 230);