[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1773
Date       : Mon Jun 18 13:16:14 BST 2007

Changed paths:
   M /Trunk/XaraLX/wxOil/bitmapdropdown.cpp
   M /Trunk/XaraLX/wxOil/bitmapdropdown.h
   M /Trunk/XaraLX/wxOil/griddropdown.cpp
   M /Trunk/XaraLX/wxOil/griddropdown.h
   M /Trunk/XaraLX/wxOil/grndprnt.cpp

Fix overenthusiastic type conversion


Diff:
Index: Trunk/XaraLX/wxOil/bitmapdropdown.cpp
===================================================================
--- Trunk/XaraLX/wxOil/bitmapdropdown.cpp	(revision 1772)
+++ Trunk/XaraLX/wxOil/bitmapdropdown.cpp	(revision 1773)
@@ -215,11 +215,11 @@
 Parameters: [in] INT32 minWidth   - minimum width; in the current implemetation it's the 
 								  size of combobox control itself. In this function we
 								  ignore it;
-            [in] INT32 prefHeight - the preffered height;
-            [in] INT32 maxHeight  - maximum allowed height.
+            [in] int prefHeight - the preffered height; TYPENOTE: Correct
+            [in] int maxHeight  - maximum allowed height. TYPENOTE: Correct
 Notes     : 
 ******************************************************************************/
-wxSize wxCamBitmapDropdownPopup::GetAdjustedSize(INT32 minWidth, INT32 prefHeight, INT32 maxHeight)
+wxSize wxCamBitmapDropdownPopup::GetAdjustedSize(int /* TYPENOTE: Correct */ minWidth, int /* TYPENOTE: Correct */ prefHeight, int /* TYPENOTE: Correct */ maxHeight)
 {
 	// We should ignore the min width, since it's usually the size of the combobox
 	// (we can have a dropdown with width less than the control).
Index: Trunk/XaraLX/wxOil/griddropdown.cpp
===================================================================
--- Trunk/XaraLX/wxOil/griddropdown.cpp	(revision 1772)
+++ Trunk/XaraLX/wxOil/griddropdown.cpp	(revision 1773)
@@ -151,7 +151,7 @@
             [in] INT32	 iFlags - additional flags (selected, highlighted, ...)
 Notes     : Delegates the call to the control class.
 ******************************************************************************/
-void wxCamGridPopup::DrawItem(wxDC& dc, const wxRect& rect, INT32 iItem, INT32 iFlags)
+void wxCamGridPopup::DrawItem(wxDC& dc, const wxRect& rect, int /* TYPENOTE: Correct */ iItem, INT32 iFlags)
 {
 	if (m_pDropDown)
 		m_pDropDown->DrawItem(dc, rect, iItem, iFlags);
@@ -499,8 +499,8 @@
 Exceptions: 
 Parameters: [in] wxDC&	 dc		- the device context to draw to;
             [in] wxRect& rect	- the area of the item;
-            [in] INT32	 iItem	- item index;
-            [in] INT32	 iFlags - additional flags (selected, highlighted, ...)
+            [in] int	 iItem	- item index; TYPENOTE: Correct
+            [in] int	 iFlags - additional flags (selected, highlighted, ...) TYPENOTE: Correct
 Notes     : 
 ******************************************************************************/
 void CGridDropDown::DrawItem(wxDC& dc, const wxRect& rect, INT32 iItem, INT32 iFlags)
Index: Trunk/XaraLX/wxOil/bitmapdropdown.h
===================================================================
--- Trunk/XaraLX/wxOil/bitmapdropdown.h	(revision 1772)
+++ Trunk/XaraLX/wxOil/bitmapdropdown.h	(revision 1773)
@@ -133,7 +133,7 @@
 
 	// Calculates the dropdown size. We need to override it to allow the dropdown list to have smaller
 	// width that the cobobox itself (in  case we have images only).
-    virtual wxSize GetAdjustedSize(INT32 minWidth, INT32 prefHeight, INT32 maxHeight);
+    virtual wxSize GetAdjustedSize(int /* TYPENOTE: Correct*/ minWidth, int /* TYPENOTE: Correct*/ prefHeight, INT32 maxHeight);
 };
 
 
Index: Trunk/XaraLX/wxOil/griddropdown.h
===================================================================
--- Trunk/XaraLX/wxOil/griddropdown.h	(revision 1772)
+++ Trunk/XaraLX/wxOil/griddropdown.h	(revision 1773)
@@ -127,7 +127,7 @@
 	wxCamGridPopup(CGridDropDown* pDropDown, wxGridCombo* pCombo);
 	virtual ~wxCamGridPopup();
 
-	virtual void DrawItem(wxDC& dc, const wxRect& rect, INT32 iItem, INT32 iFlags);
+	virtual void DrawItem(wxDC& dc, const wxRect& rect, int /* TYPENOTE: Correct */ iItem, INT32 iFlags);
 
 protected:
 	CGridDropDown* m_pDropDown;
Index: Trunk/XaraLX/wxOil/grndprnt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/grndprnt.cpp	(revision 1772)
+++ Trunk/XaraLX/wxOil/grndprnt.cpp	(revision 1773)
@@ -566,7 +566,7 @@
 #else
 	INT32 fwidth = clip.GetWidth();
 	INT32 fheight = clip.GetHeight();
-    wxBitmap bitmap( (INT32)fwidth, (INT32)fheight, 24 );
+    wxBitmap bitmap( (int)/* TYPENOTE: Correct */fwidth, (int)/* TYPENOTE: Correct */fheight, 24 );
     wxMemoryDC memDC;
     memDC.SelectObject(bitmap);
     memDC.Blit(0, 0, fwidth, fheight, &MemDC, 0, 0);


Xara