use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/multimon/multimon_test.cpp b/samples/multimon/multimon_test.cpp
index 6d51f3cf88c5f97e4c1126cc27b9044dd2204016..3ddf4e93b451c09a6d319c8c85453fa69348ab7e 100644 (file)
--- a/samples/multimon/multimon_test.cpp
+++ b/samples/multimon/multimon_test.cpp
@@ -5,12 +5,11 @@
 // Modified by:
 // Created:     06/21/02
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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() );
+                       display.GetCurrentMode().GetDepth() );
                i++;
        }
-       return FALSE;
+  }
+  #endif
+       return false;
 }