Removed ambiguity between deprecated and new constructor.

[wxWidgets.git] / contrib / samples / applet / monitorapplet.h

diff --git a/contrib/samples/applet/monitorapplet.h b/contrib/samples/applet/monitorapplet.h
index a2fea2d98a82e09a6535f0f7a3e70c11285dd1d1..0ab778ab4a5c659622631ba8835caee41e93450a 100644 (file)
--- a/contrib/samples/applet/monitorapplet.h
+++ b/contrib/samples/applet/monitorapplet.h
@@ -1,25 +1,23 @@
 /****************************************************************************
 *
 /****************************************************************************
 *

+*                       wxWindows HTML Applet Package
+*

 *               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


@@ -56,9 +54,9 @@ public:
     MonitorEntry    m_Monitor;
     };
 
     MonitorEntry    m_Monitor;
     };
 

-// Name used to track the monitor data cookie   
-#define MONITOR_COOKIE_NAME "MonitorData"   
-    
+// Name used to track the monitor data cookie
+#define MONITOR_COOKIE_NAME "MonitorData"
+

 /****************************************************************************
 REMARKS:
 Defines our wxMonitor applet class
 /****************************************************************************
 REMARKS:
 Defines our wxMonitor applet class


@@ -67,16 +65,16 @@ class MonitorApplet : public wxApplet {
 private:
     DECLARE_DYNAMIC_CLASS(MonitorApplet);
     DECLARE_EVENT_TABLE();
 private:
     DECLARE_DYNAMIC_CLASS(MonitorApplet);
     DECLARE_EVENT_TABLE();

-    
+

 protected:
 protected:

-    ComboBox            *m_Mfr;             
+    ComboBox            *m_Mfr;

     ComboBox            *m_Model;
     ComboBox            *m_Model;

-    MonitorData         *m_Data;    
+    MonitorData         *m_Data;

     static MonitorEntry m_Monitors[];
     static MonitorEntry m_Monitors[];

-    
+

             // Flush the current state to a cookie
             void SaveCurrentState();
             // Flush the current state to a cookie
             void SaveCurrentState();

-            
+

 public:
             // Constructor (called during dynamic creation)
             MonitorApplet();
 public:
             // Constructor (called during dynamic creation)
             MonitorApplet();


@@ -86,19 +84,19 @@ public:
                 wxHtmlAppletWindow *parent,
                 const wxSize& size,
                 long style);
                 wxHtmlAppletWindow *parent,
                 const wxSize& size,
                 long style);

-                
+

             // Virtual destructor
     virtual ~MonitorApplet();
 
             // Handle HTML navigation to a new URL
             // Virtual destructor
     virtual ~MonitorApplet();
 
             // Handle HTML navigation to a new URL

-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link); 
-            
+    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
+

             // Handle HTML navigation forward command in applet
     virtual void OnHistoryForward();
             // Handle HTML navigation forward command in applet
     virtual void OnHistoryForward();

-            
+

             // Handle HTML navigation back command in applet
     virtual void OnHistoryBack();
             // Handle HTML navigation back command in applet
     virtual void OnHistoryBack();

-            
+

             // Handle messages from the wxAppletManager and other applets
     virtual void OnMessage(wxEvent& msg);
 
             // Handle messages from the wxAppletManager and other applets
     virtual void OnMessage(wxEvent& msg);
 


@@ -106,9 +104,9 @@ public:
             void ReadMfrList();
             void ReadModelList(bool selectCurrent);
 
             void ReadMfrList();
             void ReadModelList(bool selectCurrent);
 

-            // Event handlers   
+            // Event handlers

             void OnChange(wxCommandEvent &event);
     };
             void OnChange(wxCommandEvent &event);
     };

-    
+

 #endif // __WX_MONITORAPPLET_H
 
 #endif // __WX_MONITORAPPLET_H