changes wxDirExists() to accept wxString instead of wxChar*, so that it can be used...

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

diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp
index 6d51f3cf88c5f97e4c1126cc27b9044dd2204016..2347e7fdb329690a5712619644f0446e8b67075d 100644 (file)
--- a/samples/multimon/multimon_test.cpp
+++ b/samples/multimon/multimon_test.cpp
@@ -5,17 +5,16 @@
 // Modified by:
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     06/21/02
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include <wx/wx.h>
-#define wxUSE_DISPLAY 1
-#include <wx/display.h>
+#include "wx/wx.h"
+#include "wx/display.h"

 
 class TestApp : public wxApp
 {
 
 class TestApp : public wxApp
 {

-       bool OnInit();
+    bool OnInit();

 };
 
 DECLARE_APP(TestApp)
 };
 
 DECLARE_APP(TestApp)


@@ -23,17 +22,34 @@ IMPLEMENT_APP(TestApp)
 
 bool TestApp::OnInit()
 {
 
 bool TestApp::OnInit()
 {

-       size_t count = wxDisplay::GetCount();
-       wxLogDebug ( "I detected %i display(s) on your system", count );
-       size_t i = 0;
-       while ( i < count )
-       {
-               wxDisplay display ( i );
-               wxRect r = display.GetGeometry();
-               wxLogDebug ( "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++;
-       }
-       return FALSE;
+  if ( !wxApp::OnInit() )
+      return false;
+
+  bool is_use_display =
+                        #if wxUSE_DISPLAY
+                        true
+                        #else
+                        false
+                        #endif
+                        ;
+  if( !is_use_display )
+  {
+    wxMessageBox( _T("This sample has to be compiled with wxUSE_DISPLAY"), _T("Building error"), wxOK);
+  }
+#if wxUSE_DISPLAY
+  else
+  {
+    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;

 }
 }