Applied [ 594745 ] Fixes core dump under Forte 6U1 in imagbmp.cpp

[wxWidgets.git] / contrib / src / applet / applet.cpp

diff --git a/contrib/src/applet/applet.cpp b/contrib/src/applet/applet.cpp
index 0083d5ff9ded10da24ea81f12100002230f9e93f..1765f9b54e76a775c7f5637763086bccd3b79fb3 100644 (file)
--- a/contrib/src/applet/applet.cpp
+++ b/contrib/src/applet/applet.cpp
@@ -5,23 +5,19 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *

-*  ======================================================================
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  |                                                                    |
-*  |This copyrighted computer code is a proprietary trade secret of     |
-*  |SciTech Software, Inc., located at 505 Wall Street, Chico, CA 95928 |
-*  |USA (www.scitechsoft.com).  ANY UNAUTHORIZED POSSESSION, USE,       |
-*  |VIEWING, COPYING, MODIFICATION OR DISSEMINATION OF THIS CODE IS     |
-*  |STRICTLY PROHIBITED BY LAW.  Unless you have current, express       |
-*  |written authorization from SciTech to possess or use this code, you |
-*  |may be subject to civil and/or criminal penalties.                  |
-*  |                                                                    |
-*  |If you received this code in error or you would like to report      |
-*  |improper use, please immediately contact SciTech Software, Inc. at  |
-*  |530-894-8400.                                                       |
-*  |                                                                    |
-*  |REMOVAL OR MODIFICATION OF THIS HEADER IS STRICTLY PROHIBITED BY LAW|
-*  ======================================================================
+*  ========================================================================
+*
+*    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.
+*
+*  ========================================================================

 *
 * Language:     ANSI C++
 * Environment:  Any
 *
 * Language:     ANSI C++
 * Environment:  Any


@@ -30,11 +26,9 @@
 *
 ****************************************************************************/
 
 *
 ****************************************************************************/
 

-// For compilers that support precompilation
-#include "wx/wxprec.h"
-

 // Include private headers
 #include "wx/applet/applet.h"
 // Include private headers
 #include "wx/applet/applet.h"

+#include "wx/applet/window.h"

 
 /*------------------------- Implementation --------------------------------*/
 
 
 /*------------------------- Implementation --------------------------------*/
 


@@ -54,12 +48,13 @@ Psuedo virtual constructor for the wxApplet class.
 ****************************************************************************/
 bool wxApplet::Create(
     wxHtmlAppletWindow *parent,
 ****************************************************************************/
 bool wxApplet::Create(
     wxHtmlAppletWindow *parent,

+    const wxHtmlTag& ,

     const wxSize& size,
     long style)
 {
     bool ret = wxPanel::Create(parent, -1, wxDefaultPosition, size, style);
     if (ret) {
     const wxSize& size,
     long style)
 {
     bool ret = wxPanel::Create(parent, -1, wxDefaultPosition, size, style);
     if (ret) {

-        m_Parent = parent;
+        m_parent = parent;

         }
     return ret;
 }
         }
     return ret;
 }


@@ -70,7 +65,7 @@ Destructor for the wxApplet class.
 ****************************************************************************/
 wxApplet::~wxApplet()
 {
 ****************************************************************************/
 wxApplet::~wxApplet()
 {

-    m_Parent->RemoveApplet(this);           
+    ((wxHtmlAppletWindow *) m_parent)->RemoveApplet(this);

 }
 
 /****************************************************************************
 }
 
 /****************************************************************************


@@ -78,7 +73,7 @@ REMARKS:
 Special handler for background erase messages. We do nothing in here which
 causes the background to not be erased which is exactly what we want. All
 the wxApplet classes display over an HTML window, so we want the HTML
 Special handler for background erase messages. We do nothing in here which
 causes the background to not be erased which is exactly what we want. All
 the wxApplet classes display over an HTML window, so we want the HTML

-background to show through.             
+background to show through.

 ****************************************************************************/
 void wxApplet::OnEraseBackground(wxEraseEvent&)
 {
 ****************************************************************************/
 void wxApplet::OnEraseBackground(wxEraseEvent&)
 {