/////////////////////////////////////////////////////////////////////////////
// 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 <vadim@wxwindows.org>
+// Copyright: (c) Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// 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__
// 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
// ----------------------------------------------------------------------------
// GUI controls
wxNotebook *m_notebook;
- // any class wishing to process wxWindows events must use this macro
+ // any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
};
};
// ----------------------------------------------------------------------------
-// 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_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
// '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();
// 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;
}
// ----------------------------------------------------------------------------
// 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
SetMenuBar(menuBar);
#endif // wxUSE_MENUS
+#if wxUSE_STATUSBAR
// create status bar
CreateStatusBar();
+#endif // wxUSE_STATUSBAR
// create child controls
- m_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 nDpy = 0; nDpy < count; nDpy++ )
{
wxDisplay display(nDpy);
- wxWindow *page = new wxPanel(m_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("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();
new MyVideoModeClientData(mode));
}
- sizer->Add(new wxStaticText(page, -1, _T("&Modes: ")));
+ sizer->Add(new wxStaticText(page, wxID_ANY, _T("&Modes: ")));
sizer->Add(choiceModes, 0, wxEXPAND);
- sizer->Add(new wxStaticText(page, -1, _T("Current: ")));
+ 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
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);
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)
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))
{
- wxDisplay dpy(1);
- if ( !dpy.ChangeMode(wxVideoMode(800, 600)) )
- {
- wxLogError("Failed!");
- return;
- }
-
wxMessageBox(_T("Demo program for wxDisplay class.\n\n(c) 2003 Vadim Zeitlin"),
_T("About Display Sample"),
wxOK | wxICON_INFORMATION,
void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
{
+#if wxUSE_STATUSBAR
SetStatusText(_T("Press the mouse anywhere..."));
+#endif // wxUSE_STATUSBAR
CaptureMouse();
}
void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
{
// update the current mode text
- for ( int n = 0; n < m_notebook->GetPageCount(); n++ )
+ for ( size_t n = 0; n < m_notebook->GetPageCount(); n++ )
{
wxStaticText *label = wxDynamicCast(m_notebook->GetPage(n)->
FindWindow(Display_CurrentMode),
projects / wxWidgets.git / blobdiff