X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9b77bccb03eb81cfd800366837bd62d3226b0b5..c687b303a5040da07009ea93504121aeec56682a:/samples/display/display.cpp?ds=sidebyside diff --git a/samples/display/display.cpp b/samples/display/display.cpp index dbe0311e6f..2a0b0bc082 100644 --- a/samples/display/display.cpp +++ b/samples/display/display.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Name: display.cpp -// Purpose: wxWindows sample showing the features of wxDisplay class +// Purpose: wxWidgets sample showing the features of wxDisplay class // Author: Vadim Zeitlin -// Modified by: +// Modified by: Ryan Norton & Brian Victor // Created: 23.02.03 // RCS-ID: $Id$ -// Copyright: (c) Vadim Zeitlin +// Copyright: (c) Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ // 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__ @@ -26,18 +26,23 @@ // 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/wx.h" +#endif - #include "wx/layout.h" +#if !wxUSE_DISPLAY + #error "To compile this sample you must build the library with wxUSE_DISPLAY set to 1" #endif #include "wx/notebook.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 // ---------------------------------------------------------------------------- @@ -66,15 +71,36 @@ public: // 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 OnChangeMode(wxCommandEvent& event); + void OnResetMode(wxCommandEvent& event); + void OnLeftClick(wxMouseEvent& event); + void OnDisplayChanged(wxDisplayChangedEvent& event); + private: - // any class wishing to process wxWindows events must use this macro + // convert video mode to textual description + wxString VideoModeToText(const wxVideoMode& mode); + + // GUI controls + wxNotebook *m_notebook; + + // any class wishing to process wxWidgets events must use this macro 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 // ---------------------------------------------------------------------------- @@ -86,6 +112,13 @@ enum Display_Quit = 1, Display_FromPoint, + Display_FullScreen, + + // controls + Display_ChangeMode = 1000, + Display_ResetMode, + Display_CurrentMode, + // 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 @@ -94,21 +127,28 @@ enum }; // ---------------------------------------------------------------------------- -// 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) + EVT_MENU(Display_FullScreen, MyFrame::OnFullScreen) EVT_MENU(Display_About, MyFrame::OnAbout) + EVT_CHOICE(Display_ChangeMode, MyFrame::OnChangeMode) + EVT_BUTTON(Display_ResetMode, MyFrame::OnResetMode) + EVT_LEFT_UP(MyFrame::OnLeftClick) + + + EVT_DISPLAY_CHANGED(MyFrame::OnDisplayChanged) 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 @@ -126,18 +166,25 @@ IMPLEMENT_APP(MyApp) // 'Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { +#ifdef __WXMSW__ + if ( argc == 2 && !wxStricmp(argv[1], _T("/dx")) ) + { + wxDisplay::UseDirectX(true); + } +#endif // __WXMSW__ + // 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) - frame->Show(TRUE); + frame->Show(); // 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. - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -146,15 +193,17 @@ bool MyApp::OnInit() // 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 - SetIcon(wxICON(mondrian)); + SetIcon(wxICON(sample)); #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")); @@ -171,73 +220,112 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size, SetMenuBar(menuBar); #endif // wxUSE_MENUS +#if wxUSE_STATUSBAR // create status bar CreateStatusBar(); +#endif // wxUSE_STATUSBAR // create child controls - wxNotebook *notebook = new wxNotebook(this, -1); + + wxPanel *panel = new wxPanel(this, wxID_ANY); + + m_notebook = new wxNotebook(panel, wxID_ANY); 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_notebook, 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()); - sizer->Add(new wxStaticText(page, -1, _T("Origin: "))); + sizer->Add(new wxStaticText(page, wxID_ANY, _T("Origin: "))); sizer->Add(new wxStaticText ( page, - -1, + wxID_ANY, 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, - -1, + wxID_ANY, wxString::Format(_T("(%d, %d)"), r.width, r.height) )); - sizer->Add(new wxStaticText(page, -1, _T("Depth: "))); - sizer->Add(new wxStaticText - ( - page, - -1, - wxString::Format(_T("%d bpp"), display.GetDepth()) - )); - sizer->Add(new wxStaticText(page, -1, _T("Name: "))); - sizer->Add(new wxStaticText(page, -1, display.GetName())); + sizer->Add(new wxStaticText(page, wxID_ANY, _T("Name: "))); + sizer->Add(new wxStaticText(page, wxID_ANY, display.GetName())); + + 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, -1, _T("Colour: "))); - sizer->Add(new wxStaticText(page, -1, display.IsColour() ? _T("Yes") - : _T("No"))); + 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 + // 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")), + 0, wxALL | wxCENTRE, 5); page->SetSizer(sizerTop); - notebook->AddPage(page, - wxString::Format(_T("Display %lu"), (unsigned long)n)); + m_notebook->AddPage(page, + wxString::Format(_T("Display %lu"), + (unsigned long)nDpy)); } + + wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL); + sizer->Add(m_notebook, 1, wxEXPAND); + panel->SetSizer(sizer); + sizer->Fit(this); + sizer->SetSizeHints(this); } +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; +} // 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)) @@ -250,11 +338,38 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event)) { +#if wxUSE_STATUSBAR SetStatusText(_T("Press the mouse anywhere...")); +#endif // wxUSE_STATUSBAR CaptureMouse(); } +void MyFrame::OnFullScreen(wxCommandEvent& event) +{ + ShowFullScreen(event.IsChecked()); +} + +void MyFrame::OnChangeMode(wxCommandEvent& event) +{ + wxDisplay dpy(m_notebook->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_notebook->GetSelection()); + + dpy.ResetMode(); +} + void MyFrame::OnLeftClick(wxMouseEvent& event) { if ( HasCapture() ) @@ -264,7 +379,7 @@ void MyFrame::OnLeftClick(wxMouseEvent& event) 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))"), @@ -274,3 +389,21 @@ void MyFrame::OnLeftClick(wxMouseEvent& event) } } +void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event) +{ + // update the current mode text + for ( size_t n = 0; n < m_notebook->GetPageCount(); n++ ) + { + wxStaticText *label = wxDynamicCast(m_notebook->GetPage(n)-> + FindWindow(Display_CurrentMode), + wxStaticText); + if ( label ) + label->SetLabel(VideoModeToText(wxDisplay(n).GetCurrentMode())); + } + + + wxLogStatus(this, _T("Display resolution was changed.")); + + event.Skip(); +} +