wxTopLevelWindows is now a wxWindowList, better compatibility with the old

[wxWidgets.git] / include / wx / msw / ole / automtn.h

diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index e43474d58a4f75858e24ad7c7c47919e1932a617..9e35455a5433de2f683e08d1612ac7d7f37148e5 100644 (file)
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -22,12 +22,16 @@
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
 
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
 

+#ifdef GetObject
+#undef GetObject
+#endif
+

 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.
  */
 
 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.
  */
 

-class wxAutomationObject: public wxObject
+class WXDLLEXPORT wxAutomationObject: public wxObject

 {
 public:
     wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);
 {
 public:
     wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL);


@@ -81,36 +85,10 @@ public:
        // without having to deal with nasty IDispatch pointers.
        bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
 
        // without having to deal with nasty IDispatch pointers.
        bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const;
 

-       // Convert variants
-    static bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant) ;
-    static bool ConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant) ;
-

 public:
     WXIDISPATCH*  m_dispatchPtr;
 };
 
 public:
     WXIDISPATCH*  m_dispatchPtr;
 };
 

-// wrapper around BSTR type (by Vadim Zeitlin)
-
-class BasicString
-{
-public:
-  // ctors & dtor
-  BasicString(const char *sz);
- ~BasicString();
-
-  // accessors
-    // just get the string
-  operator BSTR() const { return m_wzBuf; }
-    // retrieve a copy of our string - caller must SysFreeString() it later!
-  BSTR Get() const { return SysAllocString(m_wzBuf); }
-
-private:
-  // @@@ not implemented (but should be)
-  BasicString(const BasicString&);
-  BasicString& operator=(const BasicString&);
-
-  OLECHAR *m_wzBuf;     // actual string
-};

 
 #endif
     // _WX_AUTOMTN_H_
 
 #endif
     // _WX_AUTOMTN_H_