X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwince%2Fpreferences_widgets.cpp;h=648dfd6857bbc7b9cef91faf8bbd63a19d484654;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=1dabec9f51d89b959554e56a58c455ca9196910c;hpb=801b203b8a2f0f35717e58ef6f6403c7a22c7848;p=vlc

diff --git a/modules/gui/wince/preferences_widgets.cpp b/modules/gui/wince/preferences_widgets.cpp
index 1dabec9f51..648dfd6857 100644
--- 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,28 +19,22 @@
  *
  * 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.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                            /* strerror() */
-#include <stdio.h>
-#include <string>
-using namespace std;
+#include <vlc/vlc.h>
+#include <vlc_interface.h>
+
+#include "wince.h"
 
 #include <windows.h>
 #include <windowsx.h>
 #include <winuser.h>
 #include <commctrl.h>
-#include <aygshell.h>
-
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
 
-#include "wince.h"
 #include "preferences_widgets.h"
 
 /*****************************************************************************
@@ -53,6 +47,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:
@@ -115,9 +113,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 )
 
 {
@@ -692,7 +689,7 @@ int IntegerListConfigControl::GetIntValue()
  * RangedIntConfigControl implementation
  *****************************************************************************/
 RangedIntConfigControl::RangedIntConfigControl( vlc_object_t *p_this,
-                                                module_config_t *p_item, 
+                                                module_config_t *p_item,
                                                 HWND parent, HINSTANCE hInst,
                                                 int * py_pos )
   : ConfigControl( p_this, p_item, parent, hInst )
@@ -753,7 +750,7 @@ float FloatConfigControl::GetFloatValue()
 {
     float f_value;
 
-    int i_size = Edit_GetTextLength( textctrl );  
+    int i_size = Edit_GetTextLength( textctrl );
     TCHAR *psz_string = (TCHAR *)malloc( (i_size + 1) * sizeof(TCHAR) );
     Edit_GetText( textctrl, psz_string, i_size + 1 );