Attachment #28778 for bug #46942

View | Details | Raw Unified | Return to bug 46942
Collapse All | Expand All




CC = g++

PROGRAM = wxIE.exe
LIBRARY = wxactivex.a
prefix = /usr
LFLAGS = -L/m/snowball/icicle/devenv/lib

# implementation

.SUFFIXES:      .o .cpp

APP_SOURCES = wxIEApp.cpp wxIEFrm.cpp wxActiveXFrame.cpp
LIB_SOURCES = wxactivex.cpp IEHtmlWin.cpp

APP_OBJECTS = $(APP_SOURCES:.cpp=.o)
LIB_OBJECTS = $(LIB_SOURCES:.cpp=.o)



$(PROGRAM): $(LIBRARY) $(APP_OBJECTS)
	$(CC) -o $(PROGRAM) $(APP_OBJECTS) $(LIBRARY) `wx-config --libs`
	strip $(PROGRAM)

$(LIBRARY): $(LIB_OBJECTS)
	ar rs $(LIBRARY) $(LIB_OBJECTS)

install:
	mkdir -p $(prefix)/include/wxactivex
	mkdir -p $(prefix)/lib
	mkdir -p $(prefix)/bin
	cp wxactivex.h IEHtmlWin.h $(prefix)/include/wxactivex
	cp wxactivex.a $(prefix)/lib
	cp wxIE.exe $(prefix)/bin

clean:
	rm -f *.o $(PROGRAM)

Lines 52-58 Link Here

(-)wxactive.cpp.org (-2 / +4 lines)
52	code and/or adjust the licensing conditions notice accordingly.	52	code and/or adjust the licensing conditions notice accordingly.
53	*/	53	*/
54		54
55	#include "wxActiveX.h"	55	#include "wxactivex.h"
		56	#include <stdexcept>
		57	#include <servprov.h>
56	#include <wx/strconv.h>	58	#include <wx/strconv.h>
57	#include <wx/event.h>	59	#include <wx/event.h>
58	#include <wx/string.h>	60	#include <wx/string.h>
Lines 1030-1036 Link Here
1030		1030
1031	wxString err = "wxActiveXEvent::operator[] invalid name <" + name + ">";	1031	wxString err = "wxActiveXEvent::operator[] invalid name <" + name + ">";
1032	err += "\r\nValid Names = :\r\n";	1032	err += "\r\nValid Names = :\r\n";
1033	for (i = 0; i < m_params.GetCount(); i++)	1033	for (int i = 0; i < m_params.GetCount(); i++)
1034	{	1034	{
1035	err += m_params[i].GetName();	1035	err += m_params[i].GetName();
1036	err += "\r\n";	1036	err += "\r\n";




const wxActiveX::PropX& wxActiveX::GetPropDesc(int idx) const
{
    if (idx < 0 || idx >= GetPropCount())
        throw runtime_error("Property index out of bounds");

    return m_props[idx];
};

    {
        wxString s;
        s << "property <" << name << "> not found";
        throw runtime_error(s.mb_str());
    };

    return GetPropDesc(it->second);

const wxActiveX::FuncX& wxActiveX::GetMethodDesc(int idx) const
{
    if (idx < 0 || idx >= GetMethodCount())
        throw runtime_error("Method index out of bounds");


    return m_methods[idx];

    {
        wxString s;
        s << "method <" << name << "> not found";
        throw runtime_error(s.mb_str());
    };

    return GetMethodDesc(it->second);

    {
        wxString s;
        s << "property <" << name << "> is readonly";
        throw runtime_error(s.mb_str());
    };

    VARIANT v = {prop.arg.vt};

    {
        wxString s;
        s << "property <" << name << "> is writeonly";
        throw runtime_error(s.mb_str());
    };

    return GetPropAsVariant(prop.memid);

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_BSTR);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    wxVariant wv;
    MSWVariantToVariant(v, wv);

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_BSTR);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    wxString s = v.bstrVal;
    VariantClear(&v);

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_I1);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    return v.cVal;
};

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_I4);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    return v.iVal;
};

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_BOOL);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    return v.boolVal != 0;
};

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_R8);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    return v.dblVal;
};

    VARIANT v = GetPropAsVariant(name);

	if (! VariantToWxDateTime(v, dt))
        throw runtime_error("Unable to convert variant to wxDateTime");

    return dt;
};

    VARIANT v = GetPropAsVariant(name);
    HRESULT hr = VariantChangeType(&v, &v, 0, VT_BYREF);
    if (! SUCCEEDED(hr))
        throw runtime_error("Unable to convert variant");

    return v.byref;
};

            vargs[nargs - i - 1].vt = func.params[i].vt;

        // put data
        for (int i = 0; i < nargs; i++)
            VariantToMSWVariant(args[i], vargs[nargs - i - 1]);
    };


Lines 62-71 Link Here

(-)wxactivex.h.org (-1 / +1 lines)
62	#pragma warning( disable : 4786)	62	#pragma warning( disable : 4786)
63		63
64		64
65	#include <wx/setup.h>
66	#include <wx/wx.h>	65	#include <wx/wx.h>
67	#include <wx/variant.h>	66	#include <wx/variant.h>
68	#include <wx/datetime.h>	67	#include <wx/datetime.h>
		68	#include <ole2.h>
69	#include <oleidl.h>	69	#include <oleidl.h>
70	#include <exdisp.h>	70	#include <exdisp.h>
71	#include <docobj.h>	71	#include <docobj.h>

Lines 63-69 Link Here

(-)IEHtmlWin.cpp.org (-3 / +3 lines)
63	#include <exdispid.h>	63	#include <exdispid.h>
64	#include <exdisp.h>	64	#include <exdisp.h>
65	#include <olectl.h>	65	#include <olectl.h>
66	#include <Mshtml.h>	66	#include <mshtml.h>
67	#include <sstream>	67	#include <sstream>
68	using namespace std;	68	using namespace std;
69		69
Lines 171-177 Link Here
171	{	171	{
172	if (prepend.size() > 0)	172	if (prepend.size() > 0)
173	{	173	{
174	int n = min(prepend.size(), cb);	174	int n = (prepend.size() < cb ? prepend.size() : cb);
175	prepend.copy((char *) pv, n);	175	prepend.copy((char *) pv, n);
176	prepend = prepend.substr(n);	176	prepend = prepend.substr(n);
177	if (pcbRead)	177	if (pcbRead)
Lines 513-516 Link Here
513	SysFreeString(text);	513	SysFreeString(text);
514		514
515	return s;	515	return s;
516	};	516	};

Lines 61-68 Link Here

(-)IEHtmlWin.h.org (-1 / +1 lines)
61	#pragma warning( disable : 4786)	61	#pragma warning( disable : 4786)
62		62
63		63
64	#include <wx/setup.h>
65	#include <wx/wx.h>	64	#include <wx/wx.h>
		65	#include <ole2.h>
66	#include <exdisp.h>	66	#include <exdisp.h>
67	#include <iostream>	67	#include <iostream>
68	using namespace std;	68	using namespace std;

Lines 52-57 Link Here

(-)wxIEApp.h.org (+2 lines)
52	code and/or adjust the licensing conditions notice accordingly.	52	code and/or adjust the licensing conditions notice accordingly.
53	*/	53	*/
54		54
		55	#include <wx/wx.h>
		56
55	// Define a new application type, each program should derive a class from wxApp	57	// Define a new application type, each program should derive a class from wxApp
56	class wxIEApp : public wxApp	58	class wxIEApp : public wxApp
57	{	59	{

Lines 114-120 Link Here

(-)wxActiveXFrame.cpp.org (-2 / +2 lines)
114	{	114	{
115	const wxActiveX::FuncX& func = X->GetEventDesc(i);	115	const wxActiveX::FuncX& func = X->GetEventDesc(i);
116	const wxEventType& ev = RegisterActiveXEvent((DISPID) func.memid);	116	const wxEventType& ev = RegisterActiveXEvent((DISPID) func.memid);
117	Connect(101, ev, (wxObjectEventFunction) OnActiveXEvent);	117	Connect(101, ev, (wxObjectEventFunction) &wxActiveXFrame::OnActiveXEvent);
118	};	118	};
119	}	119	}
120		120
Lines 273-279 Link Here
273	os <<	273	os <<
274	(const wxChar *) event.ParamType(p) << wxT(" ") <<	274	(const wxChar *) event.ParamType(p) << wxT(" ") <<
275	(const wxChar *) event.ParamName(p) << wxT(" = ") <<	275	(const wxChar *) event.ParamName(p) << wxT(" = ") <<
276	(const wxChar *) (wxString) event[p];	276	(const wxChar *) event[p].GetString();
277	if (p < event.ParamCount() - 1)	277	if (p < event.ParamCount() - 1)
278	os << wxT(", ");	278	os << wxT(", ");
279	};	279	};

Lines 74-77 Link Here

(-)wxActiveXFrame.h.org (-1 / +1 lines)
74	};	74	};
75		75
76		76
77	#endif	77	#endif




// IDs for the controls and the menu commands
enum
{
	// menu items
	ID_FILE_QUIT = 1,
	ID_FILE_OPEN,
	ID_FILE_BROWSE,
	ID_FILE_HTML_EDITMODE,
	ID_FILE_TEST_HTML,
	ID_FILE_TEST_SELECT,
	ID_FILE_TEST_HTMLSELECT,
	ID_FILE_TEST_GETTEXT,
	ID_FILE_TEST_HTMLGETTEXT,
	ID_FILE_TEST_HOME,
	ID_FILE_TEST_ACTIVEX,
	ID_FILE_ABOUT,

	// controls
	ID_MSHTML = 501,

// handlers) which process them. It can be also done at run-time, but for the
// simple menu events like this the static method is much simpler.
BEGIN_EVENT_TABLE(wxIEFrame, wxFrame)
	EVT_SIZE(wxIEFrame::OnSize)
	EVT_MENU(ID_FILE_QUIT, wxIEFrame::OnQuit)
	EVT_MENU(ID_FILE_BROWSE, wxIEFrame::OnBrowse)
	EVT_MENU(ID_FILE_OPEN, wxIEFrame::OnOpen)
	EVT_MENU(ID_FILE_HTML_EDITMODE, wxIEFrame::OnEditMode)
	EVT_UPDATE_UI(ID_FILE_HTML_EDITMODE, wxIEFrame::OnEditModeUI)
	EVT_MENU(ID_FILE_TEST_HTML, wxIEFrame::OnTestHTML)
	EVT_MENU(ID_FILE_TEST_SELECT, wxIEFrame::OnTestSelect)
	EVT_MENU(ID_FILE_TEST_HTMLSELECT, wxIEFrame::OnTestHTMLSelect)
	EVT_MENU(ID_FILE_TEST_GETTEXT, wxIEFrame::OnTestGetText)
	EVT_MENU(ID_FILE_TEST_HTMLGETTEXT, wxIEFrame::OnTestHTMLGetText)
	EVT_MENU(ID_FILE_TEST_HOME, wxIEFrame::OnTestHome)
	EVT_MENU(ID_FILE_TEST_ACTIVEX, wxIEFrame::OnTestActiveX)
	EVT_MENU(ID_FILE_ABOUT,	wxIEFrame::OnAbout)

	// ActiveX Events
	EVT_ACTIVEX_DISPID(ID_MSHTML, DISPID_STATUSTEXTCHANGE, wxIEFrame::OnMSHTMLStatusTextChangeX)
	EVT_ACTIVEX(ID_MSHTML, "BeforeNavigate2", wxIEFrame::OnMSHTMLBeforeNavigate2X)
	EVT_ACTIVEX(ID_MSHTML, "TitleChange", wxIEFrame::OnMSHTMLTitleChangeX)
	EVT_ACTIVEX(ID_MSHTML, "NewWindow2", wxIEFrame::OnMSHTMLNewWindow2X)
	EVT_ACTIVEX(ID_MSHTML, "ProgressChange", wxIEFrame::OnMSHTMLProgressChangeX)
END_EVENT_TABLE()

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

       : wxFrame((wxFrame *)NULL, -1, title, pos, size)
{
    // set the frame icon
	// problems with resources, commenting by now
	// SetIcon(wxICON(wxIE));

    // create a menu bar
    wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);

    // the "About" item should be in the help menu
    wxMenu *helpMenu = new wxMenu;
	helpMenu->Append(ID_FILE_ABOUT, "&About...\tCtrl-A", "Show about dialog");

	menuFile->Append(ID_FILE_TEST_HTML, "Test HTML", "Demonstrates LoadString()");
	menuFile->Append(ID_FILE_OPEN, "Open HTML File", "Demonstrates LoadStream(istream *)");
	menuFile->Append(ID_FILE_BROWSE, "Browse Web Page", "Demonstrates LoadUrl(url)");
	menuFile->Append(ID_FILE_HTML_EDITMODE, "Edit Mode", "Demonstrates editing html", true);
	menuFile->AppendSeparator();
	menuFile->Append(ID_FILE_TEST_SELECT, "Get Selected Text", "Demonstrates GetStringSelection(false)");
	menuFile->Append(ID_FILE_TEST_HTMLSELECT, "Get HTML Selected Text", "Demonstrates GetStringSelection(true)");
	menuFile->AppendSeparator();
	menuFile->Append(ID_FILE_TEST_GETTEXT, "Get Text", "Demonstrates GetText(false)");
	menuFile->Append(ID_FILE_TEST_HTMLGETTEXT, "Get HTML Text", "Demonstrates GetText(true)");
	menuFile->Append(ID_FILE_TEST_HOME, "Open Home Page", "Demonstrates GoHome()");
	menuFile->AppendSeparator();
	menuFile->Append(ID_FILE_TEST_ACTIVEX, "Display a ActiveX control", "Demonstrates the Generic ActiveX Container");
	menuFile->AppendSeparator();
	menuFile->Append(ID_FILE_QUIT, "E&xit\tAlt-X", "Quit this program");

    // now append the freshly created menu to the menu bar...
    wxMenuBar *menuBar = new wxMenuBar();

Return to bug 46942

Lines 1279-1285 Link Here

(-)wxactivex.cpp.org (-15 / +15 lines)
1279	const wxActiveX::PropX& wxActiveX::GetPropDesc(int idx) const	1279	const wxActiveX::PropX& wxActiveX::GetPropDesc(int idx) const
1280	{	1280	{
1281	if (idx < 0 \|\| idx >= GetPropCount())	1281	if (idx < 0 \|\| idx >= GetPropCount())
1282	throw exception("Property index out of bounds");	1282	throw runtime_error("Property index out of bounds");
1283		1283
1284	return m_props[idx];	1284	return m_props[idx];
1285	};	1285	};
Lines 1291-1297 Link Here
1291	{	1291	{
1292	wxString s;	1292	wxString s;
1293	s << "property <" << name << "> not found";	1293	s << "property <" << name << "> not found";
1294	throw exception(s.mb_str());	1294	throw runtime_error(s.mb_str());
1295	};	1295	};
1296		1296
1297	return GetPropDesc(it->second);	1297	return GetPropDesc(it->second);
Lines 1300-1306 Link Here
1300	const wxActiveX::FuncX& wxActiveX::GetMethodDesc(int idx) const	1300	const wxActiveX::FuncX& wxActiveX::GetMethodDesc(int idx) const
1301	{	1301	{
1302	if (idx < 0 \|\| idx >= GetMethodCount())	1302	if (idx < 0 \|\| idx >= GetMethodCount())
1303	throw exception("Method index out of bounds");	1303	throw runtime_error("Method index out of bounds");
1304		1304
1305		1305
1306	return m_methods[idx];	1306	return m_methods[idx];
Lines 1314-1320 Link Here
1314	{	1314	{
1315	wxString s;	1315	wxString s;
1316	s << "method <" << name << "> not found";	1316	s << "method <" << name << "> not found";
1317	throw exception(s.mb_str());	1317	throw runtime_error(s.mb_str());
1318	};	1318	};
1319		1319
1320	return GetMethodDesc(it->second);	1320	return GetMethodDesc(it->second);
Lines 1345-1351 Link Here
1345	{	1345	{
1346	wxString s;	1346	wxString s;
1347	s << "property <" << name << "> is readonly";	1347	s << "property <" << name << "> is readonly";
1348	throw exception(s.mb_str());	1348	throw runtime_error(s.mb_str());
1349	};	1349	};
1350		1350
1351	VARIANT v = {prop.arg.vt};	1351	VARIANT v = {prop.arg.vt};
Lines 1382-1388 Link Here
1382	{	1382	{
1383	wxString s;	1383	wxString s;
1384	s << "property <" << name << "> is writeonly";	1384	s << "property <" << name << "> is writeonly";
1385	throw exception(s.mb_str());	1385	throw runtime_error(s.mb_str());
1386	};	1386	};
1387		1387
1388	return GetPropAsVariant(prop.memid);	1388	return GetPropAsVariant(prop.memid);
Lines 1393-1399 Link Here
1393	VARIANT v = GetPropAsVariant(name);	1393	VARIANT v = GetPropAsVariant(name);
1394	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BSTR);	1394	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BSTR);
1395	if (! SUCCEEDED(hr))	1395	if (! SUCCEEDED(hr))
1396	throw exception("Unable to convert variant");	1396	throw runtime_error("Unable to convert variant");
1397		1397
1398	wxVariant wv;	1398	wxVariant wv;
1399	MSWVariantToVariant(v, wv);	1399	MSWVariantToVariant(v, wv);
Lines 1408-1414 Link Here
1408	VARIANT v = GetPropAsVariant(name);	1408	VARIANT v = GetPropAsVariant(name);
1409	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BSTR);	1409	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BSTR);
1410	if (! SUCCEEDED(hr))	1410	if (! SUCCEEDED(hr))
1411	throw exception("Unable to convert variant");	1411	throw runtime_error("Unable to convert variant");
1412		1412
1413	wxString s = v.bstrVal;	1413	wxString s = v.bstrVal;
1414	VariantClear(&v);	1414	VariantClear(&v);
Lines 1421-1427 Link Here
1421	VARIANT v = GetPropAsVariant(name);	1421	VARIANT v = GetPropAsVariant(name);
1422	HRESULT hr = VariantChangeType(&v, &v, 0, VT_I1);	1422	HRESULT hr = VariantChangeType(&v, &v, 0, VT_I1);
1423	if (! SUCCEEDED(hr))	1423	if (! SUCCEEDED(hr))
1424	throw exception("Unable to convert variant");	1424	throw runtime_error("Unable to convert variant");
1425		1425
1426	return v.cVal;	1426	return v.cVal;
1427	};	1427	};
Lines 1431-1437 Link Here
1431	VARIANT v = GetPropAsVariant(name);	1431	VARIANT v = GetPropAsVariant(name);
1432	HRESULT hr = VariantChangeType(&v, &v, 0, VT_I4);	1432	HRESULT hr = VariantChangeType(&v, &v, 0, VT_I4);
1433	if (! SUCCEEDED(hr))	1433	if (! SUCCEEDED(hr))
1434	throw exception("Unable to convert variant");	1434	throw runtime_error("Unable to convert variant");
1435		1435
1436	return v.iVal;	1436	return v.iVal;
1437	};	1437	};
Lines 1441-1447 Link Here
1441	VARIANT v = GetPropAsVariant(name);	1441	VARIANT v = GetPropAsVariant(name);
1442	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BOOL);	1442	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BOOL);
1443	if (! SUCCEEDED(hr))	1443	if (! SUCCEEDED(hr))
1444	throw exception("Unable to convert variant");	1444	throw runtime_error("Unable to convert variant");
1445		1445
1446	return v.boolVal != 0;	1446	return v.boolVal != 0;
1447	};	1447	};
Lines 1451-1457 Link Here
1451	VARIANT v = GetPropAsVariant(name);	1451	VARIANT v = GetPropAsVariant(name);
1452	HRESULT hr = VariantChangeType(&v, &v, 0, VT_R8);	1452	HRESULT hr = VariantChangeType(&v, &v, 0, VT_R8);
1453	if (! SUCCEEDED(hr))	1453	if (! SUCCEEDED(hr))
1454	throw exception("Unable to convert variant");	1454	throw runtime_error("Unable to convert variant");
1455		1455
1456	return v.dblVal;	1456	return v.dblVal;
1457	};	1457	};
Lines 1462-1468 Link Here
1462	VARIANT v = GetPropAsVariant(name);	1462	VARIANT v = GetPropAsVariant(name);
1463		1463
1464	if (! VariantToWxDateTime(v, dt))	1464	if (! VariantToWxDateTime(v, dt))
1465	throw exception("Unable to convert variant to wxDateTime");	1465	throw runtime_error("Unable to convert variant to wxDateTime");
1466		1466
1467	return dt;	1467	return dt;
1468	};	1468	};
Lines 1472-1478 Link Here
1472	VARIANT v = GetPropAsVariant(name);	1472	VARIANT v = GetPropAsVariant(name);
1473	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BYREF);	1473	HRESULT hr = VariantChangeType(&v, &v, 0, VT_BYREF);
1474	if (! SUCCEEDED(hr))	1474	if (! SUCCEEDED(hr))
1475	throw exception("Unable to convert variant");	1475	throw runtime_error("Unable to convert variant");
1476		1476
1477	return v.byref;	1477	return v.byref;
1478	};	1478	};
Lines 1530-1536 Link Here
1530	vargs[nargs - i - 1].vt = func.params[i].vt;	1530	vargs[nargs - i - 1].vt = func.params[i].vt;
1531		1531
1532	// put data	1532	// put data
1533	for (i = 0; i < nargs; i++)	1533	for (int i = 0; i < nargs; i++)
1534	VariantToMSWVariant(args[i], vargs[nargs - i - 1]);	1534	VariantToMSWVariant(args[i], vargs[nargs - i - 1]);
1535	};	1535	};
1536		1536

Lines 84-102 Link Here

(-)wxIEFrm.cpp.org (-47 / +48 lines)
84	// IDs for the controls and the menu commands	84	// IDs for the controls and the menu commands
85	enum	85	enum
86	{	86	{
87	// menu items	87	// menu items
88	FILE_QUIT = 1,	88	ID_FILE_QUIT = 1,
89	FILE_OPEN,	89	ID_FILE_OPEN,
90	FILE_BROWSE,	90	ID_FILE_BROWSE,
91	FILE_HTML_EDITMODE,	91	ID_FILE_HTML_EDITMODE,
92	FILE_TEST_HTML,	92	ID_FILE_TEST_HTML,
93	FILE_TEST_SELECT,	93	ID_FILE_TEST_SELECT,
94	FILE_TEST_HTMLSELECT,	94	ID_FILE_TEST_HTMLSELECT,
95	FILE_TEST_GETTEXT,	95	ID_FILE_TEST_GETTEXT,
96	FILE_TEST_HTMLGETTEXT,	96	ID_FILE_TEST_HTMLGETTEXT,
97	FILE_TEST_HOME,	97	ID_FILE_TEST_HOME,
98	FILE_TEST_ACTIVEX,	98	ID_FILE_TEST_ACTIVEX,
99	FILE_ABOUT,	99	ID_FILE_ABOUT,
100		100
101	// controls	101	// controls
102	ID_MSHTML = 501,	102	ID_MSHTML = 501,
Lines 111-137 Link Here
111	// handlers) which process them. It can be also done at run-time, but for the	111	// handlers) which process them. It can be also done at run-time, but for the
112	// simple menu events like this the static method is much simpler.	112	// simple menu events like this the static method is much simpler.
113	BEGIN_EVENT_TABLE(wxIEFrame, wxFrame)	113	BEGIN_EVENT_TABLE(wxIEFrame, wxFrame)
114	EVT_SIZE(wxIEFrame::OnSize)	114	EVT_SIZE(wxIEFrame::OnSize)
115	EVT_MENU(FILE_QUIT, wxIEFrame::OnQuit)	115	EVT_MENU(ID_FILE_QUIT, wxIEFrame::OnQuit)
116	EVT_MENU(FILE_BROWSE, wxIEFrame::OnBrowse)	116	EVT_MENU(ID_FILE_BROWSE, wxIEFrame::OnBrowse)
117	EVT_MENU(FILE_OPEN, wxIEFrame::OnOpen)	117	EVT_MENU(ID_FILE_OPEN, wxIEFrame::OnOpen)
118	EVT_MENU(FILE_HTML_EDITMODE, wxIEFrame::OnEditMode)	118	EVT_MENU(ID_FILE_HTML_EDITMODE, wxIEFrame::OnEditMode)
119	EVT_UPDATE_UI(FILE_HTML_EDITMODE, wxIEFrame::OnEditModeUI)	119	EVT_UPDATE_UI(ID_FILE_HTML_EDITMODE, wxIEFrame::OnEditModeUI)
120	EVT_MENU(FILE_TEST_HTML, wxIEFrame::OnTestHTML)	120	EVT_MENU(ID_FILE_TEST_HTML, wxIEFrame::OnTestHTML)
121	EVT_MENU(FILE_TEST_SELECT, wxIEFrame::OnTestSelect)	121	EVT_MENU(ID_FILE_TEST_SELECT, wxIEFrame::OnTestSelect)
122	EVT_MENU(FILE_TEST_HTMLSELECT, wxIEFrame::OnTestHTMLSelect)	122	EVT_MENU(ID_FILE_TEST_HTMLSELECT, wxIEFrame::OnTestHTMLSelect)
123	EVT_MENU(FILE_TEST_GETTEXT, wxIEFrame::OnTestGetText)	123	EVT_MENU(ID_FILE_TEST_GETTEXT, wxIEFrame::OnTestGetText)
124	EVT_MENU(FILE_TEST_HTMLGETTEXT, wxIEFrame::OnTestHTMLGetText)	124	EVT_MENU(ID_FILE_TEST_HTMLGETTEXT, wxIEFrame::OnTestHTMLGetText)
125	EVT_MENU(FILE_TEST_HOME, wxIEFrame::OnTestHome)	125	EVT_MENU(ID_FILE_TEST_HOME, wxIEFrame::OnTestHome)
126	EVT_MENU(FILE_TEST_ACTIVEX, wxIEFrame::OnTestActiveX)	126	EVT_MENU(ID_FILE_TEST_ACTIVEX, wxIEFrame::OnTestActiveX)
127	EVT_MENU(FILE_ABOUT, wxIEFrame::OnAbout)	127	EVT_MENU(ID_FILE_ABOUT, wxIEFrame::OnAbout)
128		128
129	// ActiveX Events	129	// ActiveX Events
130	EVT_ACTIVEX_DISPID(ID_MSHTML, DISPID_STATUSTEXTCHANGE, OnMSHTMLStatusTextChangeX)	130	EVT_ACTIVEX_DISPID(ID_MSHTML, DISPID_STATUSTEXTCHANGE, wxIEFrame::OnMSHTMLStatusTextChangeX)
131	EVT_ACTIVEX(ID_MSHTML, "BeforeNavigate2", OnMSHTMLBeforeNavigate2X)	131	EVT_ACTIVEX(ID_MSHTML, "BeforeNavigate2", wxIEFrame::OnMSHTMLBeforeNavigate2X)
132	EVT_ACTIVEX(ID_MSHTML, "TitleChange", OnMSHTMLTitleChangeX)	132	EVT_ACTIVEX(ID_MSHTML, "TitleChange", wxIEFrame::OnMSHTMLTitleChangeX)
133	EVT_ACTIVEX(ID_MSHTML, "NewWindow2", OnMSHTMLNewWindow2X)	133	EVT_ACTIVEX(ID_MSHTML, "NewWindow2", wxIEFrame::OnMSHTMLNewWindow2X)
134	EVT_ACTIVEX(ID_MSHTML, "ProgressChange", OnMSHTMLProgressChangeX)	134	EVT_ACTIVEX(ID_MSHTML, "ProgressChange", wxIEFrame::OnMSHTMLProgressChangeX)
135	END_EVENT_TABLE()	135	END_EVENT_TABLE()
136		136
137	// ----------------------------------------------------------------------------	137	// ----------------------------------------------------------------------------
Lines 143-172 Link Here
143	: wxFrame((wxFrame *)NULL, -1, title, pos, size)	143	: wxFrame((wxFrame *)NULL, -1, title, pos, size)
144	{	144	{
145	// set the frame icon	145	// set the frame icon
146	SetIcon(wxICON(wxIE));	146	// problems with resources, commenting by now
		147	// SetIcon(wxICON(wxIE));
147		148
148	// create a menu bar	149	// create a menu bar
149	wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);	150	wxMenu *menuFile = new wxMenu("", wxMENU_TEAROFF);
150		151
151	// the "About" item should be in the help menu	152	// the "About" item should be in the help menu
152	wxMenu *helpMenu = new wxMenu;	153	wxMenu *helpMenu = new wxMenu;
153	helpMenu->Append(FILE_ABOUT, "&About...\tCtrl-A", "Show about dialog");	154	helpMenu->Append(ID_FILE_ABOUT, "&About...\tCtrl-A", "Show about dialog");
154		155
155	menuFile->Append(FILE_TEST_HTML, "Test HTML", "Demonstrates LoadString()");	156	menuFile->Append(ID_FILE_TEST_HTML, "Test HTML", "Demonstrates LoadString()");
156	menuFile->Append(FILE_OPEN, "Open HTML File", "Demonstrates LoadStream(istream *)");	157	menuFile->Append(ID_FILE_OPEN, "Open HTML File", "Demonstrates LoadStream(istream *)");
157	menuFile->Append(FILE_BROWSE, "Browse Web Page", "Demonstrates LoadUrl(url)");	158	menuFile->Append(ID_FILE_BROWSE, "Browse Web Page", "Demonstrates LoadUrl(url)");
158	menuFile->Append(FILE_HTML_EDITMODE, "Edit Mode", "Demonstrates editing html", true);	159	menuFile->Append(ID_FILE_HTML_EDITMODE, "Edit Mode", "Demonstrates editing html", true);
159	menuFile->AppendSeparator();	160	menuFile->AppendSeparator();
160	menuFile->Append(FILE_TEST_SELECT, "Get Selected Text", "Demonstrates GetStringSelection(false)");	161	menuFile->Append(ID_FILE_TEST_SELECT, "Get Selected Text", "Demonstrates GetStringSelection(false)");
161	menuFile->Append(FILE_TEST_HTMLSELECT, "Get HTML Selected Text", "Demonstrates GetStringSelection(true)");	162	menuFile->Append(ID_FILE_TEST_HTMLSELECT, "Get HTML Selected Text", "Demonstrates GetStringSelection(true)");
162	menuFile->AppendSeparator();	163	menuFile->AppendSeparator();
163	menuFile->Append(FILE_TEST_GETTEXT, "Get Text", "Demonstrates GetText(false)");	164	menuFile->Append(ID_FILE_TEST_GETTEXT, "Get Text", "Demonstrates GetText(false)");
164	menuFile->Append(FILE_TEST_HTMLGETTEXT, "Get HTML Text", "Demonstrates GetText(true)");	165	menuFile->Append(ID_FILE_TEST_HTMLGETTEXT, "Get HTML Text", "Demonstrates GetText(true)");
165	menuFile->Append(FILE_TEST_HOME, "Open Home Page", "Demonstrates GoHome()");	166	menuFile->Append(ID_FILE_TEST_HOME, "Open Home Page", "Demonstrates GoHome()");
166	menuFile->AppendSeparator();	167	menuFile->AppendSeparator();
167	menuFile->Append(FILE_TEST_ACTIVEX, "Display a ActiveX control", "Demonstrates the Generic ActiveX Container");	168	menuFile->Append(ID_FILE_TEST_ACTIVEX, "Display a ActiveX control", "Demonstrates the Generic ActiveX Container");
168	menuFile->AppendSeparator();	169	menuFile->AppendSeparator();
169	menuFile->Append(FILE_QUIT, "E&xit\tAlt-X", "Quit this program");	170	menuFile->Append(ID_FILE_QUIT, "E&xit\tAlt-X", "Quit this program");
170		171
171	// now append the freshly created menu to the menu bar...	172	// now append the freshly created menu to the menu bar...
172	wxMenuBar *menuBar = new wxMenuBar();	173	wxMenuBar *menuBar = new wxMenuBar();

Lines 1-15 Link Here

(-)makefile.org (-9 / +22 lines)
1	CC = gcc	1	CC = g++
2		2
3	PROGRAM = wxIE	3	PROGRAM = wxIE.exe
4		4	LIBRARY = wxactivex.a
5	CFLAGS = -I/m/snowball/icicle/gswd/devenv/include -D__WXMOTIF__	5	prefix = /usr
6	LFLAGS = -L/m/snowball/icicle/devenv/lib
7		6
8	# implementation	7	# implementation
9		8
10	.SUFFIXES: .o .cpp	9	.SUFFIXES: .o .cpp
11		10
12	SOURCES:sh= /bin/ls *.cpp	11	APP_SOURCES = wxIEApp.cpp wxIEFrm.cpp wxActiveXFrame.cpp
		12	LIB_SOURCES = wxactivex.cpp IEHtmlWin.cpp
13		13
14	OBJECTS = $(SOURCES:.cpp=.o)	14	APP_OBJECTS = $(APP_SOURCES:.cpp=.o)
		15	LIB_OBJECTS = $(LIB_SOURCES:.cpp=.o)
15		16
Lines 18-23 Link Here
18		18
19	$(PROGRAM): $(OBJECTS)	19	$(PROGRAM): $(LIBRARY) $(APP_OBJECTS)
20	$(CC) -o $(PROGRAM) $(OBJECTS) $(LFLAGS) `wx-config --libs`	20	$(CC) -o $(PROGRAM) $(APP_OBJECTS) $(LIBRARY) `wx-config --libs`
		21	strip $(PROGRAM)
		22
		23	$(LIBRARY): $(LIB_OBJECTS)
		24	ar rs $(LIBRARY) $(LIB_OBJECTS)
		25
		26	install:
		27	mkdir -p $(prefix)/include/wxactivex
		28	mkdir -p $(prefix)/lib
		29	mkdir -p $(prefix)/bin
		30	cp wxactivex.h IEHtmlWin.h $(prefix)/include/wxactivex
		31	cp wxactivex.a $(prefix)/lib
		32	cp wxIE.exe $(prefix)/bin
21		33
22	clean:	34	clean:
23	rm -f *.o $(PROGRAM)	35	rm -f *.o $(PROGRAM)