X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c1957beb83de99ce31c17ba89a6d708645d0d65..22a3b6e4b2010f425a54708e46b1b463bd2817a7:/samples/display/display.cpp

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 9618d5e9e9..8477103b8b 100644
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -30,12 +30,13 @@
 #endif
 
 #include "wx/bookctrl.h"
+#include "wx/sysopt.h"
 
 #include "wx/display.h"
 
 
 // the application icon (under Windows and OS/2 it is in resources)
-#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) || defined(__WXMGL__) || defined(__WXX11__)
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
@@ -70,20 +71,20 @@ public:
     void OnFullScreen(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
+#if wxUSE_DISPLAY
     void OnChangeMode(wxCommandEvent& event);
     void OnResetMode(wxCommandEvent& event);
 
-    void OnLeftClick(wxMouseEvent& event);
-
-#if wxUSE_DISPLAY
     void OnDisplayChanged(wxDisplayChangedEvent& event);
-#endif
+#endif // wxUSE_DISPLAY
+
+    void OnLeftClick(wxMouseEvent& event);
 
 private:
 #if wxUSE_DISPLAY
     // convert video mode to textual description
     wxString VideoModeToText(const wxVideoMode& mode);
-#endif
+#endif // wxUSE_DISPLAY
 
     // GUI controls
     wxBookCtrl *m_book;
@@ -138,14 +139,14 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Display_FullScreen, MyFrame::OnFullScreen)
     EVT_MENU(Display_About, MyFrame::OnAbout)
 
+#if wxUSE_DISPLAY
     EVT_CHOICE(Display_ChangeMode, MyFrame::OnChangeMode)
     EVT_BUTTON(Display_ResetMode, MyFrame::OnResetMode)
 
-    EVT_LEFT_UP(MyFrame::OnLeftClick)
-
-#if wxUSE_DISPLAY
     EVT_DISPLAY_CHANGED(MyFrame::OnDisplayChanged)
-#endif
+#endif // wxUSE_DISPLAY
+
+    EVT_LEFT_UP(MyFrame::OnLeftClick)
 END_EVENT_TABLE()
 
 // Create a new application object: this macro will allow wxWidgets to create
@@ -166,15 +167,13 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
-#if !wxUSE_DISPLAY
-    wxMessageBox(_("Please recompile wxWidgets and this sample with wxUSE_DISPLAY set to 1."));
-    return false;
-#else
+    if ( !wxApp::OnInit() )
+        return false;
 
 #ifdef __WXMSW__
-    if ( argc == 2 && !wxStricmp(argv[1],  _T("/dx")) )
+    if ( argc == 2 && !wxStricmp(argv[1],  wxT("/dx")) )
     {
-        wxDisplay::UseDirectX(true);
+        wxSystemOptions::SetOption(wxT("msw.display.directdraw"), 1);
     }
 #endif // __WXMSW__
 
@@ -190,7 +189,6 @@ bool MyApp::OnInit()
     // loop and the application will run. If we returned false here, the
     // application would exit immediately.
     return true;
-#endif
 }
 
 // ----------------------------------------------------------------------------
@@ -215,7 +213,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
     // the "About" item should be in the help menu
     wxMenu *helpMenu = new wxMenu;
-    helpMenu->Append(Display_About, _("&About...\tF1"), _("Show about dialog"));
+    helpMenu->Append(Display_About, _("&About\tF1"), _("Show about dialog"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar();
@@ -231,9 +229,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     CreateStatusBar();
 #endif // wxUSE_STATUSBAR
 
-#if wxUSE_DISPLAY
     // create child controls
-
     wxPanel *panel = new wxPanel(this, wxID_ANY);
 
     m_book = new wxBookCtrl(panel, wxID_ANY);
@@ -249,28 +245,41 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
         sizer->AddGrowableCol(1);
 
         const wxRect r(display.GetGeometry());
-        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Origin: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, wxT("Origin: ")));
         sizer->Add(new wxStaticText
                        (
                         page,
                         wxID_ANY,
-                        wxString::Format(_T("(%d, %d)"),
+                        wxString::Format(wxT("(%d, %d)"),
                                          r.x, r.y)
                        ));
 
-        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Size: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, wxT("Size: ")));
         sizer->Add(new wxStaticText
                        (
                         page,
                         wxID_ANY,
-                        wxString::Format(_T("(%d, %d)"),
+                        wxString::Format(wxT("(%d, %d)"),
                                          r.width, r.height)
                        ));
 
+        const wxRect rc(display.GetClientArea());
+        sizer->Add(new wxStaticText(page, wxID_ANY, wxT("Client area: ")));
+        sizer->Add(new wxStaticText
+                       (
+                        page,
+                        wxID_ANY,
+                        wxString::Format(wxT("(%d, %d)-(%d, %d)"),
+                                         rc.x, rc.y, rc.width, rc.height)
+                       ));
 
-        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Name: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, wxT("Name: ")));
         sizer->Add(new wxStaticText(page, wxID_ANY, display.GetName()));
 
+        wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
+        sizerTop->Add(sizer, 1, wxALL | wxEXPAND, 10);
+
+#if wxUSE_DISPLAY
         wxChoice *choiceModes = new wxChoice(page, Display_ChangeMode);
         const wxArrayVideoModes modes = display.GetModes();
         const size_t count = modes.GetCount();
@@ -282,53 +291,52 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                                 new MyVideoModeClientData(mode));
         }
 
-        sizer->Add(new wxStaticText(page, wxID_ANY, _T("&Modes: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, wxT("&Modes: ")));
         sizer->Add(choiceModes, 0, wxEXPAND);
 
-        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Current: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, wxT("Current: ")));
         sizer->Add(new wxStaticText(page, Display_CurrentMode,
                                     VideoModeToText(display.GetCurrentMode())));
 
         // add it to another sizer to have borders around it and button below
-        wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
-        sizerTop->Add(sizer, 1, wxALL | wxEXPAND, 10);
-
-        sizerTop->Add(new wxButton(page, Display_ResetMode, _T("&Reset mode")),
+        sizerTop->Add(new wxButton(page, Display_ResetMode, wxT("&Reset mode")),
                       0, wxALL | wxCENTRE, 5);
+#endif // wxUSE_DISPLAY
+
         page->SetSizer(sizerTop);
 
         m_book->AddPage(page,
-                        wxString::Format(_T("Display %lu"),
+                        wxString::Format(wxT("Display %lu"),
                                          (unsigned long)nDpy));
     }
 
     wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     sizer->Add(m_book, 1, wxEXPAND);
     panel->SetSizer(sizer);
-    sizer->Fit(this);
     sizer->SetSizeHints(this);
-#endif
 }
 
 #if wxUSE_DISPLAY
+
 wxString MyFrame::VideoModeToText(const wxVideoMode& mode)
 {
     wxString s;
-    s.Printf(_T("%dx%d"), mode.w, mode.h);
+    s.Printf(wxT("%dx%d"), mode.w, mode.h);
 
     if ( mode.bpp )
     {
-        s += wxString::Format(_T(", %dbpp"), mode.bpp);
+        s += wxString::Format(wxT(", %dbpp"), mode.bpp);
     }
 
     if ( mode.refresh )
     {
-        s += wxString::Format(_T(", %dHz"), mode.refresh);
+        s += wxString::Format(wxT(", %dHz"), mode.refresh);
     }
 
     return s;
 }
-#endif
+
+#endif // wxUSE_DISPLAY
 
 // event handlers
 
@@ -340,8 +348,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("Demo program for wxDisplay class.\n\n(c) 2003 Vadim Zeitlin"),
-                 _T("About Display Sample"),
+    wxMessageBox(wxT("Demo program for wxDisplay class.\n\n(c) 2003-2006 Vadim Zeitlin"),
+                 wxT("About Display Sample"),
                  wxOK | wxICON_INFORMATION,
                  this);
 }
@@ -349,7 +357,7 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {
 #if wxUSE_STATUSBAR
-    SetStatusText(_T("Press the mouse anywhere..."));
+    SetStatusText(wxT("Press the mouse anywhere..."));
 #endif // wxUSE_STATUSBAR
 
     CaptureMouse();
@@ -360,9 +368,10 @@ void MyFrame::OnFullScreen(wxCommandEvent& event)
     ShowFullScreen(event.IsChecked());
 }
 
+#if wxUSE_DISPLAY
+
 void MyFrame::OnChangeMode(wxCommandEvent& event)
 {
-#if wxUSE_DISPLAY
     wxDisplay dpy(m_book->GetSelection());
 
     // you wouldn't write this in real code, would you?
@@ -370,23 +379,21 @@ void MyFrame::OnChangeMode(wxCommandEvent& event)
                 wxDynamicCast(event.GetEventObject(), wxChoice)->
                     GetClientObject(event.GetInt()))->mode) )
     {
-        wxLogError(_T("Changing video mode failed!"));
+        wxLogError(wxT("Changing video mode failed!"));
     }
-#endif
 }
 
 void MyFrame::OnResetMode(wxCommandEvent& WXUNUSED(event))
 {
-#if wxUSE_DISPLAY
     wxDisplay dpy(m_book->GetSelection());
 
     dpy.ResetMode();
-#endif
 }
 
+#endif // wxUSE_DISPLAY
+
 void MyFrame::OnLeftClick(wxMouseEvent& event)
 {
-#if wxUSE_DISPLAY
     if ( HasCapture() )
     {
         // mouse events are in client coords, wxDisplay works in screen ones
@@ -394,18 +401,18 @@ void MyFrame::OnLeftClick(wxMouseEvent& event)
         int dpy = wxDisplay::GetFromPoint(ptScreen);
         if ( dpy == wxNOT_FOUND )
         {
-            wxLogError(_T("Mouse clicked outside of display!?"));
+            wxLogError(wxT("Mouse clicked outside of display!?"));
         }
 
-        wxLogStatus(this, _T("Mouse clicked in display %d (at (%d, %d))"),
+        wxLogStatus(this, wxT("Mouse clicked in display %d (at (%d, %d))"),
                     dpy, ptScreen.x, ptScreen.y);
 
         ReleaseMouse();
     }
-#endif
 }
 
 #if wxUSE_DISPLAY
+
 void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 {
     // update the current mode text
@@ -419,9 +426,9 @@ void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
     }
 
 
-    wxLogStatus(this, _T("Display resolution was changed."));
+    wxLogStatus(this, wxT("Display resolution was changed."));
 
     event.Skip();
 }
-#endif
 
+#endif // wxUSE_DISPLAY