Packman Build Service PMBS

File gpac.wx.patch of Package gpac (Revision 19)

Currently displaying revision 19 , Show latest

--- a/applications/osmo4_wx/wxOsmo4.cpp
+++ b/applications/osmo4_wx/wxOsmo4.cpp
@@ -235,10 +235,10 @@ Bool GPAC_EventProc(void *ptr, GF_Event
 	break;
 	case GF_EVENT_PROGRESS:
 	{
-		const char *sTitle;
-		if (evt->progress.progress_type==0) sTitle = (char *)"Buffer";
-		else if (evt->progress.progress_type==1) sTitle = (char *)"Download";
-		else if (evt->progress.progress_type==2) sTitle = (char *)"Import";
+		const char *sTitle = "";
+		if (evt->progress.progress_type==0) sTitle = "Buffer";
+		else if (evt->progress.progress_type==1) sTitle = "Download";
+		else if (evt->progress.progress_type==2) sTitle = "Import";
 		gf_set_progress(sTitle, evt->progress.done, evt->progress.total);
 	}
 	break;
@@ -289,7 +289,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
 			{
 				wxGPACEvent wxevt(app);
 				wxevt.gpac_evt = *evt;
-				app->AddPendingEvent(wxevt);
+				app->GetEventHandler()->AddPendingEvent(wxevt);
 			}
 			break;
 			}
@@ -302,7 +302,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
 		wxevt.gpac_evt.type = GF_EVENT_CONNECT;
 		wxevt.gpac_evt.connect.is_connected = evt->connect.is_connected;
 		if (!evt->connect.is_connected) app->m_duration = 0;
-		app->AddPendingEvent(wxevt);
+		app->GetEventHandler()->AddPendingEvent(wxevt);
 	}
 	break;
 	case GF_EVENT_NAVIGATE:
@@ -310,7 +310,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
 		wxGPACEvent wxevt(app);
 		wxevt.to_url = wxString(evt->navigate.to_url, wxConvUTF8);
 		wxevt.gpac_evt.type = evt->type;
-		app->AddPendingEvent(wxevt);
+		app->GetEventHandler()->AddPendingEvent(wxevt);
 	}
 	return 1;
 	case GF_EVENT_SET_CAPTION:
@@ -318,7 +318,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
 		wxGPACEvent wxevt(app);
 		wxevt.to_url = wxString(evt->caption.caption, wxConvUTF8);
 		wxevt.gpac_evt.type = evt->type;
-		app->AddPendingEvent(wxevt);
+		app->GetEventHandler()->AddPendingEvent(wxevt);
 	}
 	return 1;
 
@@ -330,7 +330,7 @@ Bool GPAC_EventProc(void *ptr, GF_Event
 	{
 		wxGPACEvent wxevt(app);
 		wxevt.gpac_evt = *evt;
-		app->AddPendingEvent(wxevt);
+		app->GetEventHandler()->AddPendingEvent(wxevt);
 	}
 	break;
 	case GF_EVENT_DBLCLICK:
@@ -539,7 +539,7 @@ Bool wxOsmo4Frame::LoadTerminal()
 	wxString abs_gpac_path = wxT("");
 	char *gpac_cfg, *sep;
 
-	::wxLogMessage(wxT("Looking for GPAC configuration file"));
+	wxLogMessage(wxT("Looking for GPAC configuration file"));
 
 	/*load config*/
 	Bool first_launch = 0;
@@ -568,7 +568,7 @@ Bool wxOsmo4Frame::LoadTerminal()
 
 	gf_sys_init(0);
 
-	::wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
+	wxLogMessage(wxT("GPAC configuration file opened - looking for modules"));
 
 	m_user.modules = gf_modules_new(str, m_user.config);
 	/*initial launch*/
@@ -594,12 +594,12 @@ Bool wxOsmo4Frame::LoadTerminal()
 
 
 
-	::wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
+	wxLogMessage(wxT("%d modules found:"), gf_modules_get_count(m_user.modules));
 	for (u32 i=0; i<gf_modules_get_count(m_user.modules); i++) {
-		::wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
+		wxLogMessage(wxT("\t") + wxString(gf_modules_get_file_name(m_user.modules, i), wxConvUTF8) );
 	}
 
-	::wxLogMessage(wxT("Starting GPAC Terminal"));
+	wxLogMessage(wxT("Starting GPAC Terminal"));
 	/*now load terminal*/
 	m_user.opaque = this;
 	m_user.EventProc = GPAC_EventProc;
@@ -611,7 +611,7 @@ Bool wxOsmo4Frame::LoadTerminal()
 		wxMessageDialog(NULL, wxT("Fatal Error"), wxT("Cannot load GPAC Terminal"), wxOK).ShowModal();
 		return 0;
 	} else {
-		::wxLogMessage(wxT("GPAC Terminal started") );
+		wxLogMessage(wxT("GPAC Terminal started") );
 	}
 	return 1;
 }
@@ -877,7 +877,7 @@ wxOsmo4Frame::wxOsmo4Frame() :
 	sOpt = gf_cfg_get_key(m_user.config, "Audio", "DriverName");
 
 	if (!strcmp(sOpt, "No Audio Output Available")) {
-		::wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
+		wxLogMessage(wxT("WARNING: no audio output availble - make sure no other program is locking the sound card"));
 		SetStatus(wxT("No audio ouput available"));
 
 	} else {
@@ -1140,7 +1140,7 @@ wxString wxOsmo4Frame::GetFileFilter()
 
 void wxOsmo4Frame::OnFileOpen(wxCommandEvent & WXUNUSED(event))
 {
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxOPEN | wxMULTIPLE | wxCHANGE_DIR /*| wxHIDE_READONLY*/);
+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), GetFileFilter(), wxFD_OPEN | wxFD_MULTIPLE | wxFD_CHANGE_DIR /*| wxHIDE_READONLY*/);
 
 	if (dlg.ShowModal() != wxID_OK) return;
 
@@ -1934,7 +1934,7 @@ void wxMyComboBox::OnKeyUp(wxKeyEvent &e
 		evt.SetEventType(wxEVT_COMMAND_COMBOBOX_SELECTED);
 		evt.SetEventObject(this);
 		evt.SetId(GetId());
-		GetParent()->AddPendingEvent(evt);
+		GetParent()->GetEventHandler()->AddPendingEvent(evt);
 	}
 }
 
@@ -2169,7 +2169,7 @@ void wxOsmo4Frame::OnUpdateStreamMenu(wx
 
 void wxOsmo4Frame::OnAddSub(wxCommandEvent &WXUNUSED(event))
 {
-	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxOPEN | wxCHANGE_DIR /* | wxHIDE_READONLY*/);
+	wxFileDialog dlg(this, wxT("Add Subtitle"), wxT(""), wxT(""), wxT("All Subtitles|*.srt;*.ttxt|SRT Subtitles|*.srt|3GPP TimedText|*.ttxt|"), wxFD_OPEN | wxFD_CHANGE_DIR /* | wxHIDE_READONLY*/);
 
 	if (dlg.ShowModal() == wxID_OK) {
 		AddSubtitle(dlg.GetPath().mb_str(wxConvUTF8), 1);
--- a/applications/osmo4_wx/menubtn.cpp
+++ b/applications/osmo4_wx/menubtn.cpp
@@ -86,7 +86,7 @@ bool wxCustomButton::Create(wxWindow* pa
 
 	wxSize bestSize = DoGetBestSize();
 	SetSize(wxSize(size.x<0 ? bestSize.x:size.x, size.y<0 ? bestSize.y:size.y));
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 	SetBestSize(GetSize());
 #else
 	SetInitialSize(GetSize());
@@ -161,7 +161,7 @@ void wxCustomButton::OnMouseEvents(wxMou
 
 		m_eventType = wxEVT_LEFT_UP;
 
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
 #else
 		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
@@ -200,7 +200,7 @@ void wxCustomButton::OnMouseEvents(wxMou
 
 		m_eventType = wxEVT_RIGHT_UP;
 
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 		if (wxRect(wxPoint(0,0), GetSize()).Inside(event.GetPosition()))
 #else
 		if (wxRect(wxPoint(0,0), GetSize()).Contains(event.GetPosition()))
@@ -319,7 +319,7 @@ void wxCustomButton::Redraw()
 
 void wxCustomButton::Paint( wxDC &dc )
 {
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 	dc.BeginDrawing();
 #endif
 
@@ -407,7 +407,7 @@ void wxCustomButton::Paint( wxDC &dc )
 	dc.SetBackground(wxNullBrush);
 	dc.SetBrush(wxNullBrush);
 	dc.SetPen(wxNullPen);
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 	dc.EndDrawing();
 #endif
 }
@@ -580,7 +580,7 @@ public:
 		{
 			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
 
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 			if (GetRect().Inside(p) || labelBut->GetRect().Inside(p))
 #else
 			if (GetRect().Contains(p) || labelBut->GetRect().Contains(p))
@@ -628,7 +628,7 @@ public:
 		{
 			wxPoint p = GetParent()->ScreenToClient(wxGetMousePosition());
 
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 			if (GetRect().Inside(p) || dropBut->GetRect().Inside(p))
 #else
 			if (GetRect().Contains(p) || dropBut->GetRect().Contains(p))
@@ -706,7 +706,7 @@ bool wxMenuButton::Create( wxWindow* par
 	SetSize( wxSize(size.x < 0 ? bestSize.x : size.x,
 	                size.y < 0 ? bestSize.y : size.y) );
 
-#if (wxMINOR_VERSION<8)
+#if (wxMAJOR_VERSION < 3) && (wxMINOR_VERSION < 8)
 	SetBestSize(GetSize());
 #else
 	SetInitialSize(GetSize());
--- a/applications/osmo4_wx/Playlist.cpp
+++ b/applications/osmo4_wx/Playlist.cpp
@@ -296,7 +296,7 @@ void wxPlaylist::RefreshList()
 
 void wxPlaylist::OnAddFile(wxCommandEvent &WXUNUSED(event))
 {
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxOPEN | wxCHANGE_DIR | /*wxHIDE_READONLY |*/ wxMULTIPLE);
+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), m_pApp->GetFileFilter(), wxFD_OPEN | wxFD_CHANGE_DIR | /*wxHIDE_READONLY |*/ wxFD_MULTIPLE);
 
 	if (dlg.ShowModal() == wxID_OK) {
 		wxArrayString stra;
@@ -452,7 +452,7 @@ void wxPlaylist::OnSave(wxCommandEvent &
 	char szPath[GF_MAX_PATH];
 	if (!gf_list_count(m_entries)) return;
 
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxSAVE | wxCHANGE_DIR | wxOVERWRITE_PROMPT);
+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxFD_SAVE | wxFD_CHANGE_DIR | wxFD_OVERWRITE_PROMPT);
 	if (dlg.ShowModal() != wxID_OK) return;
 
 	strcpy(szPath, dlg.GetPath().mb_str(wxConvUTF8));
@@ -501,7 +501,7 @@ void wxPlaylist::Save(char *szPath, Bool
 
 void wxPlaylist::OnOpen(wxCommandEvent & WXUNUSED(event))
 {
-	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxOPEN | wxCHANGE_DIR/* | wxHIDE_READONLY*/);
+	wxFileDialog dlg(this, wxT("Select file(s)"), wxT(""), wxT(""), wxT("M3U & PLS Playlists|*.m3u;*.pls|M3U Playlists|*.m3u|ShoutCast Playlists|*.pls|"), wxFD_OPEN | wxFD_CHANGE_DIR/* | wxHIDE_READONLY*/);
 	if (dlg.ShowModal() != wxID_OK) return;
 
 	Clear();