]> git.sesse.net Git - vlc/commitdiff
* at least it compiles now ;)
authorCyril Deguet <asmax@videolan.org>
Sun, 22 Jun 2003 12:54:03 +0000 (12:54 +0000)
committerCyril Deguet <asmax@videolan.org>
Sun, 22 Jun 2003 12:54:03 +0000 (12:54 +0000)
modules/gui/skins/x11/x11_event.cpp
modules/gui/skins/x11/x11_window.cpp

index d42b8d35fd246864a131655b66122d26cc15f526..a6490abe4d438b0309591c6685b5734e6f46a9dc 100644 (file)
@@ -2,7 +2,7 @@
  * x11_event.cpp: x11 implementation of the Event class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: x11_event.cpp,v 1.4 2003/06/22 00:00:28 asmax Exp $
+ * $Id: x11_event.cpp,v 1.5 2003/06/22 12:54:03 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -74,8 +74,8 @@ bool X11Event::SendEvent()
     {
         // Find window matching with Wnd
         list<SkinWindow *>::const_iterator win;
-        for( win = SkinWindowList::Instance()->Begin();
-             win != SkinWindowList::Instance()->End(); win++ )
+        for( win = p_intf->p_sys->p_theme->WindowList.begin();
+             win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
         {
             // If it is the correct window
             if( Wnd == ( (X11Window *)(*win) )->GetHandle() )
index 92ab75f0ed1f461dbc04ffec5c36b1c97cd108a4..16d76028d1e10281ea16992f56da74a4bebf0642 100644 (file)
@@ -2,7 +2,7 @@
  * x11_window.cpp: X11 implementation of the Window class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: x11_window.cpp,v 1.25 2003/06/22 00:00:28 asmax Exp $
+ * $Id: x11_window.cpp,v 1.26 2003/06/22 12:54:03 asmax Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -274,8 +274,8 @@ bool X11Window::ProcessOSEvent( Event *evt )
         case ButtonPress:
             // Raise all the windows
             for( list<SkinWindow *>::const_iterator win = 
-                    SkinWindowList::Instance()->Begin();
-                    win != SkinWindowList::Instance()->End(); win++ )
+                    p_intf->p_sys->p_theme->WindowList.begin();
+                    win != p_intf->p_sys->p_theme->WindowList.end(); win++ )
             {
                 XLOCK;
                 XRaiseWindow( display, ( (X11Window *)(*win) )->GetHandle() );
@@ -408,10 +408,6 @@ bool X11Window::ProcessOSEvent( Event *evt )
                 DropObject->DndDrop( ((XClientMessageEvent*)p2)->data.l );
                 return true;
             }
-            else
-            {
-                fprintf( stderr, "Unsupported client event %s\n", type );
-            }
             return false;
             
         default: