1 files changed, 28 insertions, 28 deletions

diff --git a/src/T2DLL/T2Dialog.h b/src/T2DLL/T2Dialog.h
index 48a35da..952e1b5 100644
--- a/src/T2DLL/T2Dialog.h
+++ b/src/T2DLL/T2Dialog.h
@@ -8,20 +8,20 @@ struct T2DLGTEMPLATE {
 	int resID;
 };
 
-class T2Dialog : public CWnd, public LListener {
+class AFX_EXT_CLASS T2Dialog : public CWnd, public LListener {
 	DECLARE_DYNAMIC(T2Dialog)
 	DECLARE_MESSAGE_MAP()
 
 public:
 	T2Dialog();
 	virtual ~T2Dialog();
-	void Realize(void*, T2DLGTEMPLATE*, T2TowerDoc*, T2ImageObj*, CPalette*, int, CWnd* parentWnd, UINT nID, int);
+	void Realize(void*, T2DLGTEMPLATE*, T2TowerDoc*, T2ImageObj*, CPalette*, BOOL isToolWindow, CWnd* parentWnd, UINT nID, BOOL autoShow);
 
 	int DoModal();
 	void DoClose(int nResult);
 	virtual int PreTranslateMessage(MSG*);
-	void MakeRadioGroup(int, int, int);
-	void MakeTabPanel(int, int, int, int);
+	void MakeRadioGroup(int inBaseID, int inCount, int inSelected);
+	void MakeTabPanel(int inBaseID1, int inBaseID2, int inCount, int inSelected);
 	HFONT GetFont();
 
 	T2TowerDoc* GetDocument() const { return mTowerDoc; }
@@ -39,12 +39,28 @@ public:
 		int width;
 		int height;
 		int modal;
-		char *title;
+		const char *title;
 		int _14;
 		int center;
 		int flags;
 	};
 
+	int mDeleteOnClose;
+	T2DLGTEMPLATE mTemplate;
+	long mUserCon;
+	T2TowerDoc *mTowerDoc;
+	T2ImageObj *mImageObj;
+	CPalette *mPalette;
+	int mModal;
+	int mInModalLoop;
+	CFont *mFonts[10];
+	int mFontNums[10];
+	int mFontCount;
+	int mCurrentFont;
+	void *mEC;
+	CString mFontName;
+	BOOL mAutoShow;
+
 protected:
 	int OnCreate(CREATESTRUCT*);
 	void OnLButtonDblClk(UINT nFlags, CPoint pt);
@@ -52,19 +68,19 @@ protected:
 	void OnLButtonUp(UINT nFlags, CPoint pt);
 	void OnActivateApp(BOOL bActive, HTASK hTask);
 	void OnDestroy();
-	int OnQueryNewPalette();
-	int OnEraseBkgnd(CDC*);
+	BOOL OnQueryNewPalette();
+	BOOL OnEraseBkgnd(CDC* pDC);
 
 	virtual int PreCreateWindow(CREATESTRUCT&);
-	virtual int OnCommand(UINT cmd, long data);
+	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
 	virtual void PostNcDestroy();
 	virtual void AfterBurner(T2DialogDef& def);
 	virtual void DoOnCreate(char* data);
 	void CreateDlgItemLoop(T2DialogDef& def, char* data);
-	virtual void CreateDlgItem(CTokenizer& tokenizer, T2DialogDef& def);
-	virtual int OnT2DialogCommand(UINT cmd, long data) { return 1; }
-	virtual int OnT2EraseBkgnd(CDC* dc) { return 1; }
-	virtual int OnT2PreEraseBkgnd(CDC* dc) { return 0; }
+	virtual void CreateDlgItem(CTokenizer& inTokenizer, T2DialogDef& inDef);
+	virtual BOOL OnT2DialogCommand(WPARAM inWParam, LPARAM inLParam) { return true; }
+	virtual BOOL OnT2EraseBkgnd(CDC* dc) { return true; }
+	virtual BOOL OnT2PreEraseBkgnd(CDC* dc) { return false; }
 	virtual void OnT2Create() {}
 	virtual void OnT2Destroy() {}
 	virtual void OnT2DlgLButtonDown(UINT nFlags, CPoint pt) {}
@@ -72,20 +88,4 @@ protected:
 	virtual void OnT2DlgLButtonDblClk(UINT nFlags, CPoint pt) {}
 	virtual void OnT2OK() {}
 	virtual void OnT2Cancel() {}
-
-	int mDeleteOnClose;
-	T2DLGTEMPLATE mTemplate;
-	long mUserCon;
-	T2TowerDoc *mTowerDoc;
-	T2ImageObj *mImageObj;
-	CPalette *mPalette;
-	int mModal;
-	int mInModalLoop;
-	CFont *mFonts[10];
-	int mFontNums[10];
-	int mFontCount;
-	int mCurrentFont;
-	void *mEC;
-	CString mFontName;
-	int mF4;
 };