Commit 729821ec authored by gbazin's avatar gbazin
Browse files

* modules/gui/wxwidgets/*: fix a bunch of warnings.

parent 757962a0
......@@ -1442,7 +1442,7 @@ wxMenu *Playlist::SDMenu()
if( !strcmp( p_parser->psz_capability, "services_discovery" ) )
i_number++;
}
if( i_number ) pp_sds = (char **)calloc( i_number, sizeof(void *) );
if( i_number ) pp_sds = (const char **)calloc( i_number, sizeof(void *) );
i_number = 0;
for( int i_index = 0; i_index < p_list->i_count; i_index++ )
......
......@@ -180,7 +180,7 @@ private:
int i_update_counter;
vlc_bool_t b_changed_view;
char **pp_sds;
const char **pp_sds;
protected:
intf_thread_t *p_intf;
......
......@@ -362,7 +362,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
if( i_index < p_list->i_count )
{
wxTreeItemId current_item;
char *psz_help;
const char *psz_help;
/* We found the main module */
/* Enumerate config categories and store a reference so we can
......@@ -434,7 +434,7 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
cd->psz_name = strdup( config_CategoryNameGet(
p_item->value.i ) );
if( cd->psz_help ) free( cd->psz_help );
char *psz_help = config_CategoryHelpGet( p_item->value.i );
const char *psz_help = config_CategoryHelpGet( p_item->value.i );
if( psz_help )
{
cd->psz_help = wraptext( strdup( psz_help ), 72 );
......@@ -953,7 +953,7 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
}
/* Add a head title to the panel */
char *psz_head;
const char *psz_head;
if( config_data->i_type == TYPE_SUBCATEGORY ||
config_data->i_type == TYPE_CATSUBCAT )
{
......
......@@ -281,7 +281,7 @@ ModuleConfigControl::ModuleConfigControl( vlc_object_t *p_this,
if( !strcmp( p_parser->psz_capability, p_item->psz_type ) )
{
combo->Append( wxU(p_parser->psz_longname),
p_parser->psz_object_name );
(char *)p_parser->psz_object_name );
if( p_item->value.psz && !strcmp(p_item->value.psz,
p_parser->psz_object_name) )
combo->SetValue( wxU(p_parser->psz_longname) );
......@@ -344,7 +344,7 @@ ModuleCatConfigControl::ModuleCatConfigControl( vlc_object_t *p_this,
p_config->value.i == p_item->min.i )
{
combo->Append( wxU(p_parser->psz_longname),
p_parser->psz_object_name );
(char *)p_parser->psz_object_name );
if( p_item->value.psz && !strcmp(p_item->value.psz,
p_parser->psz_object_name) )
combo->SetValue( wxU(p_parser->psz_longname) );
......@@ -559,7 +559,7 @@ StringListConfigControl::StringListConfigControl( vlc_object_t *p_this,
wxWindow *parent )
: ConfigControl( p_this, p_item, parent )
{
psz_default_value = p_item->value.psz;
psz_default_value = (char *)p_item->value.psz;
if( psz_default_value ) psz_default_value = strdup( psz_default_value );
label = new wxStaticText(this, -1, wxU(p_item->psz_text));
......
......@@ -208,7 +208,7 @@ class wizInputPage : public wxWizardPage
{
public:
wizInputPage( wxWizard *, wxWizardPage *, intf_thread_t *);
wizInputPage::~wizInputPage();
~wizInputPage();
void OnWizardPageChanging(wxWizardEvent& event);
void OnInputChange( wxCommandEvent& event );
void OnEnablePartial(wxCommandEvent& event);
......@@ -262,7 +262,7 @@ class wizTranscodeCodecPage : public wxWizardPage
public:
wizTranscodeCodecPage( wxWizard *parent, wxWizardPage *next);
~wizTranscodeCodecPage();
void wizTranscodeCodecPage::OnWizardPageChanging(wxWizardEvent& event);
void OnWizardPageChanging(wxWizardEvent& event);
virtual wxWizardPage *GetPrev() const;
virtual wxWizardPage *GetNext() const;
void SetPrev( wxWizardPage *page);
......@@ -339,7 +339,7 @@ class wizEncapPage : public wxWizardPage
{
public:
wizEncapPage( wxWizard *parent);
wizEncapPage::~wizEncapPage();
~wizEncapPage();
void OnWizardPageChanging(wxWizardEvent& event);
virtual wxWizardPage *GetPrev() const;
virtual wxWizardPage *GetNext() const;
......@@ -387,7 +387,7 @@ public:
void OnWizardPageChanging( wxWizardEvent& event );
protected:
DECLARE_EVENT_TABLE()
void wizTranscodeExtraPage::OnSelectFile(wxCommandEvent&);
void OnSelectFile(wxCommandEvent&);
wxTextCtrl *file_text;
WizardDialog *p_parent;
wxWizardPage *p_prev;
......
......@@ -111,8 +111,8 @@ private:
"on the toolbar (or both)." )
static int pi_playlist_views[] = { 0,1,2 };
static char *psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ) ,
N_("Both") };
static const char *psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ) ,
N_("Both") };
vlc_module_begin();
int i_score = 150;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment