skins2: transform getNextSibling into getNextSiblingOrUncle

[vlc] / modules / gui / skins2 / macosx / macosx_factory.cpp

diff --git a/modules/gui/skins2/macosx/macosx_factory.cpp b/modules/gui/skins2/macosx/macosx_factory.cpp
index 1c509dd39b7560a38e2526438a71bba9b0bd7ef7..3efac86e7b69037ca9f108a60d9b23ade1738bd8 100644 (file)
--- a/modules/gui/skins2/macosx/macosx_factory.cpp
+++ b/modules/gui/skins2/macosx/macosx_factory.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * macosx_factory.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef MACOSX_SKINS
@@ -26,6 +26,7 @@
 #include "macosx_factory.hpp"
 #include "macosx_graphics.hpp"
 #include "macosx_loop.hpp"
+#include "macosx_popup.hpp"
 #include "macosx_timer.hpp"
 #include "macosx_window.hpp"
 #include "macosx_tooltip.hpp"
@@ -73,9 +74,34 @@ void MacOSXFactory::minimize()
     // TODO
 }
 
-OSTimer *MacOSXFactory::createOSTimer( const Callback &rCallback )
+void MacOSXFactory::restore()
 {
-    return new MacOSXTimer( getIntf(), rCallback );
+    // TODO
+}
+
+void MacOSXFactory::addInTray()
+{
+    // TODO
+}
+
+void MacOSXFactory::removeFromTray()
+{
+    // TODO
+}
+
+void MacOSXFactory::addInTaskBar()
+{
+    // TODO
+}
+
+void MacOSXFactory::removeFromTaskBar()
+{
+    // TODO
+}
+
+OSTimer *MacOSXFactory::createOSTimer( CmdGeneric &rCmd )
+{
+    return new MacOSXTimer( getIntf(), rCmd );
 }
 
 
@@ -83,7 +109,7 @@ OSWindow *MacOSXFactory::createOSWindow( GenericWindow &rWindow, bool dragDrop,
                                       bool playOnDrop, OSWindow *pParent )
 {
     return new MacOSXWindow( getIntf(), rWindow, dragDrop,
-                          playOnDrop, (MacOSXWindow*)pParent );
+                             playOnDrop, (MacOSXWindow*)pParent );
 }
 
 
@@ -93,6 +119,12 @@ OSTooltip *MacOSXFactory::createOSTooltip()
 }
 
 
+OSPopup *MacOSXFactory::createOSPopup()
+{
+    return new MacOSXPopup( getIntf() );
+}
+
+
 int MacOSXFactory::getScreenWidth() const
 {
     // TODO
@@ -107,10 +139,10 @@ int MacOSXFactory::getScreenHeight() const
 }
 
 
-Rect MacOSXFactory::getWorkArea() const
+SkinsRect MacOSXFactory::getWorkArea() const
 {
     // XXX
-    return Rect( 0, 0, getScreenWidth(), getScreenHeight() );
+    return SkinsRect( 0, 0, getScreenWidth(), getScreenHeight() );
 }