[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1146
Date       : Sat May 20 20:05:46 BST 2006

Changed paths:
   M /Trunk/XaraLX/Kernel/aprps.cpp
   M /Trunk/XaraLX/Kernel/bmapprev.cpp
   M /Trunk/XaraLX/Kernel/prevwdlg.cpp
   M /Trunk/XaraLX/wxXtra/manager.cpp

Fixed build server warnings


Diff:
Index: Trunk/XaraLX/Kernel/bmapprev.cpp
===================================================================
--- Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1145)
+++ Trunk/XaraLX/Kernel/bmapprev.cpp	(revision 1146)
@@ -1985,7 +1985,7 @@
 	BYTE startG = *pG;
 	BYTE startB = *pB;
 
-	BYTE *pColourWeAreChanging;	// not used in HSV mode
+	BYTE *pColourWeAreChanging = NULL;	// not used in HSV mode
 
 	if( id == _R(IDC_RED_EDIT) )
 		pColourWeAreChanging = pR;
Index: Trunk/XaraLX/Kernel/prevwdlg.cpp
===================================================================
--- Trunk/XaraLX/Kernel/prevwdlg.cpp	(revision 1145)
+++ Trunk/XaraLX/Kernel/prevwdlg.cpp	(revision 1146)
@@ -1707,9 +1707,11 @@
 
 	// For the regenerated bitmap, retrieve it's position in the list. 
 	UINT32 BitmapNumber = pParam->GetRegeneratedBitmapPosition();
+
+#ifdef _DEBUG
 	UINT32 BitmapCount = pParam->GetBitmapCount();
-
 	ERROR3IF(BitmapCount != 1, "BitmapCount specifid an illegal value");
+#endif
 
 	// Ensure that a reference to this bitmap will exist.
 	DWORD Count = m_BitmapList.GetCount();
@@ -2707,9 +2709,11 @@
 	if (pParam == NULL)
 		ERROR2RAW("PreviewDialog::SetRegeneratedBitmapInList bad params");
 
+#ifdef _DEBUG
 	// Ensure we only have a single bitmap in our list.
 	UINT32 BitmapCount = pParam->GetBitmapCount();
 	ERROR3IF(BitmapCount != 1, "BitmapCount specifid an illegal value");
+#endif
 
 	// Increment the value of list size.
 	m_BitmapListSize++; 
Index: Trunk/XaraLX/Kernel/aprps.cpp
===================================================================
--- Trunk/XaraLX/Kernel/aprps.cpp	(revision 1145)
+++ Trunk/XaraLX/Kernel/aprps.cpp	(revision 1146)
@@ -2260,7 +2260,7 @@
 	CurNumColsInPal = pPropertiesDlg->GetLongGadgetValue(_R(IDC_FRAME_NUMCOLOURS), 0, 256, _R(IDS_BMPPREFS_INVALIDDELAY) ,NULL);
 
 	// Get the current dither type.
-	DITHER CurDither ;
+	DITHER CurDither = XARADITHER_NONE;
 	if (pPropertiesDlg->GetBoolGadgetSelected(_R(IDC_FRAME_DIFFUSION)))
 		CurDither = XARADITHER_ERROR_DIFFUSION;
 
@@ -4613,7 +4613,7 @@
 	if (HavePropertiesChanged())
 	{
 		//  Get the new details.
-		BrowserBackground Bgr;
+		BrowserBackground Bgr = BROWSER_BGR_NONE;
 
 		if(pPropertiesDlg->GetBoolGadgetSelected(_R(IDC_PLAINBKGND)))     
 			Bgr = BROWSER_BGR_NONE;
@@ -4657,7 +4657,7 @@
 		return TRUE;
 
 	// Get the current details.
-	BrowserBackground Bgr;
+	BrowserBackground Bgr = BROWSER_BGR_NONE;
 
 	if(pPropertiesDlg->GetBoolGadgetSelected(_R(IDC_PLAINBKGND)))     
 		Bgr = BROWSER_BGR_NONE;
Index: Trunk/XaraLX/wxXtra/manager.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/manager.cpp	(revision 1145)
+++ Trunk/XaraLX/wxXtra/manager.cpp	(revision 1146)
@@ -3475,11 +3475,11 @@
 
 void wxFrameManager::OnFloatingPaneMoveStart(wxWindow* wnd)
 {
+    #ifdef __WXMSW__
     // try to find the pane
     wxPaneInfo& pane = GetPane(wnd);
     wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
     
-    #ifdef __WXMSW__
     if (m_flags & wxAUI_MGR_TRANSPARENT_DRAG)
         MakeWindowTransparent(pane.frame, 150);
     #endif
@@ -3622,10 +3622,6 @@
 {
     if (GetFlags() & wxAUI_MGR_ALLOW_ACTIVE_PANE)
     {
-        // try to find the pane
-        wxPaneInfo& pane = GetPane(wnd);
-        wxASSERT_MSG(pane.IsOk(), wxT("Pane window not found"));
-
         SetActivePane(m_panes, wnd);
         Repaint();
     }


Xara