set labels for new controls

[wxWidgets.git] / samples / multimon / multimon_test.cpp

diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp
index abd36929a7fb424065dd3ca47d6b5d626b1f21d9..2347e7fdb329690a5712619644f0446e8b67075d 100644 (file)
--- a/samples/multimon/multimon_test.cpp
+++ b/samples/multimon/multimon_test.cpp
@@ -9,12 +9,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include <wx/wx.h>
-#include <wx/display.h>
+#include "wx/wx.h"
+#include "wx/display.h"
 
 class TestApp : public wxApp
 {
-       bool OnInit();
+    bool OnInit();
 };
 
 DECLARE_APP(TestApp)
@@ -22,33 +22,34 @@ IMPLEMENT_APP(TestApp)
 
 bool TestApp::OnInit()
 {
-  bool is_use_display = 
+  if ( !wxApp::OnInit() )
+      return false;
+
+  bool is_use_display =
                         #if wxUSE_DISPLAY
-                        TRUE
+                        true
                         #else
-                        FALSE
+                        false
                         #endif
                         ;
   if( !is_use_display )
   {
     wxMessageBox( _T("This sample has to be compiled with wxUSE_DISPLAY"), _T("Building error"), wxOK);
   }
-  #if wxUSE_DISPLAY
+#if wxUSE_DISPLAY
   else
   {
-       size_t count = wxDisplay::GetCount();
-    wxLogDebug ( _T("I detected %i display(s) on your system"), count );
-       size_t i = 0;
-       while ( i < count )
-       {
-               wxDisplay display ( i );
-               wxRect r = display.GetGeometry();
-      wxLogDebug ( _T("Display #%i \"%s\" = ( %i, %i, %i, %i ) @ %i bits"),
-                       i, display.GetName().c_str(), r.GetLeft(), r.GetTop(), r.GetWidth(), r.GetHeight(),
-                       display.GetDepth() );
-               i++;
-       }
+    unsigned count = wxDisplay::GetCount();
+    wxLogDebug ( _T("I detected %u display(s) on your system"), count );
+    for (unsigned i = 0; i < count; i++)
+    {
+        wxDisplay display ( i );
+        wxRect r = display.GetGeometry();
+        wxLogDebug ( _T("Display #%u \"%s\" = ( %i, %i, %i, %i ) @ %i bits"),
+            i, display.GetName().c_str(), r.GetLeft(), r.GetTop(), r.GetWidth(), r.GetHeight(),
+            display.GetCurrentMode().GetDepth() );
+    }
   }
-  #endif
-       return FALSE;
+#endif
+  return false;
 }