Rebake after last change.

[wxWidgets.git] / samples / display / display.cpp

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index dbe0311e6f2cf699dd1b3e28283351820a1057a2..456f75f97ef74f969b8610577f5f4615f22a3547 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        display.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        display.cpp

-// Purpose:     wxWindows sample showing the features of wxDisplay class
+// Purpose:     wxWidgets sample showing the features of wxDisplay class

 // Author:      Vadim Zeitlin
 // Author:      Vadim Zeitlin

-// Modified by:
+// Modified by: Ryan Norton & Brian Victor

 // Created:     23.02.03
 // RCS-ID:      $Id$
 // Created:     23.02.03
 // RCS-ID:      $Id$

-// Copyright:   (c) Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) Vadim Zeitlin <vadim@wxwidgets.org>

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-// for compilers that support precompilation, includes "wx/wx.h".from here
+// for compilers that support precompilation, includes "wx/wx.h"

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -26,18 +26,20 @@
 
 // for all others, include the necessary headers explicitly
 #ifndef WX_PRECOMP
 
 // for all others, include the necessary headers explicitly
 #ifndef WX_PRECOMP

-    #include "wx/app.h"
-    #include "wx/frame.h"
-
-    #include "wx/stattext.h"
-
-    #include "wx/layout.h"
+    #include "wx/wx.h"

 #endif
 
 #endif
 

-#include "wx/notebook.h"
+#include "wx/bookctrl.h"
+#include "wx/sysopt.h"

 
 #include "wx/display.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__)
+    #include "../sample.xpm"
+#endif
+

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -66,15 +68,40 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnFromPoint(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnFromPoint(wxCommandEvent& event);

+    void OnFullScreen(wxCommandEvent& event);

     void OnAbout(wxCommandEvent& event);
 
     void OnAbout(wxCommandEvent& event);
 

+#if wxUSE_DISPLAY
+    void OnChangeMode(wxCommandEvent& event);
+    void OnResetMode(wxCommandEvent& event);
+
+    void OnDisplayChanged(wxDisplayChangedEvent& event);
+#endif // wxUSE_DISPLAY
+

     void OnLeftClick(wxMouseEvent& event);
 
 private:
     void OnLeftClick(wxMouseEvent& event);
 
 private:

-    // any class wishing to process wxWindows events must use this macro
+#if wxUSE_DISPLAY
+    // convert video mode to textual description
+    wxString VideoModeToText(const wxVideoMode& mode);
+#endif // wxUSE_DISPLAY
+
+    // GUI controls
+    wxBookCtrl *m_book;
+
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

+// Client data class for the choice control containing the video modes
+class MyVideoModeClientData : public wxClientData
+{
+public:
+    MyVideoModeClientData(const wxVideoMode& m) : mode(m) { }
+
+    const wxVideoMode mode;
+};
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -83,32 +110,46 @@ private:
 enum
 {
     // menu items
 enum
 {
     // menu items

-    Display_Quit = 1,
+    Display_FromPoint = wxID_HIGHEST + 1,
+    Display_FullScreen,
+
+    // controls
+    Display_ChangeMode,
+    Display_ResetMode,
+    Display_CurrentMode,

 
 

-    Display_FromPoint,

 
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)
 
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)

+    Display_Quit = wxID_EXIT,

     Display_About = wxID_ABOUT
 };
 
 // ----------------------------------------------------------------------------
     Display_About = wxID_ABOUT
 };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event

 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Display_Quit,  MyFrame::OnQuit)
     EVT_MENU(Display_FromPoint,  MyFrame::OnFromPoint)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(Display_Quit,  MyFrame::OnQuit)
     EVT_MENU(Display_FromPoint,  MyFrame::OnFromPoint)

+    EVT_MENU(Display_FullScreen, MyFrame::OnFullScreen)

     EVT_MENU(Display_About, MyFrame::OnAbout)
 
     EVT_MENU(Display_About, MyFrame::OnAbout)
 

+#if wxUSE_DISPLAY
+    EVT_CHOICE(Display_ChangeMode, MyFrame::OnChangeMode)
+    EVT_BUTTON(Display_ResetMode, MyFrame::OnResetMode)
+
+    EVT_DISPLAY_CHANGED(MyFrame::OnDisplayChanged)
+#endif // wxUSE_DISPLAY
+

     EVT_LEFT_UP(MyFrame::OnLeftClick)
 END_EVENT_TABLE()
 
     EVT_LEFT_UP(MyFrame::OnLeftClick)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create

 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also declares the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -126,18 +167,28 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+
+#ifdef __WXMSW__
+    if ( argc == 2 && !wxStricmp(argv[1],  _T("/dx")) )
+    {
+        wxSystemOptions::SetOption(_T("msw.display.directdraw"), 1);
+    }
+#endif // __WXMSW__
+

     // create the main application window
     // create the main application window

-    MyFrame *frame = new MyFrame(_("Display wxWindows Sample"),
-                                 wxPoint(50, 50), wxSize(450, 340));
+    MyFrame *frame = new MyFrame(_("Display wxWidgets Sample"),
+                                 wxDefaultPosition, wxDefaultSize);

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)

-    frame->Show(TRUE);
+    frame->Show();

 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -146,15 +197,17 @@ bool MyApp::OnInit()
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)
 
 // frame constructor
 MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, long style)

-       : wxFrame(NULL, -1, title, pos, size, style)
+       : wxFrame(NULL, wxID_ANY, title, pos, size, style)

 {
     // set the frame icon
 {
     // set the frame icon

-    SetIcon(wxICON(mondrian));
+    SetIcon(wxICON(sample));

 
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuDisplay = new wxMenu;
 
 #if wxUSE_MENUS
     // create a menu bar
     wxMenu *menuDisplay = new wxMenu;

-    menuDisplay->Append(Display_FromPoint, _("&Find from point..."));
+    menuDisplay->Append(Display_FromPoint, _("Find from &point..."));
+    menuDisplay->AppendSeparator();
+    menuDisplay->AppendCheckItem(Display_FullScreen, _("Full &screen\tF12"));

     menuDisplay->AppendSeparator();
     menuDisplay->Append(Display_Quit, _("E&xit\tAlt-X"), _("Quit this program"));
 
     menuDisplay->AppendSeparator();
     menuDisplay->Append(Display_Quit, _("E&xit\tAlt-X"), _("Quit this program"));
 


@@ -171,78 +224,131 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 
     SetMenuBar(menuBar);
 #endif // wxUSE_MENUS
 

+#if wxUSE_STATUSBAR

     // create status bar
     CreateStatusBar();
     // create status bar
     CreateStatusBar();

+#endif // wxUSE_STATUSBAR

 
     // create child controls
 
     // create child controls

-    wxNotebook *notebook = new wxNotebook(this, -1);
+    wxPanel *panel = new wxPanel(this, wxID_ANY);
+
+    m_book = new wxBookCtrl(panel, wxID_ANY);

     const size_t count = wxDisplay::GetCount();
     const size_t count = wxDisplay::GetCount();

-    for ( size_t n = 0; n < count; n++ )
+    for ( size_t nDpy = 0; nDpy < count; nDpy++ )

     {
     {

-        wxDisplay display(n);
+        wxDisplay display(nDpy);

 
 

-        wxWindow *page = new wxPanel(notebook, -1);
+        wxWindow *page = new wxPanel(m_book, wxID_ANY);

 
         // create 2 column flex grid sizer with growable 2nd column
         wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 10, 20);
         sizer->AddGrowableCol(1);
 
         const wxRect r(display.GetGeometry());
 
         // create 2 column flex grid sizer with growable 2nd column
         wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 10, 20);
         sizer->AddGrowableCol(1);
 
         const wxRect r(display.GetGeometry());

-        sizer->Add(new wxStaticText(page, -1, _T("Origin: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Origin: ")));

         sizer->Add(new wxStaticText
                        (
                         page,
         sizer->Add(new wxStaticText
                        (
                         page,

-                        -1,
+                        wxID_ANY,

                         wxString::Format(_T("(%d, %d)"),
                                          r.x, r.y)
                        ));
 
                         wxString::Format(_T("(%d, %d)"),
                                          r.x, r.y)
                        ));
 

-        sizer->Add(new wxStaticText(page, -1, _T("Size: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Size: ")));

         sizer->Add(new wxStaticText
                        (
                         page,
         sizer->Add(new wxStaticText
                        (
                         page,

-                        -1,
+                        wxID_ANY,

                         wxString::Format(_T("(%d, %d)"),
                                          r.width, r.height)
                        ));
 
                         wxString::Format(_T("(%d, %d)"),
                                          r.width, r.height)
                        ));
 

-        sizer->Add(new wxStaticText(page, -1, _T("Depth: ")));
+        const wxRect rc(display.GetClientArea());
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Client area: ")));

         sizer->Add(new wxStaticText
                        (
                         page,
         sizer->Add(new wxStaticText
                        (
                         page,

-                        -1,
-                        wxString::Format(_T("%d bpp"), display.GetDepth())
+                        wxID_ANY,
+                        wxString::Format(_T("(%d, %d)-(%d, %d)"),
+                                         rc.x, rc.y, rc.width, rc.height)

                        ));
 
                        ));
 

-        sizer->Add(new wxStaticText(page, -1, _T("Name: ")));
-        sizer->Add(new wxStaticText(page, -1, display.GetName()));
-
-        sizer->Add(new wxStaticText(page, -1, _T("Colour: ")));
-        sizer->Add(new wxStaticText(page, -1, display.IsColour() ? _T("Yes")
-                                                                 : _T("No")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Name: ")));
+        sizer->Add(new wxStaticText(page, wxID_ANY, display.GetName()));

 
 

-        // add it to another sizer to have borders around it

         wxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
         sizerTop->Add(sizer, 1, wxALL | wxEXPAND, 10);
         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();
+        for ( size_t nMode = 0; nMode < count; nMode++ )
+        {
+            const wxVideoMode& mode = modes[nMode];
+
+            choiceModes->Append(VideoModeToText(mode),
+                                new MyVideoModeClientData(mode));
+        }
+
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("&Modes: ")));
+        sizer->Add(choiceModes, 0, wxEXPAND);
+
+        sizer->Add(new wxStaticText(page, wxID_ANY, _T("Current: ")));
+        sizer->Add(new wxStaticText(page, Display_CurrentMode,
+                                    VideoModeToText(display.GetCurrentMode())));
+
+        // add it to another sizer to have borders around it and button below
+        sizerTop->Add(new wxButton(page, Display_ResetMode, _T("&Reset mode")),
+                      0, wxALL | wxCENTRE, 5);
+#endif // wxUSE_DISPLAY
+

         page->SetSizer(sizerTop);
 
         page->SetSizer(sizerTop);
 

-        notebook->AddPage(page,
-                          wxString::Format(_T("Display %lu"), (unsigned long)n));
+        m_book->AddPage(page,
+                        wxString::Format(_T("Display %lu"),
+                                         (unsigned long)nDpy));
+    }
+
+    wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
+    sizer->Add(m_book, 1, wxEXPAND);
+    panel->SetSizer(sizer);
+    sizer->SetSizeHints(this);
+}
+
+#if wxUSE_DISPLAY
+
+wxString MyFrame::VideoModeToText(const wxVideoMode& mode)
+{
+    wxString s;
+    s.Printf(_T("%dx%d"), mode.w, mode.h);
+
+    if ( mode.bpp )
+    {
+        s += wxString::Format(_T(", %dbpp"), mode.bpp);
+    }
+
+    if ( mode.refresh )
+    {
+        s += wxString::Format(_T(", %dHz"), mode.refresh);

     }
     }

+
+    return s;

 }
 
 }
 

+#endif // wxUSE_DISPLAY

 
 // event handlers
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 // event handlers
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    // TRUE is to force the frame to close
-    Close(TRUE);
+    // true is to force the frame to close
+    Close(true);

 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {

-    wxMessageBox(_T("Demo program for wxDisplay class.\n\n(c) 2003 Vadim Zeitlin"),
+    wxMessageBox(_T("Demo program for wxDisplay class.\n\n(c) 2003-2006 Vadim Zeitlin"),

                  _T("About Display Sample"),
                  wxOK | wxICON_INFORMATION,
                  this);
                  _T("About Display Sample"),
                  wxOK | wxICON_INFORMATION,
                  this);


@@ -250,11 +356,42 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
 {

+#if wxUSE_STATUSBAR

     SetStatusText(_T("Press the mouse anywhere..."));
     SetStatusText(_T("Press the mouse anywhere..."));

+#endif // wxUSE_STATUSBAR

 
     CaptureMouse();
 }
 
 
     CaptureMouse();
 }
 

+void MyFrame::OnFullScreen(wxCommandEvent& event)
+{
+    ShowFullScreen(event.IsChecked());
+}
+
+#if wxUSE_DISPLAY
+
+void MyFrame::OnChangeMode(wxCommandEvent& event)
+{
+    wxDisplay dpy(m_book->GetSelection());
+
+    // you wouldn't write this in real code, would you?
+    if ( !dpy.ChangeMode(((MyVideoModeClientData *)
+                wxDynamicCast(event.GetEventObject(), wxChoice)->
+                    GetClientObject(event.GetInt()))->mode) )
+    {
+        wxLogError(_T("Changing video mode failed!"));
+    }
+}
+
+void MyFrame::OnResetMode(wxCommandEvent& WXUNUSED(event))
+{
+    wxDisplay dpy(m_book->GetSelection());
+
+    dpy.ResetMode();
+}
+
+#endif // wxUSE_DISPLAY
+

 void MyFrame::OnLeftClick(wxMouseEvent& event)
 {
     if ( HasCapture() )
 void MyFrame::OnLeftClick(wxMouseEvent& event)
 {
     if ( HasCapture() )


@@ -264,7 +401,7 @@ void MyFrame::OnLeftClick(wxMouseEvent& event)
         int dpy = wxDisplay::GetFromPoint(ptScreen);
         if ( dpy == wxNOT_FOUND )
         {
         int dpy = wxDisplay::GetFromPoint(ptScreen);
         if ( dpy == wxNOT_FOUND )
         {

-            wxLogError(_T("Mouse clicked outside of display!!"));
+            wxLogError(_T("Mouse clicked outside of display!?"));

         }
 
         wxLogStatus(this, _T("Mouse clicked in display %d (at (%d, %d))"),
         }
 
         wxLogStatus(this, _T("Mouse clicked in display %d (at (%d, %d))"),


@@ -274,3 +411,24 @@ void MyFrame::OnLeftClick(wxMouseEvent& event)
     }
 }
 
     }
 }
 

+#if wxUSE_DISPLAY
+
+void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
+{
+    // update the current mode text
+    for ( size_t n = 0; n < m_book->GetPageCount(); n++ )
+    {
+        wxStaticText *label = wxDynamicCast(m_book->GetPage(n)->
+                                                FindWindow(Display_CurrentMode),
+                                            wxStaticText);
+        if ( label )
+            label->SetLabel(VideoModeToText(wxDisplay(n).GetCurrentMode()));
+    }
+
+
+    wxLogStatus(this, _T("Display resolution was changed."));
+
+    event.Skip();
+}
+
+#endif // wxUSE_DISPLAY