Make storing non-trivial data in wxThreadSpecificInfo possible.

[wxWidgets.git] / interface / wx / msw / ole / activex.h

diff --git a/interface/wx/msw/ole/activex.h b/interface/wx/msw/ole/activex.h
index 19f50d265d73e0f110a8ff9917e5f6ca4b117104..13776688b2c8170a2535a9ef14980bc7543d77e1 100644 (file)
--- a/interface/wx/msw/ole/activex.h
+++ b/interface/wx/msw/ole/activex.h
@@ -2,8 +2,7 @@
 // Name:        msw/ole/activex.h
 // Purpose:     interface of wxActiveXEvent
 // Author:      wxWidgets team
 // Name:        msw/ole/activex.h
 // Purpose:     interface of wxActiveXEvent
 // Author:      wxWidgets team

-// RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -18,7 +17,7 @@
 
     @beginEventTable{wxActiveXEvent}
     @event{EVT_ACTIVEX(func)}
 
     @beginEventTable{wxActiveXEvent}
     @event{EVT_ACTIVEX(func)}

-        Sent when the ActiveX control hosted by wxActiveXContainer recieves an
+        Sent when the ActiveX control hosted by wxActiveXContainer receives an

         ActiveX event.
     @endEventTable
 
         ActiveX event.
     @endEventTable
 


@@ -85,7 +84,7 @@ public:
     is a platform-specific class).
 
     Note that the HWND that the class contains is the actual HWND of the ActiveX
     is a platform-specific class).
 
     Note that the HWND that the class contains is the actual HWND of the ActiveX

-    control so using dynamic events and connecting to wxEVT_SIZE, for example,
+    control so using dynamic events and connecting to @c wxEVT_SIZE, for example,

     will receive the actual size message sent to the control.
 
     It is somewhat similar to the ATL class CAxWindow in operation.
     will receive the actual size message sent to the control.
 
     It is somewhat similar to the ATL class CAxWindow in operation.


@@ -263,23 +262,23 @@ public:
         wxActiveXContainer* m_pAX;
         wxAutomationObject m_PDF;
 
         wxActiveXContainer* m_pAX;
         wxAutomationObject m_PDF;
 

-        DECLARE_DYNAMIC_CLASS(wxPDFMediaBackend)
+        wxDECLARE_DYNAMIC_CLASS(wxPDFMediaBackend)

     };
 
     };
 

-    IMPLEMENT_DYNAMIC_CLASS(wxPDFMediaBackend, wxMediaBackend);
-    Put this in one of your existant source files and then create a wxMediaCtrl with
+    wxIMPLEMENT_DYNAMIC_CLASS(wxPDFMediaBackend, wxMediaBackend);

 
 

-    //[this] is the parent window, "myfile.pdf" is the PDF file to open
+    // Put this in one of your existing source files and then create a wxMediaCtrl with

     wxMediaCtrl* mymediactrl = new wxMediaCtrl(this, "myfile.pdf", wxID_ANY,
                                             wxDefaultPosition, wxSize(300,300),
                                             0, "wxPDFMediaBackend");
     wxMediaCtrl* mymediactrl = new wxMediaCtrl(this, "myfile.pdf", wxID_ANY,
                                             wxDefaultPosition, wxSize(300,300),
                                             0, "wxPDFMediaBackend");

+            // [this] is the parent window, "myfile.pdf" is the PDF file to open

     @endcode
 
 
     @onlyfor{wxmsw}
 
     @endcode
 
 
     @onlyfor{wxmsw}
 

-    @library{wxbase}
-    @category{misc,ipc}
+    @library{wxcore}
+    @category{ctrl,ipc}

 
     @see wxActiveXEvent, @ref page_samples_flash
 */
 
     @see wxActiveXEvent, @ref page_samples_flash
 */


@@ -297,5 +296,18 @@ public:
             Interface of ActiveX control.
     */
     wxActiveXContainer(wxWindow* parent, REFIID iid, IUnknown* pUnk);
             Interface of ActiveX control.
     */
     wxActiveXContainer(wxWindow* parent, REFIID iid, IUnknown* pUnk);

+    /**
+        Queries host's site for interface.
+
+        @param iid
+            The iid of the required interface.
+        @param _interface
+            Double pointer to outgoing interface. Supply your own interface if desired.
+        @param desc
+            The description of the outgoing interface.
+        @return bool
+            Return true if interface supplied else return false.
+    */
+    virtual bool QueryClientSiteInterface(REFIID iid, void **_interface, const char *&desc);

 };
 
 };