Commited latest SciTech changes into CVS. This includes updates to the
applet code (with changes copyright headers) as well as updates to the wxImage and dib.cpp modules to use virtual file systems so that we can load these objects from ZIP files correctly. The dib.cpp module was also extensively cleaned up (although the DIB writing code does not presently use file streams as we couldn't figure out if it was possible to write to a ZIP file stream). The code has been tested and functions correctly for both regular files and ZIP files. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,25 +1,23 @@
|
||||
/****************************************************************************
|
||||
*
|
||||
* wxWindows HTML Applet Package
|
||||
*
|
||||
* 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
|
||||
@@ -56,9 +54,9 @@ public:
|
||||
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
|
||||
@@ -67,16 +65,16 @@ class MonitorApplet : public wxApplet {
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(MonitorApplet);
|
||||
DECLARE_EVENT_TABLE();
|
||||
|
||||
|
||||
protected:
|
||||
ComboBox *m_Mfr;
|
||||
ComboBox *m_Mfr;
|
||||
ComboBox *m_Model;
|
||||
MonitorData *m_Data;
|
||||
MonitorData *m_Data;
|
||||
static MonitorEntry m_Monitors[];
|
||||
|
||||
|
||||
// Flush the current state to a cookie
|
||||
void SaveCurrentState();
|
||||
|
||||
|
||||
public:
|
||||
// Constructor (called during dynamic creation)
|
||||
MonitorApplet();
|
||||
@@ -86,19 +84,19 @@ public:
|
||||
wxHtmlAppletWindow *parent,
|
||||
const wxSize& size,
|
||||
long style);
|
||||
|
||||
|
||||
// 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 back command in applet
|
||||
virtual void OnHistoryBack();
|
||||
|
||||
|
||||
// Handle messages from the wxAppletManager and other applets
|
||||
virtual void OnMessage(wxEvent& msg);
|
||||
|
||||
@@ -106,9 +104,9 @@ public:
|
||||
void ReadMfrList();
|
||||
void ReadModelList(bool selectCurrent);
|
||||
|
||||
// Event handlers
|
||||
// Event handlers
|
||||
void OnChange(wxCommandEvent &event);
|
||||
};
|
||||
|
||||
|
||||
#endif // __WX_MONITORAPPLET_H
|
||||
|
||||
|
Reference in New Issue
Block a user