second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-08-08 06:11:51 +00:00
parent 8fb3bfe20f
commit 3ca6a5f046
138 changed files with 4941 additions and 2278 deletions
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -308,7 +308,7 @@ bool MyApp::OnInit()
    // parse the cmd line
    int x = 50,
        y = 50;
-    if ( argc == 2 )
+    if ( argc == 3 )
    {
        wxSscanf(argv[1], "%d", &x);
        wxSscanf(argv[2], "%d", &y);