[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1318
Date       : Wed Jun 14 12:21:28 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/menucmds.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc

Disable wxMediaCtrl if not supported by wxWidgets build


Diff:
Index: Trunk/XaraLX/wxOil/menucmds.cpp
===================================================================
--- Trunk/XaraLX/wxOil/menucmds.cpp	(revision 1317)
+++ Trunk/XaraLX/wxOil/menucmds.cpp	(revision 1318)
@@ -873,6 +873,7 @@
 	HelpUsingGalleries();
 }
 
+#if wxUSE_MEDIACTRL
 enum
 {
 	wxID_MEDIACTRL
@@ -947,6 +948,7 @@
 	TRACEUSER( "luke", _T("Play Video
") );
 	m_pMediaCtrl->Play();
 }
+#endif
 
 static void StartMovie( const wxString &strFile )
 {
@@ -978,6 +980,7 @@
 
 static void StartMovieNative( const wxString &strFile )
 {
+#if wxUSE_MEDIACTRL
 	wxString			strDataPath( br_find_data_dir( "/usr/share" ), wxConvUTF8 );
 	if( !wxDir::Exists( strDataPath ) )
 	{
@@ -992,6 +995,9 @@
 	
 	CReplayWnd*		pWnd	= new CReplayWnd( CCamFrame::GetMainFrame() );
 	pWnd->Load( strVideoPath + _T("/") + strFile );
+#else
+	InformWarning( _R(IDS_NO_MEDIACTRL), _R(IDS_OK) );
+#endif	
 }
 
 
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc	(revision 1317)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc	(revision 1318)
@@ -347,6 +347,12 @@
 					<label>The movie replay resources aren't present, please check the install</label>
 				</object>
 			</object>
+			<object class="sizeritem">
+				<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
+				<object class="wxStaticText" name="IDS_NO_MEDIACTRL">
+					<label>The version of wxWidgets which this application application was built against doesn't support wxMediaCtrl, no video replay will happen</label>
+				</object>
+			</object>
 		</object>
 	</object>
 </resource>


Xara