* modules/gui/wxwindows/*, include/vlc_interface.h: new generic "open file" dialog.

[vlc] / modules / gui / skins / src / skin_common.h

diff --git a/modules/gui/skins/src/skin_common.h b/modules/gui/skins/src/skin_common.h
index 33b580be092aa6797de643d2b7a56bea27b2747d..771ef2d026a8d2b2437c80a2aad4762d92391d7c 100644 (file)
--- a/modules/gui/skins/src/skin_common.h
+++ b/modules/gui/skins/src/skin_common.h
@@ -2,7 +2,7 @@
  * skin_common.h: Private Skin interface description
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_common.h,v 1.13 2003/06/03 22:18:58 gbazin Exp $
+ * $Id: skin_common.h,v 1.23 2003/07/20 10:38:49 gbazin Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,12 +32,20 @@
 
 class Theme;
 class Dialogs;
+class wxMenu;
 class wxIcon;
 
 #ifdef X11_SKINS
 #include <X11/Xlib.h>
 #endif
 
+// For mouse events FIXME: should be elsewhere?
+#define MOUSE_LEFT (1<<0)
+#define MOUSE_RIGHT (1<<1)
+#define KEY_CTRL (1<<2)
+#define KEY_SHIFT (1<<3)
+
+
 //---------------------------------------------------------------------------
 // intf_sys_t: description and status of skin interface
 //---------------------------------------------------------------------------
@@ -67,7 +75,11 @@ struct intf_sys_t
     // Interface dialogs
     Dialogs *p_dialogs;
 
-#ifndef BASIC_SKINS
+    // Popup menu
+    vlc_bool_t b_popup_change;
+#if !defined(MODULE_NAME_IS_basic_skins)
+    wxMenu     *p_popup_menu;
+
     wxIcon      *p_icon;
 #endif
 
@@ -75,9 +87,14 @@ struct intf_sys_t
     Display *display;
     Window mainWin;    // Window which receives "broadcast" events
     vlc_mutex_t xlock;
+    Pixmap iconPixmap; // vlc icon
+    Pixmap iconMask;
 #endif
 
 #ifdef WIN32
+    // Interface thread id used to post broadcast messages
+    DWORD dwThreadId;
+
     // We dynamically load msimg32.dll to get a pointer to TransparentBlt()
     HINSTANCE h_msimg32_dll;
     BOOL (WINAPI *TransparentBlt)( HDC,int,int,int,int,HDC,int,