X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a536e411022b21280532c9daadc806a437fbb4c6..55325d01e68cfb071e42699ca72ba84a7071aa2b:/samples/multimon/multimon_test.cpp?ds=sidebyside diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp index 6d51f3cf88..8557897355 100644 --- 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$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#include -#define wxUSE_DISPLAY 1 -#include +#include "wx/wx.h" +#include "wx/display.h" class TestApp : public wxApp { - bool OnInit(); + bool OnInit(); }; DECLARE_APP(TestApp) @@ -23,17 +22,33 @@ IMPLEMENT_APP(TestApp) 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; + 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 ( _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.GetCurrentMode().GetDepth() ); + i++; + } + } +#endif + return false; }