[Scummvm-cvs-logs] SF.net SVN: scummvm:[34783] scummvm/trunk/gui/ThemeEngine.h

[fingolfin at users.sourceforge.net]

Revision: 34783
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34783&view=rev
Author:   fingolfin
Date:     2008-10-12 22:03:35 +0000 (Sun, 12 Oct 2008)

Log Message:
-----------
Don't force inline on big funcs if you don't have to (in this case, it added 24k to the binary size for no good reason)

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeEngine.h

Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h	2008-10-12 22:02:24 UTC (rev 34782)
+++ scummvm/trunk/gui/ThemeEngine.h	2008-10-12 22:03:35 UTC (rev 34783)
@@ -649,15 +649,15 @@
 	 *
 	 *	This function is called from all the Widget Drawing methods.
 	 */
-	inline void queueDD(DrawData type,  const Common::Rect &r, uint32 dynamic = 0);
-	inline void queueDDText(TextData type, const Common::Rect &r, const Common::String &text, bool restoreBg,
+	void queueDD(DrawData type,  const Common::Rect &r, uint32 dynamic = 0);
+	void queueDDText(TextData type, const Common::Rect &r, const Common::String &text, bool restoreBg,
 		bool elipsis, TextAlign alignH = kTextAlignLeft, TextAlignVertical alignV = kTextAlignVTop, int deltax = 0);
-	inline void queueBitmap(const Graphics::Surface *bitmap, const Common::Rect &r, bool alpha);
+	void queueBitmap(const Graphics::Surface *bitmap, const Common::Rect &r, bool alpha);
 	
 	/**
 	 *	DEBUG: Draws a white square around the given position and writes the given next to it.
 	 */
-	inline void debugWidgetPosition(const char *name, const Common::Rect &r);
+	void debugWidgetPosition(const char *name, const Common::Rect &r);
 
 	
 	/**
@@ -728,7 +728,7 @@
 	bool _useCursor;
 	int _cursorHotspotX, _cursorHotspotY;
 	int _cursorTargetScale;
-#define MAX_CURS_COLORS 255
+	enum { MAX_CURS_COLORS = 255 };
 	byte *_cursor;
 	bool _needPaletteUpdates;
 	uint _cursorWidth, _cursorHeight;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.