Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export wxActiveX stuff from core (not media) DLL (closes #8991)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-16 17:44:16 +00:00
parent 68888eeaa8
commit 213b5041fe
22 changed files with 292 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/msw/ole/activex.h
View File

@@ -140,7 +140,7 @@ WX_DECLARE_AUTOOLE(wxAutoIOleInPlaceActiveObject, IOleInPlaceActiveObject)
WX_DECLARE_AUTOOLE(wxAutoIOleDocumentView, IOleDocumentView)
WX_DECLARE_AUTOOLE(wxAutoIViewObject, IViewObject)
class wxActiveXContainer : public wxWindow
class WXDLLIMPEXP_CORE wxActiveXContainer : public wxWindow
{
public:
wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk);
@@ -174,7 +174,7 @@ protected:
// Events
class wxActiveXEvent : public wxCommandEvent
class WXDLLIMPEXP_CORE wxActiveXEvent : public wxCommandEvent
{
private:
friend class wxActiveXEvents;
@@ -211,7 +211,7 @@ public:
};
// #define wxACTIVEX_ID 14001
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_MEDIA, wxEVT_ACTIVEX, wxActiveXEvent )
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_ACTIVEX, wxActiveXEvent )
typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);