[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : alex
Repository : xara
Revision   : 1569
Date       : Thu Jul 27 14:48:14 BST 2006

Changed paths:
   M /Trunk/XaraLX/wxOil/dlgevt.cpp
   M /Trunk/XaraLX/wxOil/dlgevt.h

Renamed some focus functions


Diff:
Index: Trunk/XaraLX/wxOil/dlgevt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.cpp	(revision 1568)
+++ Trunk/XaraLX/wxOil/dlgevt.cpp	(revision 1569)
@@ -157,7 +157,8 @@
 	EVT_CLOSE	(DialogEventHandler::CloseEvent)
 	EVT_WINDOW_DESTROY	(DialogEventHandler::WindowDestroyEvent)
 	EVT_MOUSE_EVENTS (DialogEventHandler::MouseEvent)
-	EVT_CHILD_FOCUS( DialogEventHandler::OnSetFocus )
+	EVT_CHILD_FOCUS( DialogEventHandler::OnChildFocus )
+	EVT_SET_FOCUS( DialogEventHandler::OnSetFocus )
 	EVT_CAMDIALOG_DEFERREDMSG (wxID_ANY, DialogEventHandler::CamDialogEvent)
 	EVT_CAMDIALOG_GRIMREAPER (wxID_ANY, DialogEventHandler::GrimReaperEvent)
 	EVT_CAMDIALOG_REDRAW (wxID_ANY, DialogEventHandler::CamDialogEvent)
@@ -549,7 +550,7 @@
 
 /********************************************************************************************
 
->	DialogEventHandler::OnSetFocus(wxCamDialogEvent& event)
+>	DialogEventHandler::OnChildFocus(wxChildFocusEvent& event)
 
 
 	Author:		Luke_Hart <alex@xxxxxxxxxxx>
@@ -557,14 +558,14 @@
 	Inputs:		event - the wxEvent
 	Outputs:	-
 	Returns:	-
-	Purpose:	Passes an event to DialogManager::Event
+	Purpose:	Gives the event back to the page if need be
 	Errors:		-
 	SeeAlso:	-
 
 ********************************************************************************************/
 
 
-void DialogEventHandler::OnSetFocus(wxChildFocusEvent &event)
+void DialogEventHandler::OnChildFocus(wxChildFocusEvent &event)
 {
 	// Check if focus is going to an always focus object (may need more tests
 	// as more controls come online). If so just return allowing focus to stay
@@ -608,8 +609,30 @@
 	AfxGetApp().GiveActiveCanvasFocus();
 }
 
+/********************************************************************************************
 
+>	DialogEventHandler::OnSetFocus(wxFocusEvent& event)
 
+
+	Author:		Luke_Hart <alex@xxxxxxxxxxx>
+	Created:	02/05/06
+	Inputs:		event - the wxEvent
+	Outputs:	-
+	Returns:	-
+	Purpose:	Passes an event to DialogManager::Event
+	Errors:		-
+	SeeAlso:	-
+
+********************************************************************************************/
+
+
+void DialogEventHandler::OnSetFocus(wxFocusEvent &event)
+{
+	// Do nothing for the time being
+	event.Skip();
+}
+
+
 /********************************************************************************************
 
 >	DialogEventHandler::CamDialogEvent(wxCamDialogEvent& event)
Index: Trunk/XaraLX/wxOil/dlgevt.h
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.h	(revision 1568)
+++ Trunk/XaraLX/wxOil/dlgevt.h	(revision 1569)
@@ -170,7 +170,8 @@
 	void CloseEvent(wxCloseEvent &event);
 	void MouseEvent(wxMouseEvent &event);
 	void WindowDestroyEvent(wxWindowDestroyEvent &event);
-	void OnSetFocus(wxChildFocusEvent &event);
+	void OnChildFocus(wxChildFocusEvent &event);
+	void OnSetFocus(wxFocusEvent &event);
 	void CamDialogEvent(wxCamDialogEvent &event);
 	void MoveEvent(wxMoveEvent &event);
 	void SizeEvent(wxSizeEvent &event);


Xara