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 6ac0fcc72b46ce379c26904ea4b65aaac46785cd..470c1091c7a38b6fe0390c39279ef453797f37f8 100644 (file)
--- a/contrib/include/wx/applet/window.h
+++ b/contrib/include/wx/applet/window.h
@@ -34,6 +34,7 @@
 #define __WX_APPLET_WINDOW_H
 
 #include "wx/html/htmlwin.h"
+#include "wx/process.h"
 
 // Forward declare
 class wxApplet;
@@ -85,6 +86,7 @@ private:
     DECLARE_CLASS(wxHtmlAppletWindow);
     DECLARE_EVENT_TABLE();
 
+    bool m_mutexLock;
     wxIncludePrep *incPreprocessor;  // deleted by list it is added too in constructor
 protected:
        wxAppletList            m_AppletList;           
@@ -92,7 +94,7 @@ protected:
     wxToolBarBase       *m_NavBar;
     int                 m_NavBackId;
     int                 m_NavForwardId;
-               
+       wxString            m_DocRoot;  
 public:
             // Constructor
             wxHtmlAppletWindow(
@@ -104,7 +106,8 @@ public:
                 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();
@@ -138,13 +141,13 @@ public:
             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
-            bool UnRegisterCookie(const wxString& name);
+            static bool UnRegisterCookie(const wxString& 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);
@@ -152,7 +155,37 @@ public:
             // Event handlers to load a new page       
                void OnPageLoaded(wxPageLoadedEvent &event);
 
+            // LoadPage mutex locks
+            void Lock(){ m_mutexLock = true;};
+            void UnLock(){ m_mutexLock = false;};
+
+            // Returns TRUE if the mutex is locked, FALSE otherwise.
+            bool IsLocked(){ return m_mutexLock;};
+
+            // 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