Commit 0bd43e4c authored by Christophe Mutricy's avatar Christophe Mutricy

wxWindows -> wxWidgets step 3 (refs #80)

parent 60733a8c
SOURCES_wxwindows = \ SOURCES_wxwidgets = \
wxwindows.cpp \ wxwidgets.cpp \
wxwindows.h \ wxwidgets.h \
interface.cpp \ interface.cpp \
extrapanel.cpp \ extrapanel.cpp \
dialogs.cpp \ dialogs.cpp \
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include <wx/dialog.h> #include <wx/dialog.h>
/* Callback prototype */ /* Callback prototype */
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <vlc/aout.h> #include <vlc/aout.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
/* include the icon graphic */ /* include the icon graphic */
#include "../../../share/vlc32x32.xpm" #include "../../../share/vlc32x32.xpm"
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <math.h> #include <math.h>
#include "wxwindows.h" #include "wxwidgets.h"
/***************************************************************************** /*****************************************************************************
* Local class declarations. * Local class declarations.
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
/***************************************************************************** /*****************************************************************************
* Event Table. * Event Table.
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <vlc/input.h> #include <vlc/input.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
/* include the toolbar graphics */ /* include the toolbar graphics */
#include "bitmaps/play.xpm" #include "bitmaps/play.xpm"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
#ifndef wxRB_SINGLE #ifndef wxRB_SINGLE
# define wxRB_SINGLE 0 # define wxRB_SINGLE 0
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
class wxMenuItemExt: public wxMenuItem class wxMenuItemExt: public wxMenuItem
{ {
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
/***************************************************************************** /*****************************************************************************
* Event Table. * Event Table.
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include <vector> #include <vector>
#include "wxwindows.h" #include "wxwidgets.h"
#include "preferences_widgets.h" #include "preferences_widgets.h"
#ifndef wxRB_SINGLE #ifndef wxRB_SINGLE
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include "bitmaps/shuffle.xpm" #include "bitmaps/shuffle.xpm"
#include "bitmaps/repeat.xpm" #include "bitmaps/repeat.xpm"
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include <vlc_config_cat.h> #include <vlc_config_cat.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include "preferences_widgets.h" #include "preferences_widgets.h"
#include <wx/combobox.h> #include <wx/combobox.h>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include <vlc_config_cat.h> #include <vlc_config_cat.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include "preferences_widgets.h" #include "preferences_widgets.h"
#include <wx/statline.h> #include <wx/statline.h>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include <wx/combobox.h> #include <wx/combobox.h>
#include <wx/statline.h> #include <wx/statline.h>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include <wx/combobox.h> #include <wx/combobox.h>
#include <wx/statline.h> #include <wx/statline.h>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "vlc_meta.h" #include "vlc_meta.h"
#include "wxwindows.h" #include "wxwidgets.h"
#include <wx/timer.h> #include <wx/timer.h>
//void DisplayStreamDate( wxControl *, intf_thread_t *, int ); //void DisplayStreamDate( wxControl *, intf_thread_t *, int );
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <wx/progdlg.h> #include <wx/progdlg.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include "vlc_block.h" #include "vlc_block.h"
#include "vlc_stream.h" #include "vlc_stream.h"
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <vlc/vout.h> #include <vlc/vout.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
static void *GetWindow( intf_thread_t *p_intf, vout_thread_t *, static void *GetWindow( intf_thread_t *p_intf, vout_thread_t *,
int *pi_x_hint, int *pi_y_hint, int *pi_x_hint, int *pi_y_hint,
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwidgets.h"
#include "streamdata.h" #include "streamdata.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
# include <locale.h> # include <locale.h>
#endif #endif
#include "wxwindows.h" #include "wxwidgets.h"
/* Temporary hack */ /* Temporary hack */
#if defined(WIN32) && defined(_WX_INIT_H_) #if defined(WIN32) && defined(_WX_INIT_H_)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment