added missing refresh when changing focus in wxListCtrl, added test for it in the...

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

diff --git a/contrib/include/wx/applet/window.h b/contrib/include/wx/applet/window.h
index 97ff94d86954a527e73da3348f590f577862fbdb..470c1091c7a38b6fe0390c39279ef453797f37f8 100644 (file)
--- a/contrib/include/wx/applet/window.h
+++ b/contrib/include/wx/applet/window.h
@@ -5,19 +5,23 @@
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *
 *               Copyright (C) 1991-2001 SciTech Software, Inc.
 *                            All rights reserved.
 *

-*  ========================================================================
-*
-*    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.
-*
-*  ========================================================================
+*  ======================================================================
+*  |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|
+*  ======================================================================

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


@@ -30,6 +34,7 @@
 #define __WX_APPLET_WINDOW_H
 
 #include "wx/html/htmlwin.h"
 #define __WX_APPLET_WINDOW_H
 
 #include "wx/html/htmlwin.h"

+#include "wx/process.h"

 
 // Forward declare
 class wxApplet;
 
 // Forward declare
 class wxApplet;


@@ -89,7 +94,7 @@ protected:
     wxToolBarBase       *m_NavBar;
     int                 m_NavBackId;
     int                 m_NavForwardId;
     wxToolBarBase       *m_NavBar;
     int                 m_NavBackId;
     int                 m_NavForwardId;

-               
+       wxString            m_DocRoot;  

 public:
             // Constructor
             wxHtmlAppletWindow(
 public:
             // Constructor
             wxHtmlAppletWindow(


@@ -101,7 +106,8 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHW_SCROLLBAR_AUTO,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxHW_SCROLLBAR_AUTO,

-                const wxString& name = "htmlAppletWindow");
+                const wxString& name = "htmlAppletWindow",
+                const wxString& docroot = "" );

 
             // Destructor
             ~wxHtmlAppletWindow();
 
             // Destructor
             ~wxHtmlAppletWindow();


@@ -135,13 +141,13 @@ public:
             void SendMessage(wxEvent& msg);
 
             // Register a cookie of data in the applet manager
             void SendMessage(wxEvent& msg);
 
             // Register a cookie of data in the applet manager

-            bool RegisterCookie(const wxString& name,wxObject *cookie);
+            static bool RegisterCookie(const wxString& name,wxObject *cookie);

 
             // UnRegister a cookie of data in the applet manager
 
             // UnRegister a cookie of data in the applet manager

-            bool UnRegisterCookie(const wxString& name);
+            static bool UnRegisterCookie(const wxString& name);

 
             // Find a cookie of data given it's public name
 
             // Find a cookie of data given it's public name

-            wxObject *FindCookie(const wxString& name);
+            static wxObject *FindCookie(const wxString& name);

                        
             // Event handlers to load a new page       
                        void OnLoadPage(wxLoadPageEvent &event);
                        
             // Event handlers to load a new page       
                        void OnLoadPage(wxLoadPageEvent &event);


@@ -150,16 +156,36 @@ public:
                void OnPageLoaded(wxPageLoadedEvent &event);
 
             // LoadPage mutex locks
                void OnPageLoaded(wxPageLoadedEvent &event);
 
             // LoadPage mutex locks

-            void Lock() { m_mutexLock = true;};
-            void UnLock() { m_mutexLock = false;};
+            void Lock(){ m_mutexLock = true;};
+            void UnLock(){ m_mutexLock = false;};

 
             // Returns TRUE if the mutex is locked, FALSE otherwise.
 
             // Returns TRUE if the mutex is locked, FALSE otherwise.

-            bool IsLocked() { return m_mutexLock;};
+            bool IsLocked(){ return m_mutexLock;};

 
             // Tries to lock the mutex. If it can't, returns immediately with false.
             bool TryLock();
 
     };
 
 
             // Tries to lock the mutex. If it can't, returns immediately with false.
             bool TryLock();
 
     };
 

+/****************************************************************************
+REMARKS:
+Defines the class for AppetProcess
+***************************************************************************/
+class AppletProcess : public wxProcess {
+public:
+            AppletProcess(
+                wxWindow *parent)
+                : wxProcess(parent)
+            {
+            }
+
+            // instead of overriding this virtual function we might as well process the
+            // event from it in the frame class - this might be more convenient in some
+            // cases
+    virtual void OnTerminate(int pid, int status);
+
+    };
+
+

 #endif // __WX_APPLET_WINDOW_H
 
 #endif // __WX_APPLET_WINDOW_H