[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 1073
Date       : Tue May 16 12:36:36 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/wxOil/maskfilt.cpp

Progress towards fix for expoort dialog issues (png dialog now setup)


Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1072)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1073)
@@ -266,9 +266,9 @@
 	bool	fUsedImapOption = false;
 	if (ok && !bExportABitmap && m_FilterType != MAKE_BITMAP_FILTER && !m_bSlicingImage)
 	{
-PORTNOTE("other","Removed IDD_TPALETTE - doesn't exist in resources")
+PORTNOTE("other","Removed IDD_TPALETTE & IDD_TBROWSER - doesn't exist in resources and isn't wanted (in that order)")
 //		ok =  AddAPage(_R(IDD_TBITMAPOPTIONS)) && AddAPage(_R(IDD_TIMAPOPTIONS)) && AddAPage(_R(IDD_TBROWSER));
-		ok =  AddAPage(_R(IDD_TBITMAPOPTIONS)) && AddAPage(_R(IDD_TBROWSER));
+		ok =  AddAPage(_R(IDD_TBITMAPOPTIONS));
 		fUsedImapOption = true;
 	}
 
@@ -2552,16 +2552,20 @@
 	CDlgResID PageID = GetCurrentPageID();	// Get currently selected Tab id
 	TalkToPage(_R(IDD_TBITMAPSIZE)); 
 
+	TRACEUSER( "jlh92", _T("BmapPrevDlg::HandleBitmapSizeTabMsg") );
+
 	switch (Msg->DlgMsg)
 	{
 		case DIM_CREATE:
 		{
+			TRACEUSER( "jlh92", _T("BmapPrevDlg::HandleBitmapSizeTabMsg - DIM_CREATE") );
 			InitBitmapSizeTab();
 			break;
 		}
 
 		case DIM_TEXT_CHANGED:
 		{
+			TRACEUSER( "jlh92", _T("BmapPrevDlg::HandleBitmapSizeTabMsg - DIM_TEXT_CHANGED") );
 			if( Msg->GadgetID == _R(IDC_T1EDIT1) )
 				HandleBitmapSizeWidthChange();
 			else
@@ -2579,6 +2583,7 @@
 
 		case DIM_SELECTION_CHANGED:
 		{
+			TRACEUSER( "jlh92", _T("BmapPrevDlg::HandleBitmapSizeTabMsg - DIM_SELECTION_CHANGED") );
 			if( Msg->GadgetID == _R(IDC_T1COMBO1) )
 				HandleBitmapSizeDPIChange();
 			break;
@@ -2647,6 +2652,7 @@
 		}
 
 		case DIM_SET_ACTIVE:
+			TRACEUSER( "jlh92", _T("BmapPrevDlg::HandleBitmapSizeTabMsg - DIM_SET_ACTIVE") );
 			UpdateCurrentTab();
 			break;
 
@@ -3065,6 +3071,8 @@
 // update all the ctrls on this tab to show the new options
 void BmapPrevDlg::RefreshBitmapSizeTab()
 {
+	TRACEUSER( "jlh92", _T("BmapPrevDlg::RefreshBitmapSizeTab") );
+
 	// set the interlocking dpi controls
 	m_LockSizeUpdates = TRUE;
 
Index: Trunk/XaraLX/wxOil/maskfilt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/maskfilt.cpp	(revision 1072)
+++ Trunk/XaraLX/wxOil/maskfilt.cpp	(revision 1073)
@@ -367,6 +367,7 @@
 	if (!BitmapExportOptions::RetrieveDefaults())
 		return FALSE;
 
+PORTNOTE("BMPFilter", "Remove use of GetDefaultExportDither")
 #ifndef EXCLUDE_FROM_XARALX
 	UINT32 Dither = BMPFilter::GetDefaultExportDither();
 	ERROR2IF(Dither > 4, FALSE, "Dither Invalid");


Xara