Qt4 - Dialogs. String Changes, reviewed by tonsofpcs

[vlc] / modules / gui / wince / preferences_widgets.cpp

diff --git a/modules/gui/wince/preferences_widgets.cpp b/modules/gui/wince/preferences_widgets.cpp
index c638baae1a0efc1691f710a0e526a0f2cf93fecd..f819c086d060df665c83d31ec3549bfce1da3256 100644 (file)
--- a/modules/gui/wince/preferences_widgets.cpp
+++ b/modules/gui/wince/preferences_widgets.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * preferences_widgets.cpp : WinCE gui plugin for VLC
  *****************************************************************************
- * Copyright (C) 2000-2004 VideoLAN
+ * Copyright (C) 2000-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Marodon Cedric <cedric_marodon@yahoo.fr>
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -29,7 +29,7 @@
 #include <string.h>                                            /* strerror() */
 #include <stdio.h>
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
+#include <vlc_interface.h>
 
 #include "wince.h"
 
@@ -50,6 +50,10 @@ ConfigControl *CreateConfigControl( vlc_object_t *p_this,
 {
     ConfigControl *p_control = NULL;
 
+    if( p_item->psz_current )
+    {
+        return NULL;
+    }
     switch( p_item->i_type )
     {
     case CONFIG_ITEM_MODULE:
@@ -112,9 +116,8 @@ ConfigControl *CreateConfigControl( vlc_object_t *p_this,
 ConfigControl::ConfigControl( vlc_object_t *_p_this,
                               module_config_t *p_item,
                               HWND parent, HINSTANCE hInst )
-  : parent( parent ), p_this( _p_this ),
-    pf_update_callback( NULL ), p_update_data( NULL ),
-    name( p_item->psz_name ), i_type( p_item->i_type ),
+  : p_this( _p_this ), pf_update_callback( NULL ), p_update_data( NULL ),
+    parent( parent ), name( p_item->psz_name ), i_type( p_item->i_type ),
     b_advanced( p_item->b_advanced )
 
 {