Utilisateur : Fcolin Date : 9/04/04 Heure : 16:31 Archivé dans $/Bus/IvyProbe Commentaire: (vss 2)

1 files changed, 27 insertions, 26 deletions

diff --git a/IvyProbe/ETSLayout.h b/IvyProbe/ETSLayout.h
index 9ff5693..b532c56 100644
--- a/IvyProbe/ETSLayout.h
+++ b/IvyProbe/ETSLayout.h
@@ -4,7 +4,7 @@
 //       / _/ / / / /  ___ ___ ____       //

 //      /__/ /_/ / / /   // _/_  _/       //

 //     _________/ / / / // _/ / /         //

-//  __(c) 1998-9_/ /___//_/  /_/          //

+// (c) 1998-2000_/ /___//_/  /_/          //

 //                                        //

 ////////////////////////////////////////////

 //          all rights reserved           //

@@ -46,6 +46,8 @@
 #endif // _MSC_VER >= 1000

 // DialogMgr.h : header file

 //

+namespace ETSLayout

+{

 

 #ifdef CS_HELP

 	typedef ETSCSHelpDialog		CBaseDialog;

@@ -58,8 +60,9 @@
 	typedef CDialogBar			CBaseDialogBar;

 	typedef CPropertyPage		CBasePropertyPage;

 #endif

+}

 

-// Support for CBCGDialogBar instead of CDialogBar available

+// Support for CBCGDialogBar instead of CDialogBar available:

 // you just have to change the typedef to CBaseDialogBar

 

 #ifndef ETSGUI_EXT_CLASS

@@ -74,30 +77,22 @@
  * Controls whether the Icon is automatically set to IDR_MAINFRAME

  */

 #define _AUTO_SET_ICON

- 

 

 /**

- * Use this helper in your derived class as usually

- *

- * example: [MyDerivedClass.h]

- *

- * CMyDerivedClass::CMyDerivedClass()

- * {

- *     DECLARE_LAYOUT();

- * ...

- *

- * FUNCTION: Connects the layout mechanism to your class

+ * Forward class declarations

  */

-#define DECLARE_LAYOUT()													\

-virtual void Layout(CRect& rcClient)										\

-	{																		\

-		if(rcClient.Height() && rcClient.Width()  && m_RootPane.IsValid())	\

-			m_RootPane->resizeTo(rcClient);									\

-	}

+class ETSLayoutDialog;

+class ETSLayoutDialogBar;

+class ETSLayoutFormView;

+class ETSLayoutMgr;

+class ETSLayoutPropertyPage;

+class ETSLayoutPropertySheet;

+

 

 /**

- * This is a NOOP now

+ * These are NOOPs now

  */

+#define DECLARE_LAYOUT()

 #define IMPLEMENT_LAYOUT()

 

 /**

@@ -374,7 +369,8 @@ public:
 		friend class ETSLayoutMgr;

 		friend class CPaneBase;

 		friend class CPane;

-

+        friend class ETSLayoutPropertySheet;

+        

 	protected:

 		/**

 		 * Tell the pane in which direction it is positioned. A HORIZONTAL pane

@@ -733,7 +729,7 @@ inline ETSLayoutMgr::layResizeMode operator|(const ETSLayoutMgr::layResizeMode m
  * from this or derive it from CDialog and modify _all_

  * references to CDialog to ETSLayoutDialog

  */

-class ETSGUI_EXT_CLASS ETSLayoutDialog : public CBaseDialog, protected ETSLayoutMgr

+class ETSGUI_EXT_CLASS ETSLayoutDialog : public ETSLayout::CBaseDialog, protected ETSLayoutMgr

 {

 // Construction

 public:

@@ -773,7 +769,7 @@ protected:
  * from this or derive it from CDialog and modify _all_

  * references to CFormView to ETSLayoutFormView

  */

-class ETSGUI_EXT_CLASS ETSLayoutFormView : public CBaseFormView, public ETSLayoutMgr

+class ETSGUI_EXT_CLASS ETSLayoutFormView : public ETSLayout::CBaseFormView, public ETSLayoutMgr

 {

 // Construction

 	DECLARE_DYNAMIC(ETSLayoutFormView)

@@ -808,7 +804,7 @@ protected:
  * modify _all_  references to CBCGDialogBar/CDialogBar to 

  * ETSLayoutDialogBar

  */

-class ETSGUI_EXT_CLASS ETSLayoutDialogBar : public CBaseDialogBar, protected ETSLayoutMgr

+class ETSGUI_EXT_CLASS ETSLayoutDialogBar : public ETSLayout::CBaseDialogBar, protected ETSLayoutMgr

 {

 // Construction

 public:

@@ -829,6 +825,7 @@ public:
 	 * Override this to define Layout

 	 */

 	virtual BOOL Initialize() { return false; };

+	virtual void UpdateLayout();

 

 // Implementation

 protected:

@@ -859,7 +856,6 @@ protected:
 class ETSGUI_EXT_CLASS ETSLayoutPropertySheet : public CPropertySheet, protected ETSLayoutMgr

 {

 	DECLARE_DYNAMIC(ETSLayoutPropertySheet)

-	DECLARE_LAYOUT()

 

 // Construction

 public:

@@ -872,6 +868,9 @@ public:
 	void	SetAutoDestroyPages()	{ m_bAutoDestroyPages = true; }

 	void	ModelessWithButtons()	{ m_bModelessButtons = true; }

 // Overrides

+    virtual void AddMainArea(CPane paneRoot, CPaneBase itemTab);

+    virtual void AddButtons(CPane paneBottom);

+    

 	// ClassWizard generated virtual function overrides

 	//{{AFX_VIRTUAL(ETSLayoutPropertySheet)

 	public:

@@ -915,7 +914,7 @@ friend class ETSLayoutPropertyPage;
  * modify _all_  references to CPropertyPage to 

  * ETSLayoutPropertyPage

  */

-class ETSGUI_EXT_CLASS ETSLayoutPropertyPage : public CBasePropertyPage, protected ETSLayoutMgr

+class ETSGUI_EXT_CLASS ETSLayoutPropertyPage : public ETSLayout::CBasePropertyPage, protected ETSLayoutMgr

 {

 friend class ETSLayoutPropertySheet;

 

@@ -947,11 +946,13 @@ protected:
 	afx_msg BOOL OnEraseBkgnd(CDC* pDC);

 	afx_msg void OnWindowPosChanging( WINDOWPOS* lpwndpos );

 	afx_msg void OnDestroy();

+	afx_msg void OnWindowPosChanged(WINDOWPOS FAR* lpwndpos);

 	//}}AFX_MSG

 	DECLARE_MESSAGE_MAP()

 

 	virtual CRect GetRect();

 	bool m_bLockMove;

+	bool m_bResetBuddyOnNextTimeVisible;

 };