mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-22 14:20:35 +08:00
Got iewin up and running again.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
@@ -0,0 +1,13 @@
|
||||
// A bunch of %rename directives generated by ./distrib/build_renamers.py
|
||||
// in order to remove the wx prefix from all global scope names.
|
||||
|
||||
#ifndef BUILDING_RENAMERS
|
||||
|
||||
%rename(MSHTMLEvent) wxMSHTMLEvent;
|
||||
%rename(IEHTML_REFRESH_NORMAL) wxIEHTML_REFRESH_NORMAL;
|
||||
%rename(IEHTML_REFRESH_IFEXPIRED) wxIEHTML_REFRESH_IFEXPIRED;
|
||||
%rename(IEHTML_REFRESH_CONTINUE) wxIEHTML_REFRESH_CONTINUE;
|
||||
%rename(IEHTML_REFRESH_COMPLETELY) wxIEHTML_REFRESH_COMPLETELY;
|
||||
%rename(IEHtmlWin) wxIEHtmlWin;
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,2 @@
|
||||
|
||||
EVT*
|
||||
File diff suppressed because it is too large
Load Diff
@@ -14,31 +14,22 @@
|
||||
%module iewin
|
||||
|
||||
%{
|
||||
#include "wxPython.h"
|
||||
#include "wx/wxPython/wxPython.h"
|
||||
#include "wx/wxPython/pyclasses.h"
|
||||
#include "wx/wxPython/pyistream.h"
|
||||
|
||||
#include "IEHtmlWin.h"
|
||||
#include "pyistream.h"
|
||||
%}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
%include typemaps.i
|
||||
%include my_typemaps.i
|
||||
%import core.i
|
||||
%pythoncode { wx = core }
|
||||
|
||||
%extern wx.i
|
||||
%extern windows.i
|
||||
%extern _defs.i
|
||||
%extern misc.i
|
||||
%extern events.i
|
||||
%extern streams.i
|
||||
MAKE_CONST_WXSTRING_NOSWIG(PanelNameStr);
|
||||
|
||||
%pragma(python) code = "import wx"
|
||||
%include _iewin_rename.i
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
%{
|
||||
// Put some wx default wxChar* values into wxStrings.
|
||||
DECLARE_DEF_STRING(PanelNameStr);
|
||||
%}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
@@ -62,25 +53,15 @@ enum {
|
||||
};
|
||||
|
||||
|
||||
%pragma(python) code = "
|
||||
def EVT_MSHTML_BEFORENAVIGATE2(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, func)
|
||||
|
||||
def EVT_MSHTML_NEWWINDOW2(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_NEWWINDOW2, func)
|
||||
|
||||
def EVT_MSHTML_DOCUMENTCOMPLETE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, func)
|
||||
|
||||
def EVT_MSHTML_PROGRESSCHANGE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, func)
|
||||
|
||||
def EVT_MSHTML_STATUSTEXTCHANGE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, func)
|
||||
|
||||
def EVT_MSHTML_TITLECHANGE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_TITLECHANGE, func)
|
||||
"
|
||||
%pythoncode {
|
||||
|
||||
EVT_MSHTML_BEFORENAVIGATE2 = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, 1)
|
||||
EVT_MSHTML_NEWWINDOW2 = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_NEWWINDOW2, 1)
|
||||
EVT_MSHTML_DOCUMENTCOMPLETE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, 1)
|
||||
EVT_MSHTML_PROGRESSCHANGE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, 1)
|
||||
EVT_MSHTML_STATUSTEXTCHANGE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, 1)
|
||||
EVT_MSHTML_TITLECHANGE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_TITLECHANGE, 1)
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
@@ -92,9 +73,11 @@ enum wxIEHtmlRefreshLevel {
|
||||
};
|
||||
|
||||
|
||||
class wxIEHtmlWin : public wxWindow /* wxActiveX */
|
||||
class wxIEHtmlWin : public wxWindow /* wxActiveX */
|
||||
{
|
||||
public:
|
||||
%addtofunc wxIEHtmlWin "self._setOORInfo(self)"
|
||||
|
||||
wxIEHtmlWin(wxWindow * parent, wxWindowID id = -1,
|
||||
const wxPoint& pos = wxDefaultPosition,
|
||||
const wxSize& size = wxDefaultSize,
|
||||
@@ -105,13 +88,13 @@ public:
|
||||
bool LoadString(wxString html);
|
||||
bool LoadStream(wxInputStream *is);
|
||||
|
||||
%pragma(python) addtoclass = "Navigate = LoadUrl"
|
||||
%pythoncode { Navigate = LoadUrl }
|
||||
|
||||
void SetCharset(wxString charset);
|
||||
void SetEditMode(bool seton);
|
||||
bool GetEditMode();
|
||||
wxString GetStringSelection(bool asHTML = FALSE);
|
||||
wxString GetText(bool asHTML = FALSE);
|
||||
wxString GetStringSelection(bool asHTML = False);
|
||||
wxString GetText(bool asHTML = False);
|
||||
|
||||
bool GoBack();
|
||||
bool GoForward();
|
||||
@@ -125,12 +108,4 @@ public:
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
%init %{
|
||||
|
||||
%}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
%pragma(python) include="_iewinextras.py";
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
+119
-156
@@ -1,170 +1,133 @@
|
||||
# This file was created automatically by SWIG.
|
||||
import iewinc
|
||||
# Don't modify this file, modify the SWIG interface instead.
|
||||
|
||||
from misc import *
|
||||
import _iewin
|
||||
|
||||
from misc2 import *
|
||||
|
||||
from windows import *
|
||||
|
||||
from gdi import *
|
||||
|
||||
from fonts import *
|
||||
|
||||
from clip_dnd import *
|
||||
|
||||
from events import *
|
||||
|
||||
from streams import *
|
||||
|
||||
from utils import *
|
||||
|
||||
from mdi import *
|
||||
|
||||
from frames import *
|
||||
|
||||
from stattool import *
|
||||
|
||||
from controls import *
|
||||
|
||||
from controls2 import *
|
||||
|
||||
from windows2 import *
|
||||
|
||||
from cmndlgs import *
|
||||
|
||||
from windows3 import *
|
||||
|
||||
from image import *
|
||||
|
||||
from printfw import *
|
||||
|
||||
from sizers import *
|
||||
|
||||
from filesys import *
|
||||
import wx
|
||||
|
||||
def EVT_MSHTML_BEFORENAVIGATE2(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, func)
|
||||
|
||||
def EVT_MSHTML_NEWWINDOW2(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_NEWWINDOW2, func)
|
||||
|
||||
def EVT_MSHTML_DOCUMENTCOMPLETE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, func)
|
||||
|
||||
def EVT_MSHTML_PROGRESSCHANGE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, func)
|
||||
|
||||
def EVT_MSHTML_STATUSTEXTCHANGE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, func)
|
||||
|
||||
def EVT_MSHTML_TITLECHANGE(win, id, func):
|
||||
win.Connect(id, -1, wxEVT_COMMAND_MSHTML_TITLECHANGE, func)
|
||||
|
||||
class wxMSHTMLEventPtr(wxNotifyEventPtr):
|
||||
def __init__(self,this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def GetText1(self, *_args, **_kwargs):
|
||||
val = iewinc.wxMSHTMLEvent_GetText1(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetLong1(self, *_args, **_kwargs):
|
||||
val = iewinc.wxMSHTMLEvent_GetLong1(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetLong2(self, *_args, **_kwargs):
|
||||
val = iewinc.wxMSHTMLEvent_GetLong2(self, *_args, **_kwargs)
|
||||
return val
|
||||
import core
|
||||
wx = core
|
||||
class MSHTMLEvent(core.NotifyEvent):
|
||||
def __repr__(self):
|
||||
return "<%s.%s instance; proxy of C++ wxMSHTMLEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
|
||||
class wxMSHTMLEvent(wxMSHTMLEventPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = iewinc.new_wxMSHTMLEvent(*_args,**_kwargs)
|
||||
return "<%s.%s; proxy of C++ wxMSHTMLEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""__init__(wxEventType commandType=wxEVT_NULL, int id=0) -> MSHTMLEvent"""
|
||||
newobj = _iewin.new_MSHTMLEvent(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
def GetText1(*args, **kwargs):
|
||||
"""GetText1() -> String"""
|
||||
return _iewin.MSHTMLEvent_GetText1(*args, **kwargs)
|
||||
|
||||
def GetLong1(*args, **kwargs):
|
||||
"""GetLong1() -> long"""
|
||||
return _iewin.MSHTMLEvent_GetLong1(*args, **kwargs)
|
||||
|
||||
def GetLong2(*args, **kwargs):
|
||||
"""GetLong2() -> long"""
|
||||
return _iewin.MSHTMLEvent_GetLong2(*args, **kwargs)
|
||||
|
||||
|
||||
|
||||
|
||||
class wxIEHtmlWinPtr(wxWindowPtr):
|
||||
def __init__(self,this):
|
||||
class MSHTMLEventPtr(MSHTMLEvent):
|
||||
def __init__(self, this):
|
||||
self.this = this
|
||||
self.thisown = 0
|
||||
def LoadUrl(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_LoadUrl(self, *_args, **_kwargs)
|
||||
return val
|
||||
def LoadString(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_LoadString(self, *_args, **_kwargs)
|
||||
return val
|
||||
def LoadStream(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_LoadStream(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetCharset(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_SetCharset(self, *_args, **_kwargs)
|
||||
return val
|
||||
def SetEditMode(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_SetEditMode(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetEditMode(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GetEditMode(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetStringSelection(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GetStringSelection(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GetText(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GetText(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GoBack(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GoBack(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GoForward(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GoForward(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GoHome(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GoHome(self, *_args, **_kwargs)
|
||||
return val
|
||||
def GoSearch(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_GoSearch(self, *_args, **_kwargs)
|
||||
return val
|
||||
def RefreshPage(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_RefreshPage(self, *_args, **_kwargs)
|
||||
return val
|
||||
def Stop(self, *_args, **_kwargs):
|
||||
val = iewinc.wxIEHtmlWin_Stop(self, *_args, **_kwargs)
|
||||
return val
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = MSHTMLEvent
|
||||
_iewin.MSHTMLEvent_swigregister(MSHTMLEventPtr)
|
||||
|
||||
wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2 = _iewin.wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2
|
||||
wxEVT_COMMAND_MSHTML_NEWWINDOW2 = _iewin.wxEVT_COMMAND_MSHTML_NEWWINDOW2
|
||||
wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE = _iewin.wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE
|
||||
wxEVT_COMMAND_MSHTML_PROGRESSCHANGE = _iewin.wxEVT_COMMAND_MSHTML_PROGRESSCHANGE
|
||||
wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE = _iewin.wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE
|
||||
wxEVT_COMMAND_MSHTML_TITLECHANGE = _iewin.wxEVT_COMMAND_MSHTML_TITLECHANGE
|
||||
EVT_MSHTML_BEFORENAVIGATE2 = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2, 1)
|
||||
EVT_MSHTML_NEWWINDOW2 = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_NEWWINDOW2, 1)
|
||||
EVT_MSHTML_DOCUMENTCOMPLETE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE, 1)
|
||||
EVT_MSHTML_PROGRESSCHANGE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_PROGRESSCHANGE, 1)
|
||||
EVT_MSHTML_STATUSTEXTCHANGE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE, 1)
|
||||
EVT_MSHTML_TITLECHANGE = wx.PyEventBinder(wxEVT_COMMAND_MSHTML_TITLECHANGE, 1)
|
||||
|
||||
IEHTML_REFRESH_NORMAL = _iewin.IEHTML_REFRESH_NORMAL
|
||||
IEHTML_REFRESH_IFEXPIRED = _iewin.IEHTML_REFRESH_IFEXPIRED
|
||||
IEHTML_REFRESH_CONTINUE = _iewin.IEHTML_REFRESH_CONTINUE
|
||||
IEHTML_REFRESH_COMPLETELY = _iewin.IEHTML_REFRESH_COMPLETELY
|
||||
class IEHtmlWin(core.Window):
|
||||
def __repr__(self):
|
||||
return "<%s.%s instance; proxy of C++ wxIEHtmlWin instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
|
||||
Navigate = LoadUrl
|
||||
class wxIEHtmlWin(wxIEHtmlWinPtr):
|
||||
def __init__(self,*_args,**_kwargs):
|
||||
self.this = iewinc.new_wxIEHtmlWin(*_args,**_kwargs)
|
||||
return "<%s.%s; proxy of C++ wxIEHtmlWin instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""
|
||||
__init__(Window parent, int id=-1, Point pos=DefaultPosition,
|
||||
Size size=DefaultSize, long style=0, String name=PanelNameStr) -> IEHtmlWin
|
||||
"""
|
||||
newobj = _iewin.new_IEHtmlWin(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
self._setOORInfo(self)
|
||||
|
||||
def LoadUrl(*args, **kwargs):
|
||||
"""LoadUrl(String ??)"""
|
||||
return _iewin.IEHtmlWin_LoadUrl(*args, **kwargs)
|
||||
|
||||
def LoadString(*args, **kwargs):
|
||||
"""LoadString(String html) -> bool"""
|
||||
return _iewin.IEHtmlWin_LoadString(*args, **kwargs)
|
||||
|
||||
def LoadStream(*args, **kwargs):
|
||||
"""LoadStream(InputStream is) -> bool"""
|
||||
return _iewin.IEHtmlWin_LoadStream(*args, **kwargs)
|
||||
|
||||
Navigate = LoadUrl
|
||||
def SetCharset(*args, **kwargs):
|
||||
"""SetCharset(String charset)"""
|
||||
return _iewin.IEHtmlWin_SetCharset(*args, **kwargs)
|
||||
|
||||
def SetEditMode(*args, **kwargs):
|
||||
"""SetEditMode(bool seton)"""
|
||||
return _iewin.IEHtmlWin_SetEditMode(*args, **kwargs)
|
||||
|
||||
def GetEditMode(*args, **kwargs):
|
||||
"""GetEditMode() -> bool"""
|
||||
return _iewin.IEHtmlWin_GetEditMode(*args, **kwargs)
|
||||
|
||||
def GetStringSelection(*args, **kwargs):
|
||||
"""GetStringSelection(bool asHTML=False) -> String"""
|
||||
return _iewin.IEHtmlWin_GetStringSelection(*args, **kwargs)
|
||||
|
||||
def GetText(*args, **kwargs):
|
||||
"""GetText(bool asHTML=False) -> String"""
|
||||
return _iewin.IEHtmlWin_GetText(*args, **kwargs)
|
||||
|
||||
def GoBack(*args, **kwargs):
|
||||
"""GoBack() -> bool"""
|
||||
return _iewin.IEHtmlWin_GoBack(*args, **kwargs)
|
||||
|
||||
def GoForward(*args, **kwargs):
|
||||
"""GoForward() -> bool"""
|
||||
return _iewin.IEHtmlWin_GoForward(*args, **kwargs)
|
||||
|
||||
def GoHome(*args, **kwargs):
|
||||
"""GoHome() -> bool"""
|
||||
return _iewin.IEHtmlWin_GoHome(*args, **kwargs)
|
||||
|
||||
def GoSearch(*args, **kwargs):
|
||||
"""GoSearch() -> bool"""
|
||||
return _iewin.IEHtmlWin_GoSearch(*args, **kwargs)
|
||||
|
||||
def RefreshPage(*args, **kwargs):
|
||||
"""RefreshPage(int level) -> bool"""
|
||||
return _iewin.IEHtmlWin_RefreshPage(*args, **kwargs)
|
||||
|
||||
def Stop(*args, **kwargs):
|
||||
"""Stop() -> bool"""
|
||||
return _iewin.IEHtmlWin_Stop(*args, **kwargs)
|
||||
|
||||
|
||||
class IEHtmlWinPtr(IEHtmlWin):
|
||||
def __init__(self, this):
|
||||
self.this = this
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = IEHtmlWin
|
||||
_iewin.IEHtmlWin_swigregister(IEHtmlWinPtr)
|
||||
|
||||
|
||||
|
||||
|
||||
#-------------- FUNCTION WRAPPERS ------------------
|
||||
|
||||
|
||||
|
||||
#-------------- VARIABLE WRAPPERS ------------------
|
||||
|
||||
wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2 = iewinc.wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2
|
||||
wxEVT_COMMAND_MSHTML_NEWWINDOW2 = iewinc.wxEVT_COMMAND_MSHTML_NEWWINDOW2
|
||||
wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE = iewinc.wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE
|
||||
wxEVT_COMMAND_MSHTML_PROGRESSCHANGE = iewinc.wxEVT_COMMAND_MSHTML_PROGRESSCHANGE
|
||||
wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE = iewinc.wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE
|
||||
wxEVT_COMMAND_MSHTML_TITLECHANGE = iewinc.wxEVT_COMMAND_MSHTML_TITLECHANGE
|
||||
wxIEHTML_REFRESH_NORMAL = iewinc.wxIEHTML_REFRESH_NORMAL
|
||||
wxIEHTML_REFRESH_IFEXPIRED = iewinc.wxIEHTML_REFRESH_IFEXPIRED
|
||||
wxIEHTML_REFRESH_CONTINUE = iewinc.wxIEHTML_REFRESH_CONTINUE
|
||||
wxIEHTML_REFRESH_COMPLETELY = iewinc.wxIEHTML_REFRESH_COMPLETELY
|
||||
|
||||
|
||||
#-------------- USER INCLUDE -----------------------
|
||||
|
||||
# Stuff these names into the wx namespace so wxPyConstructObject can find them
|
||||
|
||||
wx.wxMSHTMLEventPtr = wxMSHTMLEventPtr
|
||||
wx.wxIEHtmlWinPtr = wxIEHtmlWinPtr
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -985,7 +985,7 @@ void wxActiveX::OnSize(wxSizeEvent& event)
|
||||
|
||||
void wxActiveX::OnPaint(wxPaintEvent& event)
|
||||
{
|
||||
wxLogTrace(wxT("repainting activex win"));
|
||||
// wxLogTrace(wxT("repainting activex win"));
|
||||
wxPaintDC dc(this);
|
||||
dc.BeginDrawing();
|
||||
int w, h;
|
||||
@@ -1020,12 +1020,12 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
|
||||
{
|
||||
if (m_oleObjectHWND == NULL)
|
||||
{
|
||||
wxLogTrace(wxT("no oleInPlaceObject"));
|
||||
// wxLogTrace(wxT("no oleInPlaceObject"));
|
||||
event.Skip();
|
||||
return;
|
||||
}
|
||||
|
||||
wxLogTrace(wxT("mouse event"));
|
||||
// wxLogTrace(wxT("mouse event"));
|
||||
UINT msg = 0;
|
||||
WPARAM wParam = 0;
|
||||
LPARAM lParam = 0;
|
||||
@@ -1068,18 +1068,18 @@ void wxActiveX::OnMouse(wxMouseEvent& event)
|
||||
wxString log;
|
||||
if (msg == 0)
|
||||
{
|
||||
wxLogTrace(wxT("no message"));
|
||||
// wxLogTrace(wxT("no message"));
|
||||
event.Skip(); return;
|
||||
};
|
||||
|
||||
if (!::SendMessage(m_oleObjectHWND, msg, wParam, lParam))
|
||||
{
|
||||
wxLogTrace(wxT("msg not delivered"));
|
||||
// wxLogTrace(wxT("msg not delivered"));
|
||||
event.Skip();
|
||||
return;
|
||||
};
|
||||
|
||||
wxLogTrace(wxT("msg sent"));
|
||||
// wxLogTrace(wxT("msg sent"));
|
||||
}
|
||||
|
||||
long wxActiveX::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
|
||||
|
||||
+3
-3
@@ -64,7 +64,7 @@ BUILD_DLLWIDGET = 0# Build a module that enables unknown wx widgets
|
||||
# to be loaded from a DLL and to be used from Python.
|
||||
|
||||
# Internet Explorer wrapper (experimental)
|
||||
BUILD_IEWIN = 0 #(os.name == 'nt')
|
||||
BUILD_IEWIN = (os.name == 'nt')
|
||||
|
||||
|
||||
CORE_ONLY = 0 # if true, don't build any of the above
|
||||
@@ -996,7 +996,7 @@ if BUILD_STC:
|
||||
else:
|
||||
STC_H = opj(WXPREFIX, 'include/wx/stc')
|
||||
|
||||
## NOTE: need to add this to the stc.bkl...
|
||||
## NOTE: need to add something like this to the stc.bkl...
|
||||
|
||||
## # Check if gen_iface needs to be run for the wxSTC sources
|
||||
## if (newer(opj(CTRB_SRC, 'stc/stc.h.in'), opj(CTRB_INC, 'stc/stc.h' )) or
|
||||
@@ -1048,7 +1048,7 @@ if BUILD_IEWIN:
|
||||
USE_SWIG, swig_force, swig_args, swig_deps)
|
||||
|
||||
|
||||
ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location,
|
||||
ext = Extension('_iewin', ['%s/IEHtmlWin.cpp' % location,
|
||||
'%s/wxactivex.cpp' % location,
|
||||
] + swig_sources,
|
||||
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
## This file reverse renames symbols in the wx package to give
|
||||
## them their wx prefix again, for backwards compatibility.
|
||||
##
|
||||
## Generated by ./distrib/build_renamers.py
|
||||
|
||||
# This silly stuff here is so the wxPython.wx module doesn't conflict
|
||||
# with the wx package. We need to import modules from the wx package
|
||||
# here, then we'll put the wxPython.wx entry back in sys.modules.
|
||||
import sys
|
||||
_wx = None
|
||||
if sys.modules.has_key('wxPython.wx'):
|
||||
_wx = sys.modules['wxPython.wx']
|
||||
del sys.modules['wxPython.wx']
|
||||
|
||||
import wx.iewin
|
||||
|
||||
sys.modules['wxPython.wx'] = _wx
|
||||
del sys, _wx
|
||||
|
||||
|
||||
# Now assign all the reverse-renamed names:
|
||||
wxMSHTMLEvent = wx.iewin.MSHTMLEvent
|
||||
wxMSHTMLEventPtr = wx.iewin.MSHTMLEventPtr
|
||||
wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2 = wx.iewin.wxEVT_COMMAND_MSHTML_BEFORENAVIGATE2
|
||||
wxEVT_COMMAND_MSHTML_NEWWINDOW2 = wx.iewin.wxEVT_COMMAND_MSHTML_NEWWINDOW2
|
||||
wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE = wx.iewin.wxEVT_COMMAND_MSHTML_DOCUMENTCOMPLETE
|
||||
wxEVT_COMMAND_MSHTML_PROGRESSCHANGE = wx.iewin.wxEVT_COMMAND_MSHTML_PROGRESSCHANGE
|
||||
wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE = wx.iewin.wxEVT_COMMAND_MSHTML_STATUSTEXTCHANGE
|
||||
wxEVT_COMMAND_MSHTML_TITLECHANGE = wx.iewin.wxEVT_COMMAND_MSHTML_TITLECHANGE
|
||||
wxIEHTML_REFRESH_NORMAL = wx.iewin.IEHTML_REFRESH_NORMAL
|
||||
wxIEHTML_REFRESH_IFEXPIRED = wx.iewin.IEHTML_REFRESH_IFEXPIRED
|
||||
wxIEHTML_REFRESH_CONTINUE = wx.iewin.IEHTML_REFRESH_CONTINUE
|
||||
wxIEHTML_REFRESH_COMPLETELY = wx.iewin.IEHTML_REFRESH_COMPLETELY
|
||||
wxIEHtmlWin = wx.iewin.IEHtmlWin
|
||||
wxIEHtmlWinPtr = wx.iewin.IEHtmlWinPtr
|
||||
|
||||
|
||||
d = globals()
|
||||
for k, v in wx.iewin.__dict__.iteritems():
|
||||
if k.startswith('EVT'):
|
||||
d[k] = v
|
||||
del d, k, v
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user