Reuse wxMessageOutputStderr for wxLogStderr implementation.

[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 63b9414d29ab344933f90208a8ec659ce2788da6..89eee6909cb82d61fa8b9b797079cd1b92eb6bf2 100644 (file)
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        automtn.h
+// Name:        wx/msw/ole/automtn.h

 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:


@@ -21,6 +21,7 @@
 
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;
 
 typedef void            WXIDISPATCH;
 typedef unsigned short* WXBSTR;

+typedef unsigned long   WXLCID;

 
 #ifdef GetObject
 #undef GetObject
 
 #ifdef GetObject
 #undef GetObject


@@ -33,7 +34,11 @@ enum wxAutomationInstanceFlags
     wxAutomationInstance_UseExistingOnly = 0,
 
     // Create a new instance if there are no existing ones.
     wxAutomationInstance_UseExistingOnly = 0,
 
     // Create a new instance if there are no existing ones.

-    wxAutomationInstance_CreateIfNeeded = 1
+    wxAutomationInstance_CreateIfNeeded = 1,
+
+    // Do not log errors if we failed to get the existing instance because none
+    // is available.
+    wxAutomationInstance_SilentIfNone = 2

 };
 
 /*
 };
 
 /*


@@ -102,9 +107,21 @@ public:
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const;
 
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const;
     bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const;
 

-public:
+    // Returns the locale identifier used in automation calls. The default is
+    // LOCALE_SYSTEM_DEFAULT. Objects obtained by GetObject() inherit the
+    // locale identifier from the one that created them.
+    WXLCID GetLCID() const;
+
+    // Sets the locale identifier to be used in automation calls performed by
+    // this object. The default is LOCALE_SYSTEM_DEFAULT.
+    void SetLCID(WXLCID lcid);
+
+public: // public for compatibility only, don't use m_dispatchPtr directly.

     WXIDISPATCH*  m_dispatchPtr;
 
     WXIDISPATCH*  m_dispatchPtr;
 

+private:
+    WXLCID m_lcid;
+

     wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };
 
     wxDECLARE_NO_COPY_CLASS(wxAutomationObject);
 };