SCI: rename Controls to GfxControls, gets directly called now

svn-id: r47783

1 files changed, 3 insertions, 11 deletions

diff --git a/engines/sci/graphics/gui.h b/engines/sci/graphics/gui.h
index 001553585e..cbdcc6c488 100644
--- a/engines/sci/graphics/gui.h
+++ b/engines/sci/graphics/gui.h
@@ -48,9 +48,8 @@ class GfxCache;
 class GfxCompare;
 class GfxPorts;
 class GfxPaint16;
-class WindowMgr;
-class SciGuiAnimate;
-class Controls;
+class GfxAnimate;
+class GfxControls;
 class Menu;
 class GfxText16;
 class Transitions;
@@ -84,12 +83,6 @@ public:
 
 	virtual void drawPicture(GuiResourceId pictureId, int16 animationNr, bool animationBlackoutFlag, bool mirroredFlag, bool addToFlag, int16 EGApaletteNo);
 	virtual void drawCel(GuiResourceId viewId, int16 loopNo, int16 celNo, uint16 leftPos, uint16 topPos, int16 priority, uint16 paletteNo, bool hiresMode = false, reg_t upscaledHiresHandle = NULL_REG);
-	virtual void drawControlButton(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 style, bool hilite);
-	virtual void drawControlText(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 alignment, int16 style, bool hilite);
-	virtual void drawControlTextEdit(Common::Rect rect, reg_t obj, const char *text, int16 fontId, int16 mode, int16 style, int16 cursorPos, int16 maxChars, bool hilite);
-	virtual void drawControlIcon(Common::Rect rect, reg_t obj, GuiResourceId viewId, int16 loopNo, int16 celNo, int16 priority, int16 style, bool hilite);
-	virtual void drawControlList(Common::Rect rect, reg_t obj, int16 maxChars, int16 count, const char **entries, GuiResourceId fontId, int16 style, int16 upperPos, int16 cursorPos, bool isAlias, bool hilite);
-	virtual void editControl(reg_t controlObject, reg_t eventObject);
 
 	virtual void graphFillBoxForeground(Common::Rect rect);
 	virtual void graphFillBoxBackground(Common::Rect rect);
@@ -150,13 +143,12 @@ protected:
 
 private:
 	virtual void initPriorityBands();
-	virtual int getControlPicNotValid();
 	static void palVaryCallback(void *refCon);
 	void doPalVary();
 
 	AudioPlayer *_audio;
 	GfxAnimate *_animate;
-	Controls *_controls;
+	GfxControls *_controls;
 	Menu *_menu;
 	GfxText16 *_text16;
 	Transitions *_transitions;