fixed deadlock when calling wxPostEvent() from worker thread

[wxWidgets.git] / wxPython / src / webkit.i

diff --git a/wxPython/src/webkit.i b/wxPython/src/webkit.i
index 33fa36f09eb092fba52a3dba88e94b58db8d67b1..86e38e37ae8c4aa566f25067c96ec9b2fe488820 100644 (file)
--- a/wxPython/src/webkit.i
+++ b/wxPython/src/webkit.i
@@ -38,8 +38,6 @@
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 
 %pythoncode { __docfilter__ = wx.__DocFilter(globals()) }
 
 

-%include _webkit_rename.i
-

 //---------------------------------------------------------------------------
 
 // Put some wx default wxChar* values into wxStrings.
 //---------------------------------------------------------------------------
 
 // Put some wx default wxChar* values into wxStrings.


@@ -86,6 +84,26 @@ public:
     bool CanGetPageSource() { return false; }
     wxString GetPageSource() { return wxEmptyString; }
     void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString) {}
     bool CanGetPageSource() { return false; }
     wxString GetPageSource() { return wxEmptyString; }
     void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString) {}

+    wxString GetPageURL()   { return wxEmptyString; }
+    wxString GetPageTitle() { return wxEmptyString; }
+    
+    wxString GetSelection() { return wxEmptyString; }
+    
+    bool CanIncreaseTextSize() { return false; }
+    void IncreaseTextSize() { }
+    bool CanDecreaseTextSize() { return false; }
+    void DecreaseTextSize() { }
+    
+    void Print(bool showPrompt=false) { }
+    
+    void MakeEditable(bool enable=true) { }
+    bool IsEditable() { return false; }
+    
+    wxString RunScript(const wxString& javascript) { return wxEmptyString; }
+    
+    void SetScrollPos(int pos) { }
+    int GetScrollPos() { return 0; }
+    

 };
 
 
 };
 
 


@@ -97,7 +115,18 @@ enum {
     wxWEBKIT_STATE_STOP = 0,
     wxWEBKIT_STATE_FAILED = 0,
 
     wxWEBKIT_STATE_STOP = 0,
     wxWEBKIT_STATE_FAILED = 0,
 

-    wxEVT_WEBKIT_STATE_CHANGED = 0
+    wxEVT_WEBKIT_STATE_CHANGED = 0,
+    wxEVT_WEBKIT_BEFORE_LOAD = 0
+};
+
+enum {
+    wxWEBKIT_NAV_LINK_CLICKED = 0,
+    wxWEBKIT_NAV_BACK_NEXT = 0,
+    wxWEBKIT_NAV_FORM_SUBMITTED = 0,
+    wxWEBKIT_NAV_RELOAD = 0,
+    wxWEBKIT_NAV_FORM_RESUBMITTED = 0,
+    wxWEBKIT_NAV_OTHER = 0
+

 };
 
 class wxWebKitStateChangedEvent : public wxCommandEvent
 };
 
 class wxWebKitStateChangedEvent : public wxCommandEvent


@@ -112,6 +141,18 @@ public:
     void SetURL(const wxString& url) {}
 };
 
     void SetURL(const wxString& url) {}
 };
 

+class wxWebKitBeforeLoadEvent : public wxCommandEvent
+{    
+public:
+    bool IsCancelled() { return false; }
+    void Cancel(bool cancel = true) { }
+    wxString GetURL() { return wxEmptyString; }
+    void SetURL(const wxString& url) { }
+    void SetNavigationType(int navType) { }
+    int GetNavigationType() { return 0; }
+
+    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL ) { wxPyRaiseNotImplemented(); }
+};

  
 #endif
 %}
  
 #endif
 %}


@@ -156,6 +197,32 @@ public:
     bool CanGetPageSource();
     wxString GetPageSource();
     void SetPageSource(wxString& source, const wxString& baseUrl = wxPyEmptyString);
     bool CanGetPageSource();
     wxString GetPageSource();
     void SetPageSource(wxString& source, const wxString& baseUrl = wxPyEmptyString);

+    wxString GetPageURL();
+    wxString GetPageTitle();
+
+    wxString GetSelection();
+    
+    bool CanIncreaseTextSize();
+    void IncreaseTextSize();
+    bool CanDecreaseTextSize();
+    void DecreaseTextSize();
+    
+    void Print(bool showPrompt=false);
+    
+    void MakeEditable(bool enable=true);
+    bool IsEditable();
+    
+    wxString RunScript(const wxString& javascript);
+    
+    void SetScrollPos(int pos);
+    int GetScrollPos();
+    
+    
+    %property(PageSource, GetPageSource, SetPageSource, doc="See `GetPageSource` and `SetPageSource`");
+    %property(PageTitle, GetPageTitle, doc="See `GetPageTitle`");
+    %property(PageURL, GetPageURL, doc="See `GetPageURL`");    
+    %property(ScrollPos, GetScrollPos, SetScrollPos, doc="See `GetScrollPos and SetScrollPos`");
+    %property(Selection, GetSelection, doc="See `GetSelection`");

 };
 
 
 };
 
 


@@ -171,8 +238,34 @@ enum {
     wxWEBKIT_STATE_FAILED,
 };
 
     wxWEBKIT_STATE_FAILED,
 };
 

+enum {
+    wxWEBKIT_NAV_LINK_CLICKED,
+    wxWEBKIT_NAV_BACK_NEXT,
+    wxWEBKIT_NAV_FORM_SUBMITTED,
+    wxWEBKIT_NAV_RELOAD,
+    wxWEBKIT_NAV_FORM_RESUBMITTED,
+    wxWEBKIT_NAV_OTHER
+
+};

 
 %constant wxEventType wxEVT_WEBKIT_STATE_CHANGED;
 
 %constant wxEventType wxEVT_WEBKIT_STATE_CHANGED;

+%constant wxEventType wxEVT_WEBKIT_BEFORE_LOAD;
+
+class wxWebKitBeforeLoadEvent : public wxCommandEvent
+{    
+public:
+    bool IsCancelled();
+    void Cancel(bool cancel = true);
+    wxString GetURL();
+    void SetURL(const wxString& url);
+    void SetNavigationType(int navType);
+    int GetNavigationType();
+
+    wxWebKitBeforeLoadEvent( wxWindow* win = (wxWindow*) NULL );
+
+    %property(NavigationType, GetNavigationType, SetNavigationType, doc="See `GetNavigationType` and `SetNavigationType`");
+    %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`");
+};

 
 
 class wxWebKitStateChangedEvent : public wxCommandEvent
 
 
 class wxWebKitStateChangedEvent : public wxCommandEvent


@@ -184,11 +277,15 @@ public:
     void SetState(const int state);
     wxString GetURL();
     void SetURL(const wxString& url);
     void SetState(const int state);
     wxString GetURL();
     void SetURL(const wxString& url);

+
+    %property(State, GetState, SetState, doc="See `GetState` and `SetState`");
+    %property(URL, GetURL, SetURL, doc="See `GetURL` and `SetURL`");

 };
 
 
 %pythoncode %{
     EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED)
 };
 
 
 %pythoncode %{
     EVT_WEBKIT_STATE_CHANGED = wx.PyEventBinder(wxEVT_WEBKIT_STATE_CHANGED)

+    EVT_WEBKIT_BEFORE_LOAD = wx.PyEventBinder(wxEVT_WEBKIT_BEFORE_LOAD)

 %}
 
 
 %}