[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 1039
Date       : Sun May 14 09:46:00 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dlgmgr.cpp

Small fix to allow Options dialog to find page icons.


Diff:
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1038)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 1039)
@@ -6615,9 +6615,12 @@
 	// Add images if present
 	if (pDialogTabOp->HasImages())
 	{
-		b = wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_OTHER, wxSize(32, 32));
-		//wxBitmap b = *CamArtProvider::Get()->FindBitmap(pDialogTabOp->DlgResID);
-		// b.LoadFile(_T("/tmp/foo.png"), wxBITMAP_TYPE_PNG);
+		b = *CamArtProvider::Get()->FindBitmap(DialogResID);
+		if (!b.Ok() || b.GetWidth()!=32 || b.GetHeight()!=32)
+		{
+			TRACEUSER("Phil", _T("Unable to use options tab icon %d
"), DialogResID);
+			b = wxArtProvider::GetBitmap(wxART_HELP_SETTINGS, wxART_OTHER, wxSize(32, 32));
+		}
 
 		// Get the image list or create one
 		pImageList = pNoteBook->GetImageList();


Xara