Added Brian Victor's Patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
// Name: display.cpp
|
// Name: display.cpp
|
||||||
// Purpose: wxWindows sample showing the features of wxDisplay class
|
// Purpose: wxWindows 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
|
// Created: 23.02.03
|
||||||
// RCS-ID: $Id$
|
// RCS-ID: $Id$
|
||||||
// Copyright: (c) Vadim Zeitlin <vadim@wxwindows.org>
|
// Copyright: (c) Vadim Zeitlin <vadim@wxwindows.org>
|
||||||
@@ -31,17 +31,28 @@
|
|||||||
// for all others, include the necessary headers explicitly
|
// for all others, include the necessary headers explicitly
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/frame.h"
|
|
||||||
|
|
||||||
#include "wx/stattext.h"
|
#include "wx/stattext.h"
|
||||||
|
|
||||||
#include "wx/layout.h"
|
#include "wx/layout.h"
|
||||||
|
#include "wx/intl.h"
|
||||||
|
#include "wx/menu.h"
|
||||||
|
#include "wx/sizer.h"
|
||||||
|
#include "wx/choice.h"
|
||||||
|
#include "wx/msgdlg.h"
|
||||||
|
#include "wx/log.h"
|
||||||
|
#include "wx/panel.h"
|
||||||
|
#include "wx/button.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/notebook.h"
|
#include "wx/notebook.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
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -195,7 +206,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
|
|||||||
: wxFrame(NULL, -1, title, pos, size, style)
|
: wxFrame(NULL, -1, title, pos, size, style)
|
||||||
{
|
{
|
||||||
// set the frame icon
|
// set the frame icon
|
||||||
SetIcon(wxICON(mondrian));
|
SetIcon(wxICON(sample));
|
||||||
|
|
||||||
#if wxUSE_MENUS
|
#if wxUSE_MENUS
|
||||||
// create a menu bar
|
// create a menu bar
|
||||||
|
Reference in New Issue
Block a user