Changeset 37ffc160897ecf93179454ae36316f7a41e8cc55

Timestamp:

20/12/07 12:47:19 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1198151239 +0000

git-parent:

[6be497de2c4d15da78860caa5971dfbf49c57162]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1198151239 +0000

Message:

Make wxwidgets compile again. The preference dialog still needs fixing.

Files:

• modules/gui/wxwidgets/dialogs/preferences.cpp (modified) (3 diffs)

modules/gui/wxwidgets/dialogs/preferences.cpp

@@ -513 +513 @@
-        if( !strcmp( module_GetObjName(p_module), "main" ) )
-            continue;
-
+
-        /* Exclude empty plugins (submodules don't have config options, they
-         * are stored in the parent module) */
-        if( module_IsSubModule(p_module) )
-            continue;
-
+
-        p_config = module_GetConfig( p_module, &i_confsize );
-        for( size_t i = 0; i < i_confsize; i++ )
@@ -581 +581 @@
-        /* Add the plugin to the tree */
-        ConfigTreeData *config_data = new ConfigTreeData;
+#if 0
-        config_data->b_submodule = module_IsSubModule(p_module);
+#endif
-        config_data->i_type = TYPE_MODULE;
-        config_data->i_object_id = config_data->b_submodule ?
@@ -929 +931 @@
-         * (submodules don't have config options, they are stored in the
-         *  parent module) */
+#if 0
-        if( module_IsSubModule(p_module) )
-            p_start = module_GetConfig((module_t *)(((vlc_object_t *)p_module)->p_parent), &i_confsize);
-        else
+#endif
-            p_start = module_GetConfig(p_module, &i_confsize);
-