[vlc-commits] macosx: remove unneeded outlet for window in controlsBar code

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Fri Sep 28 10:55:28 2012 +0200| [4d406ab204772b06535ccb719ceeb59955fdbf96] | committer: David Fuhrmann

macosx: remove unneeded outlet for window in controlsBar code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d406ab204772b06535ccb719ceeb59955fdbf96
---

 .../macosx/Resources/English.lproj/MainMenu.xib    |   35 ++++----------------
 modules/gui/macosx/ControlsBar.h                   |    2 --
 modules/gui/macosx/ControlsBar.m                   |    2 +-
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
index 521dfb8..39d9ef1 100644
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib
@@ -2,10 +2,10 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
   <data>
     <int key="IBDocument.SystemTarget">1050</int>
-    <string key="IBDocument.SystemVersion">12B19</string>
+    <string key="IBDocument.SystemVersion">12C54</string>
     <string key="IBDocument.InterfaceBuilderVersion">851</string>
-    <string key="IBDocument.AppKitVersion">1187</string>
-    <string key="IBDocument.HIToolboxVersion">624.00</string>
+    <string key="IBDocument.AppKitVersion">1187.34</string>
+    <string key="IBDocument.HIToolboxVersion">625.00</string>
     <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
       <bool key="EncodedWithXMLCoder">YES</bool>
       <object class="NSArray" key="dict.sortedKeys">
@@ -21,10 +21,10 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
+      <integer value="4596"/>
       <integer value="4948"/>
       <integer value="5248"/>
       <integer value="21"/>
-      <integer value="4596"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -8406,14 +8406,6 @@ LCAuLi4</string>
         </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
-            <string key="label">o_associated_window</string>
-            <reference key="source" ref="878580547"/>
-            <reference key="destination" ref="498338108"/>
-          </object>
-          <int key="connectionID">5365</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
             <string key="label">o_progress_view</string>
             <reference key="source" ref="878580547"/>
             <reference key="destination" ref="271396113"/>
@@ -8478,14 +8470,6 @@ LCAuLi4</string>
         </object>
         <object class="IBConnectionRecord">
           <object class="IBOutletConnection" key="connection">
-            <string key="label">o_associated_window</string>
-            <reference key="source" ref="573738745"/>
-            <reference key="destination" ref="429979276"/>
-          </object>
-          <int key="connectionID">5375</int>
-        </object>
-        <object class="IBConnectionRecord">
-          <object class="IBOutletConnection" key="connection">
             <string key="label">o_bottombar_view</string>
             <reference key="source" ref="573738745"/>
             <reference key="destination" ref="984096082"/>
@@ -14385,7 +14369,6 @@ LCAuLi4</string>
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>o_associated_window</string>
               <string>o_bottombar_view</string>
               <string>o_bwd_btn</string>
               <string>o_fullscreen_btn</string>
@@ -14413,14 +14396,12 @@ LCAuLi4</string>
               <string>id</string>
               <string>id</string>
               <string>id</string>
-              <string>id</string>
             </object>
           </object>
           <object class="NSMutableDictionary" key="toOneOutletInfosByName">
             <bool key="EncodedWithXMLCoder">YES</bool>
             <object class="NSArray" key="dict.sortedKeys">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>o_associated_window</string>
               <string>o_bottombar_view</string>
               <string>o_bwd_btn</string>
               <string>o_fullscreen_btn</string>
@@ -14437,10 +14418,6 @@ LCAuLi4</string>
             <object class="NSMutableArray" key="dict.values">
               <bool key="EncodedWithXMLCoder">YES</bool>
               <object class="IBToOneOutletInfo">
-                <string key="name">o_associated_window</string>
-                <string key="candidateClassName">id</string>
-              </object>
-              <object class="IBToOneOutletInfo">
                 <string key="name">o_bottombar_view</string>
                 <string key="candidateClassName">id</string>
               </object>
@@ -16996,7 +16973,7 @@ LCAuLi4</string>
             </object>
             <object class="NSMutableArray" key="dict.values">
               <bool key="EncodedWithXMLCoder">YES</bool>
-              <string>id</string>
+              <string>VLCControlsBarCommon</string>
               <string>id</string>
             </object>
           </object>
@@ -17011,7 +16988,7 @@ LCAuLi4</string>
               <bool key="EncodedWithXMLCoder">YES</bool>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_controls_bar</string>
-                <string key="candidateClassName">id</string>
+                <string key="candidateClassName">VLCControlsBarCommon</string>
               </object>
               <object class="IBToOneOutletInfo">
                 <string key="name">o_titlebar_view</string>
diff --git a/modules/gui/macosx/ControlsBar.h b/modules/gui/macosx/ControlsBar.h
index 7860a0c..27ec9db 100644
--- a/modules/gui/macosx/ControlsBar.h
+++ b/modules/gui/macosx/ControlsBar.h
@@ -36,8 +36,6 @@
 
 @interface VLCControlsBarCommon : NSObject
 {
-    IBOutlet id o_associated_window;
-    
     IBOutlet id o_bottombar_view;
 
     IBOutlet id o_play_btn;
diff --git a/modules/gui/macosx/ControlsBar.m b/modules/gui/macosx/ControlsBar.m
index b2acdee..8a93cbf 100644
--- a/modules/gui/macosx/ControlsBar.m
+++ b/modules/gui/macosx/ControlsBar.m
@@ -136,7 +136,7 @@
     if (!OSX_SNOW_LEOPARD)
         [o_resize_view setImage: NULL];
 
-    if ([o_associated_window styleMask] & NSResizableWindowMask)
+    if ([[o_bottombar_view window] styleMask] & NSResizableWindowMask)
         [o_resize_view removeFromSuperviewWithoutNeedingDisplay];
 
 }