On Tue 04 Oct 2005 at 23:07:34 +0200, Rhialto wrote:
> various wxWindows errors show up.
> Maybe I'll be brave and try to fix them too - so far it concerns calls
> that for whatever reason are considered ambigious by g++ so some extra
> casts hopefully select the right version.

Here some more diffs, they make vlc compile. Unfortunately lots of
pointer/int warnings remain. That Does Not Bode Well.

When I run it from the pkg_comp chroot, it never opens a window and
terminates in a couple of seconds. I haven't tried running it yet from a
normal installation, but I don't know of any reason why that should
behave differently.

$NetBSD$

--- modules/gui/wxwindows/open.cpp.dist	2005-10-04 20:53:11.000000000 +0000
+++ modules/gui/wxwindows/open.cpp	2005-10-04 20:52:50.000000000 +0000
@@ -382,7 +382,7 @@
                                                 wxU(_("Open:")) );
     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
                                 wxPoint(20,25), wxSize(120, -1),
-                                0, NULL );
+                                0, (const wxString*)NULL );
     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
         "the full MRL you want to open.\n""Alternatively, the field will be "
         "filled automatically when you use the controls below.")) );
@@ -563,7 +563,7 @@
     wxBoxSizer *file_sizer = new wxBoxSizer( wxHORIZONTAL );
 
     file_combo = new wxComboBox( panel, FileName_Event, wxT(""),
-                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
                                             wxU(_("Browse...")) );
     file_sizer->Add( file_combo, 1, wxALL, 5 );



$NetBSD$

--- modules/gui/wxwindows/streamout.cpp.dist	2004-05-16 11:42:29.000000000 +0000
+++ modules/gui/wxwindows/streamout.cpp	2005-10-04 21:12:15.000000000 +0000
@@ -166,7 +166,7 @@
     wxStaticText *mrl_label = new wxStaticText( panel, -1,
                                                 wxU(_("Destination Target:")));
     mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
-                                wxPoint(20,25), wxSize(120, -1), 0, NULL );
+                                wxPoint(20,25), wxSize(120, -1), 0, (const wxString*)NULL );
     mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
         "the full MRL you want to open.\n""Alternatively, the field will be "
         "filled automatically when you use the controls below")) );
@@ -447,7 +447,7 @@
     subpanel_sizer = new wxFlexGridSizer( 3, 2, 20 );
     label = new wxStaticText( access_subpanels[1], -1, wxU(_("Filename")) );
     file_combo = new wxComboBox( access_subpanels[1], FileName_Event, wxT(""),
-                                 wxPoint(20,25), wxSize(200, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(200, -1), 0, (const wxString*)NULL );
     wxButton *browse_button = new wxButton( access_subpanels[1],
                                   FileBrowse_Event, wxU(_("Browse...")) );
     subpanel_sizer->Add( label, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );



$NetBSD$

--- modules/gui/wxwindows/subtitles.cpp.dist	2005-10-04 21:27:59.000000000 +0000
+++ modules/gui/wxwindows/subtitles.cpp	2005-10-04 21:15:09.000000000 +0000
@@ -85,7 +85,7 @@
     char *psz_subsfile = config_GetPsz( p_intf, "sub-file" );
     if( !psz_subsfile ) psz_subsfile = strdup("");
     file_combo = new wxComboBox( panel, -1, wxL2U(psz_subsfile),
-                                 wxPoint(20,25), wxSize(300, -1), 0, NULL );
+                                 wxPoint(20,25), wxSize(300, -1), 0, (const wxString *)NULL );
     if( psz_subsfile ) free( psz_subsfile );
     wxButton *browse_button = new wxButton( panel, FileBrowse_Event,
                                             wxU(_("Browse...")) );



-Olaf.
-- 
___ Olaf 'Rhialto' Seibert      -- You author it, and I'll reader it.
\X/ rhialto/at/xs4all.nl        -- Cetero censeo "authored" delendum esse.