1 files changed, 3 insertions, 31 deletions

diff --git a/splashscreen/src/bitmap_funcs.h b/splashscreen/src/bitmap_funcs.h
index 83f22bd..f82e909 100644
--- a/splashscreen/src/bitmap_funcs.h
+++ b/splashscreen/src/bitmap_funcs.h
@@ -26,10 +26,10 @@ private:
 public:

 	MyBitmap();

 	MyBitmap(int w, int h);

-	MyBitmap(const char *fn, const char *fnAlpha = 0);

+	MyBitmap(TCHAR *fn, TCHAR *fnAlpha = 0);

 	~MyBitmap();

 

-	bool loadFromFile(const char *fn, const char *fnAlpha = 0);

+	bool loadFromFile(TCHAR *fn, TCHAR *fnAlpha = 0);

 

 	int getWidth() { return width; }

 	int getHeight() { return height; }

@@ -39,40 +39,12 @@ public:
 

 	

 	void makeOpaque();

-	/*

-	void makeOpaqueRect(int x1, int y1, int x2, int y2);

-	void makeOpaqueRect(RECT rc) { makeOpaqueRect(rc.left, rc.top, rc.right, rc.bottom);  }

-	*/

 

 	void saveAlpha(int x = 0, int y = 0, int w = 0, int h = 0);

 	void restoreAlpha(int x = 0, int y = 0, int w = 0, int h = 0);

 	

-	/*

-	void DrawBits(COLOR32 *inbits, int inw, int inh, int x, int y, int w, int h);

-	void BlendBits(COLOR32 *inbits, int inw, int inh, int x, int y, int w, int h);

-

-	void DrawNoAlpha(MyBitmap *bmp, int x, int y, int w, int h);

-	*/

 	void Blend(MyBitmap *bmp, int x, int y, int w, int h);

-	/*

-	void Draw(MyBitmap *bmp, int x, int y, int w, int h);

-

-	void BlendColorized(MyBitmap *bmp, int x, int y, int w, int h, COLOR32 color);

-	void DrawColorized(MyBitmap *bmp, int x, int y, int w, int h, COLOR32 color);

-

-	void BlendPart(MyBitmap *bmp, int xin, int yin, int win, int hin, int x, int y, int w, int h);

-	void BlendPartColorized(MyBitmap *bmp, int xin, int yin, int win, int hin, int x, int y, int w, int h, COLOR32 color);

-	void DrawPart(MyBitmap *bmp, int xin, int yin, int win, int hin, int x, int y, int w, int h);

-//	void DrawPartNoAlpha(MyBitmap *bmp, int x, int y, int w, int h);

-//	void DrawPartColorized(MyBitmap *bmp, int x, int y, int w, int h, COLOR32 color);

-

-	void DrawIcon(HICON hic, int x, int y, int w = 0, int h = 0);

-	*/

-	void DrawText(char *str, int x, int y);

-	/*

-	void DrawTextW(WCHAR *str, int x, int y);

-	*/

-	

+	void DrawText(TCHAR *str, int x, int y);

 

 	inline COLOR32 *getBits() { return bits; }

 	inline COLOR32 *getRow(int row) { return bits + row * width; }