Warning fixes, source cleaning.

[wxWidgets.git] / contrib / include / wx / applet / applet.h

diff --git a/contrib/include/wx/applet/applet.h b/contrib/include/wx/applet/applet.h
index 60bc247cbf7d193a13dfeb33547fe8e46c5c9821..42c8e18dde8e40b8ab66c25028709a73250073db 100644 (file)
--- a/contrib/include/wx/applet/applet.h
+++ b/contrib/include/wx/applet/applet.h
@@ -5,23 +5,19 @@
 *               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
@@ -34,8 +30,11 @@
 #define __WX_APPLET_H
 
 #include "wx/panel.h"
-#include "wx/applet/window.h"
+#include "wx/html/htmlwin.h"
 
+// Forward declaration
+class wxHtmlAppletWindow;
+class wxAppletEvent;
 /*--------------------------- Class Definitions ---------------------------*/
 
 /****************************************************************************
@@ -45,39 +44,42 @@ Defines the abstract base class for wxApplet objects.
 class wxApplet : public wxPanel {
 private:
     DECLARE_ABSTRACT_CLASS(wxApplet);
-    DECLARE_EVENT_TABLE();
-    
+    DECLARE_EVENT_TABLE()
+
 protected:
-    wxHtmlAppletWindow  *m_Parent;
+    //wxHtmlAppletWindow  *m_parent;
 
-            // Special handler for background erase messages            
+            // Special handler for background erase messages
             void OnEraseBackground(wxEraseEvent&);
-        
+
 public:
             // Constructor (called during dynamic creation)
-            wxApplet() { m_Parent = NULL; }
-    
+            wxApplet() { m_parent = NULL; };
+
             // Psuedo virtual constructor
     virtual bool Create(
                 wxHtmlAppletWindow *parent,
+                const wxHtmlTag& params,
                 const wxSize& size,
                 long style = wxTAB_TRAVERSAL | wxNO_BORDER);
-                
+
             // Virtual destructor
     virtual ~wxApplet();
 
             // Handle HTML navigation to a new URL
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0; 
-            
+    virtual void OnLinkClicked(const wxHtmlLinkInfo& link) = 0;
+
             // Handle HTML navigation forward command in applet
     virtual void OnHistoryForward() = 0;
-            
+
             // Handle HTML navigation back command in applet
     virtual void OnHistoryBack() = 0;
-            
+
             // Handle messages from the wxAppletManager and other applets
-    virtual void OnMessage(wxEvent& msg) = 0;
+    virtual void OnMessage(wxAppletEvent& msg) = 0;
     };
-    
+
+
+
 #endif // __WX_APPLET_H