From: Jean-Paul Saman <jpsaman@videolan.org>
Date: Tue, 10 Jun 2008 13:39:59 +0000 (+0200)
Subject: Move Toolbar to the IVLCControl2 interface object, where it should have been all... 
X-Git-Tag: 0.9.0-test0~132
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=e5ff4e7a60e66465322c356392778a3593918b95;p=vlc

Move Toolbar to the IVLCControl2 interface object, where it should have been all along.
---

diff --git a/projects/activex/axvlc.idl b/projects/activex/axvlc.idl
index 94dcaff492..3965b5270d 100644
--- a/projects/activex/axvlc.idl
+++ b/projects/activex/axvlc.idl
@@ -134,15 +134,6 @@ library AXVLC
 ** for compatibility with some scripting language (JScript)
 */
 
-        /*
-         * caution: vlcobject.toolbar:bool does not yet exists in Firefox
-         * plugin. Official usage is through "toolbar" property for now,
-         * which is compatibile with Firefox.
-         */
-        [id(DISPID_Toolbar), propget, helpstring("Returns/sets visibility of the toolbar")]
-        HRESULT Toolbar([out, retval] VARIANT_BOOL* visible);
-        [id(DISPID_Toolbar), propput, helpstring("Returns/sets visibility of the toolbar")]
-        HRESULT Toolbar([in] VARIANT_BOOL visible);
         HRESULT addTarget([in] BSTR uri, [in] VARIANT options, [in] enum VLCPlaylistMode mode, [in] int position);
         [propget, helpstring("Returns index of current item in playlist.")]
         HRESULT PlaylistIndex([out, retval] int* index);
@@ -420,6 +411,7 @@ library AXVLC
     {
         [propget, helpstring("Returns/sets the fullscreen state.")]
         HRESULT fullscreen([out, retval] VARIANT_BOOL* fullscreen);
+
         [propput, helpstring("Returns/sets the fullscreen state.")]
         HRESULT fullscreen([in] VARIANT_BOOL fullscreen);
 
@@ -511,6 +503,16 @@ library AXVLC
         [id(DISPID_BackColor), propput, helpstring("Returns/sets background color.")]
         HRESULT BackColor([in] OLE_COLOR backcolor);
 
+        /*
+         * caution: vlcobject.toolbar:bool does not yet exists in Firefox
+         * plugin. Official usage is through "toolbar" property for now,
+         * which is compatibile with Firefox.
+         */
+        [id(DISPID_Toolbar), propget, helpstring("Returns/sets visibility of the toolbar")]
+        HRESULT Toolbar([out, retval] VARIANT_BOOL* visible);
+        [id(DISPID_Toolbar), propput, helpstring("Returns/sets visibility of the toolbar")]
+        HRESULT Toolbar([in] VARIANT_BOOL visible);
+
         [propget, helpstring("Returns the audio object.")]
         HRESULT audio([out, retval] IVLCAudio** obj);