wxWindows -> wxWidgets step 3 (refs #80)

diff --git a/modules/gui/wxwidgets/Modules.am b/modules/gui/wxwidgets/Modules.am
index 7492d813bb5841a4940857a3d6c1f452520e4e40..aa6db22c5f474a6868ffae589db896563ccdc251 100644 (file)
--- a/modules/gui/wxwidgets/Modules.am
+++ b/modules/gui/wxwidgets/Modules.am
@@ -1,6 +1,6 @@
-SOURCES_wxwindows = \
-       wxwindows.cpp \
-       wxwindows.h \
+SOURCES_wxwidgets = \
+       wxwidgets.cpp \
+       wxwidgets.h \
        interface.cpp \
        extrapanel.cpp \
        dialogs.cpp \

diff --git a/modules/gui/wxwidgets/bookmarks.cpp b/modules/gui/wxwidgets/bookmarks.cpp
index 46ee09b5e32f257edd9760a03dbf7e3e850e7e80..721bc4b04206b92691a7a76427f95e5fb0c5bf1c 100644 (file)
--- a/modules/gui/wxwidgets/bookmarks.cpp
+++ b/modules/gui/wxwidgets/bookmarks.cpp
@@ -32,7 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include <wx/dialog.h>
 
 /* Callback prototype */

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index 9ced187b88708f61805f532374fb3482d79e6ef5..4374f7407614ae53eac14d91289254e393cf04cc 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -33,7 +33,7 @@
 #include <vlc/aout.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 /* include the icon graphic */
 #include "../../../share/vlc32x32.xpm"

diff --git a/modules/gui/wxwidgets/extrapanel.cpp b/modules/gui/wxwidgets/extrapanel.cpp
index eb310b9acc79918684fd9a79f53f3a1289803153..e459d8f08bfc2a94bdf0b453e74f2a5dacb0d28b 100644 (file)
--- a/modules/gui/wxwidgets/extrapanel.cpp
+++ b/modules/gui/wxwidgets/extrapanel.cpp
@@ -32,7 +32,7 @@
 
 #include <math.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 /*****************************************************************************
  * Local class declarations.

diff --git a/modules/gui/wxwidgets/fileinfo.cpp b/modules/gui/wxwidgets/fileinfo.cpp
index 61ec2c8402a883b7a769794ebc72910d196f74a4..d3235bb7235583fd3546db44326a51772ffbf1fe 100644 (file)
--- a/modules/gui/wxwidgets/fileinfo.cpp
+++ b/modules/gui/wxwidgets/fileinfo.cpp
@@ -27,7 +27,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 /*****************************************************************************
  * Event Table.

diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp
index 34b52f6818152fc02b1e338a9843028d5cdeffab..a5db43c3699520008748abb1b6316a70536af5c1 100644 (file)
--- a/modules/gui/wxwidgets/interface.cpp
+++ b/modules/gui/wxwidgets/interface.cpp
@@ -30,7 +30,7 @@
 #include <vlc/input.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 /* include the toolbar graphics */
 #include "bitmaps/play.xpm"

diff --git a/modules/gui/wxwidgets/iteminfo.cpp b/modules/gui/wxwidgets/iteminfo.cpp
index 3c235155b87625f5a90fcb784f557f3569273f57..981764ddcae0a2e73f294e07c91bfcc6ee97f9b3 100644 (file)
--- a/modules/gui/wxwidgets/iteminfo.cpp
+++ b/modules/gui/wxwidgets/iteminfo.cpp
@@ -36,7 +36,7 @@
 
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 #ifndef wxRB_SINGLE
 #   define wxRB_SINGLE 0

diff --git a/modules/gui/wxwidgets/menus.cpp b/modules/gui/wxwidgets/menus.cpp
index 306c18a996c2dfe0837b0c0c87550161b93c7a11..65e2d8b415ea29bf571541279ae29625cae1da5e 100644 (file)
--- a/modules/gui/wxwidgets/menus.cpp
+++ b/modules/gui/wxwidgets/menus.cpp
@@ -32,7 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 class wxMenuItemExt: public wxMenuItem
 {

diff --git a/modules/gui/wxwidgets/messages.cpp b/modules/gui/wxwidgets/messages.cpp
index 411ace9a9a7b259b7b3d15eed111b9e1641ee7e7..1c986f0b2acfc0f19ac9adc6897ef506a981286f 100644 (file)
--- a/modules/gui/wxwidgets/messages.cpp
+++ b/modules/gui/wxwidgets/messages.cpp
@@ -32,7 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 /*****************************************************************************
  * Event Table.

diff --git a/modules/gui/wxwidgets/open.cpp b/modules/gui/wxwidgets/open.cpp
index a845aa77598660ca3f2d983e912c8c81f1dcf22e..60174ae5b6474099a7e56555a69fb3288c4f92ca 100644 (file)
--- a/modules/gui/wxwidgets/open.cpp
+++ b/modules/gui/wxwidgets/open.cpp
@@ -53,7 +53,7 @@
 
 #include <vector>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include "preferences_widgets.h"
 
 #ifndef wxRB_SINGLE

diff --git a/modules/gui/wxwidgets/playlist.cpp b/modules/gui/wxwidgets/playlist.cpp
index 78fbb6352b58a4eaf086528a0ebf6971fc679fa6..7b5605e8306c6b86361e172789fa12ec4513608c 100644 (file)
--- a/modules/gui/wxwidgets/playlist.cpp
+++ b/modules/gui/wxwidgets/playlist.cpp
@@ -28,7 +28,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 #include "bitmaps/shuffle.xpm"
 #include "bitmaps/repeat.xpm"

diff --git a/modules/gui/wxwidgets/preferences.cpp b/modules/gui/wxwidgets/preferences.cpp
index d914f6fb3ca0a6e1b49dcb942fd2167276478501..77a3102aa19a8d83f415fdd89af8f3231ee01c18 100644 (file)
--- a/modules/gui/wxwidgets/preferences.cpp
+++ b/modules/gui/wxwidgets/preferences.cpp
@@ -34,7 +34,7 @@
 
 #include <vlc_config_cat.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include "preferences_widgets.h"
 
 #include <wx/combobox.h>

diff --git a/modules/gui/wxwidgets/preferences_widgets.cpp b/modules/gui/wxwidgets/preferences_widgets.cpp
index 1322ba05bc703711cf2b90f0bba0084d9833b18b..4bda24bec0ceddc85b1b35c555d5f25f6b973f65 100644 (file)
--- a/modules/gui/wxwidgets/preferences_widgets.cpp
+++ b/modules/gui/wxwidgets/preferences_widgets.cpp
@@ -35,7 +35,7 @@
 
 #include <vlc_config_cat.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include "preferences_widgets.h"
 
 #include <wx/statline.h>

diff --git a/modules/gui/wxwidgets/streamout.cpp b/modules/gui/wxwidgets/streamout.cpp
index a698840a92769a3a59db6e7064b9d890ac49fb47..c041cd1ffa66fe6e4f67027e202286ebf5db1d1d 100644 (file)
--- a/modules/gui/wxwidgets/streamout.cpp
+++ b/modules/gui/wxwidgets/streamout.cpp
@@ -32,7 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include <wx/combobox.h>
 #include <wx/statline.h>
 

diff --git a/modules/gui/wxwidgets/subtitles.cpp b/modules/gui/wxwidgets/subtitles.cpp
index f85fc5148f907feacc25613485ac9d6fb8d4c299..ea6fdbaa4f4232f7c595d1027ec0889b92794c2a 100644 (file)
--- a/modules/gui/wxwidgets/subtitles.cpp
+++ b/modules/gui/wxwidgets/subtitles.cpp
@@ -32,7 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include <wx/combobox.h>
 #include <wx/statline.h>
 

diff --git a/modules/gui/wxwidgets/timer.cpp b/modules/gui/wxwidgets/timer.cpp
index 72a06257b04a03cf164b4acc660ac240ae07e452..230a637173bd86f65d1d808916b1e674627d34ef 100644 (file)
--- a/modules/gui/wxwidgets/timer.cpp
+++ b/modules/gui/wxwidgets/timer.cpp
@@ -35,7 +35,7 @@
 
 #include "vlc_meta.h"
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 #include <wx/timer.h>
 
 //void DisplayStreamDate( wxControl *, intf_thread_t *, int );

diff --git a/modules/gui/wxwidgets/updatevlc.cpp b/modules/gui/wxwidgets/updatevlc.cpp
index cdb23b699da675bb6d50815338cec5493f77ff3b..49308cd460e8282cdf8def424e2b5dd48e0f2597 100644 (file)
--- a/modules/gui/wxwidgets/updatevlc.cpp
+++ b/modules/gui/wxwidgets/updatevlc.cpp
@@ -29,7 +29,7 @@
 
 #include <wx/progdlg.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 #include "vlc_block.h"
 #include "vlc_stream.h"

diff --git a/modules/gui/wxwidgets/video.cpp b/modules/gui/wxwidgets/video.cpp
index 71f3c1c39185f73343c3bc9140d87ce8b8b1a692..c93f8f144c3fd20825394f401e5674af0ded7aac 100644 (file)
--- a/modules/gui/wxwidgets/video.cpp
+++ b/modules/gui/wxwidgets/video.cpp
@@ -28,7 +28,7 @@
 #include <vlc/vout.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 static void *GetWindow( intf_thread_t *p_intf, vout_thread_t *,
                         int *pi_x_hint, int *pi_y_hint,

diff --git a/modules/gui/wxwidgets/wizard.cpp b/modules/gui/wxwidgets/wizard.cpp
index 07776661519b8a8e2179b67efb6566a0f2d7253e..fbb8414984e92ec6dc09ee2a8cafdb22af833ea2 100644 (file)
--- a/modules/gui/wxwidgets/wizard.cpp
+++ b/modules/gui/wxwidgets/wizard.cpp
@@ -32,7 +32,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 #include "streamdata.h"
 

diff --git a/modules/gui/wxwidgets/wxwindows.cpp b/modules/gui/wxwidgets/wxwidgets.cpp
similarity index 99%
rename from modules/gui/wxwidgets/wxwindows.cpp
rename to modules/gui/wxwidgets/wxwidgets.cpp
index 2929057602a765cd307c17504c3dd31cd313bbf1..2b07df7166b487b55b682b5e2d869854b7953d5c 100644 (file)
--- a/modules/gui/wxwidgets/wxwindows.cpp
+++ b/modules/gui/wxwidgets/wxwidgets.cpp
@@ -36,7 +36,7 @@
 #   include <locale.h>
 #endif
 
-#include "wxwindows.h"
+#include "wxwidgets.h"
 
 /* Temporary hack */
 #if defined(WIN32) && defined(_WX_INIT_H_)

diff --git a/modules/gui/wxwidgets/wxwindows.h b/modules/gui/wxwidgets/wxwidgets.h
similarity index 100%
rename from modules/gui/wxwidgets/wxwindows.h
rename to modules/gui/wxwidgets/wxwidgets.h