[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : luke
Repository : xara
Revision   : 928
Date       : Tue May  2 11:10:27 BST 2006

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

Fix RTTI hierarchy for OurPropSheet


Diff:
Index: Trunk/XaraLX/wxOil/dlgmgr.h
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.h	(revision 927)
+++ Trunk/XaraLX/wxOil/dlgmgr.h	(revision 928)
@@ -964,45 +964,7 @@
 	friend class DialogManager;
 };
 
-PORTNOTE("dialog","Don't need \ can't use OurPropShtPage, removed")
-#ifndef EXCLUDE_FROM_XARALX
-/********************************************************************************************
 
->	class OurPropShtPage: public CPropertyPage
-
-	Author:		Simon_Maneggio (Xara Group Ltd) <camelotdev@xxxxxxxx>
-	Created:	30/11/94
-	Purpose:	A page which live in OurPropertySheets
-	SeeAlso:	-
-
-********************************************************************************************/
-
-class OurPropShtPage: public wxNotebookPage
-{	
-	friend class DialogManager;
-	   
-	DECLARE_ABSTRACT_CLASS( OurPropShtPage )
-
-public:
-	// Construction
-	OurPropShtPage(CDlgResID DialogResID);
-
-	CDlgResID GetPageID() { return m_PageID; }
-
-protected:
-	// The WindowProc chanels suitable messages to the DialogManager
-	LRESULT WindowProc( UINT32 Message, WPARAM wParam, LPARAM lParam ); 
-
-	BOOL OnSetActive();
-	BOOL OnKillActive(); 
-
-	CDlgResID		m_PageID;				// We store the resource id used to create the page
-	BOOL			m_CreateMessageSent;	// Becomes TRUE after a Create message is sent for the page.
-
-	enum EnabledState { ENABLED, DISABLED, UNKNOWN };
-};
-#endif
-
 /********************************************************************************************
 
 >	class DlgTagOpToPropShtItem: public ListItem
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 927)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp	(revision 928)
@@ -150,7 +150,7 @@
 
 CC_IMPLEMENT_DYNAMIC(CGadgetImageList, CCObject);
 
-IMPLEMENT_ABSTRACT_CLASS(OurPropSheet, wxNotebookPage);
+IMPLEMENT_CLASS(OurPropSheet, wxPropertySheetDialog);
 
 
 // Place all statics here please, ordered by class
@@ -325,8 +325,7 @@
 
 	if( ok && 
 		Mode == MODAL && 
-		( pDialogWnd->IsKindOf( CLASSINFO(wxDialog) ) ||
-		  DlgOp->IS_KIND_OF(DialogTabOp) ) )
+		pDialogWnd->IsKindOf( CLASSINFO(wxDialog) ) )
 	{
 		((wxDialog *) pDialogWnd)->ShowModal();
 	}


Xara