[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1226
Date       : Wed May 31 14:56:38 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dragmgr.cpp
   M /Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc

Fix mysterious SEGV on drags
Make colour editor dialog text fields smaller


Diff:
Index: Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc	(revision 1225)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc	(revision 1226)
@@ -107,7 +107,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>45,-1</size>
+                                        <size>45,18</size>
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
@@ -128,7 +128,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>45,-1</size>
+                                        <size>45,18</size>
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
@@ -149,7 +149,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>45,-1</size>
+                                        <size>45,18</size>
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
@@ -170,7 +170,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>45,-1</size>
+                                        <size>45,18</size>
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
@@ -178,7 +178,7 @@
                                     <flag>wxALIGN_CENTER_VERTICAL|wxALL</flag>
                                     <border>1</border>
                                     <option>100</option>
-                                    <size>5,1</size>
+                                    <size>1,1</size>
                                 </object>
                                 <object class="sizeritem">
                                     <flag>wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE</flag>
@@ -197,7 +197,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>55,-1</size>
+                                        <size>55,18</size>
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
@@ -363,7 +363,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>45,-1</size> 
+                                        <size>45,18</size> 
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
@@ -384,7 +384,7 @@
                                         <font>
                                             <size>8</size>
                                         </font>
-                                        <size>45,-1</size>
+                                        <size>45,18</size>
                                         <style>wxTE_LEFT|wxTE_PROCESS_ENTER</style>
                                     </object>
                                 </object>
Index: Trunk/XaraLX/wxOil/dragmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dragmgr.cpp	(revision 1225)
+++ Trunk/XaraLX/wxOil/dragmgr.cpp	(revision 1226)
@@ -678,6 +678,10 @@
 
 BOOL CaptureHandler::DrawSolidDrag(wxPoint point)
 {
+	// ignore if not intialized
+	if (!m_pBackBitmap || !m_pDisplayDC)
+		return FALSE;
+
 //	TRACEUSER("Gerry", _T("DrawSolidDrag(%d, %d)"), point.x, point.y);
 
 	ERROR2IF(DragManagerOp::CurrentManager == NULL ||


Xara