From 25088f1eea365f0da7aeb565932dd4fe0fd5d20e Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 11 Sep 2003 10:01:27 +0000
Subject: [PATCH] Applied patch [ 795491 ] Multimon sample compatibility with
 various conditions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23504 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/multimon/multimon_test.cpp | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp
index 6d51f3cf88..a3fb1f938b 100644
--- a/samples/multimon/multimon_test.cpp
+++ b/samples/multimon/multimon_test.cpp
@@ -10,7 +10,6 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <wx/wx.h>
-#define wxUSE_DISPLAY 1
 #include <wx/display.h>
 
 class TestApp : public wxApp
@@ -23,17 +22,33 @@ IMPLEMENT_APP(TestApp)
 
 bool TestApp::OnInit()
 {
+  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
+  {
 	size_t count = wxDisplay::GetCount();
-	wxLogDebug ( "I detected %i display(s) on your system", count );
+    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 ( "Display #%i \"%s\" = ( %i, %i, %i, %i ) @ %i bits",
+      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++;
 	}
+  }
+  #endif
 	return FALSE;
 }