* modules/gui/wxwindows/wxwindows.cpp: temporary hack (I hope ;) to fix win32 compilation with wxWindows < 2.5.

f87d11a1 · Gildas Bazin · b5584926 · f87d11a1
Commit f87d11a1 authored Jul 24, 2003 by Gildas Bazin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

modules/gui/wxwindows/wxwindows.cpp modules/gui/wxwindows/wxwindows.cpp +6 -5

No files found.
--- a/modules/gui/wxwindows/wxwindows.cpp
+++ b/modules/gui/wxwindows/wxwindows.cpp
@@ -2,7 +2,7 @@
 * wxwindows.cpp : wxWindows plugin for vlc
 *****************************************************************************
 * Copyright (C) 2000-2001 VideoLAN
- * $Id: wxwindows.cpp,v 1.23 2003/07/20 10:38:49 gbazin Exp $
+ * $Id: wxwindows.cpp,v 1.24 2003/07/24 23:21:18 gbazin Exp $
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *
@@ -35,10 +35,11 @@
 #undef Yield
 #undef CreateDialog
-extern int wxEntry( HINSTANCE hInstance,
+/* Hack to detect wxWindows 2.5 which has a different wxEntry() prototype */
-                    HINSTANCE hPrevInstance = NULL,
+#ifdef _WX_INIT_H_
-                    char *pCmdLine = NULL,
+extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
-                    int nCmdShow = SW_NORMAL );
+                    char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
+#endif
 #endif
 /* Let vlc take care of the i18n stuff */