[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1065
Date       : Mon May 15 23:29:04 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/customlist.cpp
   M /Trunk/XaraLX/wxXtra/combog.cpp

Fix some of the more rampant combo sizes. The rest I need to do in XRC.


Diff:
Index: Trunk/XaraLX/wxXtra/combog.cpp
===================================================================
--- Trunk/XaraLX/wxXtra/combog.cpp	(revision 1064)
+++ Trunk/XaraLX/wxXtra/combog.cpp	(revision 1065)
@@ -142,8 +142,8 @@
     if ( !wxComboControlBase::Create(parent,
                                      id,
                                      value,
-                                     wxDefaultPosition,
-                                     wxDefaultSize,
+                                     pos,
+                                     size,
                                      style | wxFULL_REPAINT_ON_RESIZE,
                                      wxDefaultValidator,
                                      name) )
@@ -159,7 +159,7 @@
     SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering
 
     // SetSize should be called last
-    SetSize(pos.x,pos.y,size.x,size.y);
+    SetBestSize(size);
 
     return true;
 }
Index: Trunk/XaraLX/wxOil/customlist.cpp
===================================================================
--- Trunk/XaraLX/wxOil/customlist.cpp	(revision 1064)
+++ Trunk/XaraLX/wxOil/customlist.cpp	(revision 1065)
@@ -1125,3 +1125,4 @@
 	}
 	return CWnd::OnMouseWheel(nFlags, zDelta, pt);
 }
+	
\ No newline at end of file


Xara