From c0c336500955a23e344651e5412c9d9d441ef4ee Mon Sep 17 00:00:00 2001
From: Ash Wolf <ninji@wuffs.org>
Date: Wed, 28 Jun 2023 22:22:32 +0100
Subject: first pass of T2DLL

---
 src/T2DLL/T2BitImage.h | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/T2DLL/T2BitImage.h')

diff --git a/src/T2DLL/T2BitImage.h b/src/T2DLL/T2BitImage.h
index 5e23a62..8486bda 100644
--- a/src/T2DLL/T2BitImage.h
+++ b/src/T2DLL/T2BitImage.h
@@ -7,7 +7,7 @@ struct Bitmap {
 	short palette[256];
 };
 
-class DLL_EXPORT T2BitImage {
+class AFX_EXT_CLASS T2BitImage {
 public:
 	T2BitImage(const char* path, unsigned int id, BOOL flip);
 	T2BitImage(HINSTANCE path, unsigned int id, BOOL flip);
@@ -17,8 +17,8 @@ public:
 
 	BOOL BeginDrawing();
 	void EndDrawing();
-	void CopyImage(T2BitImage&, const RECT&, const RECT&, int, CRgn*);
-	void CopyImage(CDC*, const RECT&, const RECT&, int, CRgn*);
+	void CopyImage(T2BitImage&, const RECT&, const RECT&, int unk = 0, CRgn* rgn = NULL);
+	void CopyImage(CDC*, const RECT&, const RECT&, int unk = 0, CRgn* rgn = NULL);
 	void Clear(int);
 	void SetBackGndColor(int);
 	void SetForeGndColor(int);
@@ -35,14 +35,6 @@ public:
 	int GetParam() { return mParam; }
 	void SetParam(int v) { mParam = v; }
 
-protected:
-	friend class T2ImageObj;
-
-	void SetupBitmap(BITMAPINFO* info, BOOL flip);
-	void DrawFocusRect2(RECT);
-	void DrawFocusLine(int, int, int, int);
-	void DrawFrameLine(int, int, int, int, int);
-
 	Bitmap mBitmap;
 	unsigned char *mData;
 	POINT mOrigin;
@@ -53,4 +45,10 @@ protected:
 	BOOL mHasClipRect;
 	BOOL mHalftoneMode;
 	int mParam;
+
+protected:
+	void SetupBitmap(BITMAPINFO* info, BOOL flip);
+	void DrawFocusRect2(RECT);
+	void DrawFocusLine(int, int, int, int);
+	void DrawFrameLine(int, int, int, int, int);
 };
-- 
cgit v1.2.3