Some tweaks for WebKitCtrl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 33d4f3a6a5f18f1c52ed9a82f33f4e18c6e6d29f..c3ecc31bfd16ef25b9ab34f8387cfe600c36c03b 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -185,6 +185,10 @@ Applied patch from Pim Van Heuven that modifies 4 files:
       TextEditMixin)
     - wxPython/wx/lib/wxpTag.py (some small fixes)
 
       TextEditMixin)
     - wxPython/wx/lib/wxpTag.py (some small fixes)
 

+Added (thanks to Kevin Ollivier!) wrappers for wx.WebKitCtrl for the
+OSX build.  Other platforms will raise an exception if you try to use
+it. 
+

 
 
 
 
 
 

diff --git a/wxPython/setup.py b/wxPython/setup.py
index c9ab97f12a32c9440f56aa3ec1177c3553775285..f86d77a1c3f594a17ce06907ba19eefff8b23c79 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -354,6 +354,8 @@ ext = Extension('_html', swig_sources,
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 

+
+

 swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_webkit', swig_sources,
 swig_sources = run_swig(['webkit.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_webkit', swig_sources,


@@ -367,6 +369,8 @@ ext = Extension('_webkit', swig_sources,
                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 

+
+

 swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_wizard', swig_sources,
 swig_sources = run_swig(['wizard.i'], 'src', GENDIR, PKGDIR,
                         USE_SWIG, swig_force, swig_args, swig_deps)
 ext = Extension('_wizard', swig_sources,

diff --git a/wxPython/src/webkit.i b/wxPython/src/webkit.i
index 4b925709ad97510b255eb66f258f96b590df1856..de96d9fb4291f5ecfe625bad7626f3b1002de323 100644 (file)
--- a/wxPython/src/webkit.i
+++ b/wxPython/src/webkit.i
@@ -4,9 +4,9 @@
 //
 // Author:      Robin Dunn / Kevin Ollivier
 //
 //
 // Author:      Robin Dunn / Kevin Ollivier
 //

-// Created:     28-Feb-2003
+// Created:     18-Oct-2004

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 2001 by Total Control Software
+// Copyright:   (c) 2004 by Total Control Software

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -22,64 +22,71 @@
 #define scalb scalbn
 #endif
 
 #define scalb scalbn
 #endif
 

+#if wxUSE_WEBKIT

 #include "wx/html/webkit.h"
 #include "wx/html/webkit.h"

+#endif

 %}
 
 //---------------------------------------------------------------------------
 
 %}
 
 //---------------------------------------------------------------------------
 

-%include typemaps.i
-%include my_typemaps.i
-

 %import core.i
 %import core.i

-%import windows.i
-%import misc.i
+%pythoncode { wx = _core }
+%pythoncode { __docfilter__ = wx.__DocFilter(globals()) }

 
 

-%include _webkit_rename.i

 
 

-%pragma(python) code = "import wx"
+%include _webkit_rename.i

 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------
 

-%{
-    // Put some wx default wxChar* values into wxStrings.
-    DECLARE_DEF_STRING(PanelNameStr);
-%}
+// Put some wx default wxChar* values into wxStrings.
+MAKE_CONST_WXSTRING_NOSWIG(EmptyString);
+MAKE_CONST_WXSTRING2(WebKitNameStr, wxT("webkitctrl"))
+
+

 
 

+    

 %{
 #if !wxUSE_WEBKIT
 %{
 #if !wxUSE_WEBKIT

+// a dummy class for ports that don't have wxWebKitCtrl

 class wxWebKitCtrl : public wxControl
 {
 public:
     wxWebKitCtrl(wxWindow *parent,
 class wxWebKitCtrl : public wxControl
 {
 public:
     wxWebKitCtrl(wxWindow *parent,

-                    wxWindowID winID,
-                    const wxString& strURL,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxT("webkitctrl")) {}
+                 wxWindowID winID,
+                 const wxString& strURL,
+                 const wxPoint& pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize, long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxPyWebKitNameStr)
+    { wxPyRaiseNotImplemented(); }
+
+    wxWebKitCtrl() { wxPyRaiseNotImplemented(); }
+    

     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxT("webkitctrl")) {return false;}
+                const wxString& name = wxPyWebKitNameStr)
+    { return false; }

 
     void LoadURL(const wxString &url) {}
 
 
     void LoadURL(const wxString &url) {}
 

-    bool CanGoBack() {return false;}
-    bool CanGoForward() {return false;}
-    bool GoBack() {return false;}
-    bool GoForward() {return false;}
+    bool CanGoBack() { return false; }
+    bool CanGoForward() { return false; }
+    bool GoBack() { return false; }
+    bool GoForward() { return false; }

     void Reload() {}
     void Reload() {}

-    void Stop(){}
-    bool CanGetPageSource(){return false;}
-    wxString GetPageSource(){return wxEmptyString;}
-    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString){}
+    void Stop() {}
+    bool CanGetPageSource() { return false; }
+    wxString GetPageSource() { return wxEmptyString; }
+    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString) {}

 };
 #endif
 %}
 
 };
 #endif
 %}
 

+// Now define it for SWIG.

 class wxWebKitCtrl : public wxControl
 {
 public:
 class wxWebKitCtrl : public wxControl
 {
 public:


@@ -89,14 +96,18 @@ public:
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,
                     const wxPoint& pos = wxDefaultPosition,
                     const wxSize& size = wxDefaultSize, long style = 0,
                     const wxValidator& validator = wxDefaultValidator,

-                    const wxString& name = wxT("webkitctrl"));
+                    const wxString& name = wxPyWebKitNameStr);
+
+    %name(PreWebKitCtrl)wxWebKitCtrl();
+
+    

     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
     bool Create(wxWindow *parent,
                 wxWindowID winID,
                 const wxString& strURL,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize, long style = 0,
                 const wxValidator& validator = wxDefaultValidator,

-                const wxString& name = wxT("webkitctrl"));
+                const wxString& name = wxPyWebKitNameStr);

 
     void LoadURL(const wxString &url);
 
 
     void LoadURL(const wxString &url);
 


@@ -108,9 +119,10 @@ public:
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();
     void Stop();
     bool CanGetPageSource();
     wxString GetPageSource();

-    void SetPageSource(wxString& source, const wxString& baseUrl = wxEmptyString);
+    void SetPageSource(wxString& source, const wxString& baseUrl = wxPyEmptyString);

 };
 
 };
 

+

 %init %{
 
 %}
 %init %{
 
 %}