X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26ffe1fdba1c3b11bb6b870fc477ac460bf6bd17..667e2c55eab8820efc2e7dc06611724641e9bcf3:/contrib/samples/applet/applet.cpp?ds=sidebyside diff --git a/contrib/samples/applet/applet.cpp b/contrib/samples/applet/applet.cpp index c643edc12e..16fb1fb66c 100644 --- a/contrib/samples/applet/applet.cpp +++ b/contrib/samples/applet/applet.cpp @@ -2,22 +2,21 @@ * * wxWindows HTML Applet Package * +* Copyright (C) 1991-2001 SciTech Software, Inc. +* All rights reserved. +* * ======================================================================== * -* The contents of this file are subject to the wxWindows licence; you -* may not use this file except in compliance with the License. You may -* obtain a copy of the License at http://www.wxwindows.org/licence.htm +* The contents of this file are subject to the wxWindows License +* Version 3.0 (the "License"); you may not use this file except in +* compliance with the License. You may obtain a copy of the License at +* http://www.wxwindows.org/licence3.txt * * Software distributed under the License is distributed on an * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or * implied. See the License for the specific language governing * rights and limitations under the License. * -* The Original Code is Copyright (C) 2001 SciTech Software, Inc. -* -* The Initial Developer of the Original Code is SciTech Software, Inc. -* All Rights Reserved. -* * ======================================================================== * * Language: ANSI C++ @@ -28,10 +27,12 @@ ****************************************************************************/ // For compilers that support precompilation, includes "wx/wx.h". -#include +#include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif + +#include "wx/wx.h" #include "wx/applet/window.h" #include "applet.h" @@ -75,17 +76,17 @@ MyFrame::MyFrame( menuFile->Append(Minimal_Quit, "E&xit"); menuNav->Append(Minimal_Back, "Go &back"); menuNav->Append(Minimal_Forward, "Go &forward"); - + // Now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(menuFile, "&File"); menuBar->Append(menuNav, "&Navigate"); - + // ... and attach this menu bar to the frame SetMenuBar(menuBar); CreateStatusBar(2); - // Create the HTML window + // Create the HTML window html = new wxHtmlAppletWindow(this); html->SetRelatedFrame(this, "wxApplet Demo: '%s'"); html->SetRelatedStatusBar(1);