[Scummvm-git-logs] scummvm master -> 70721f9a5938bf4daf38b35a3ad892136aec52d0

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
70721f9a59 GRAPHICS: MACGUI: Sync methods with their prototypes


Commit: 70721f9a5938bf4daf38b35a3ad892136aec52d0
    https://github.com/scummvm/scummvm/commit/70721f9a5938bf4daf38b35a3ad892136aec52d0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-09-09T17:43:35+02:00

Commit Message:
GRAPHICS: MACGUI: Sync methods with their prototypes

Changed paths:
    graphics/macgui/macwidget.h
    graphics/macgui/macwindowmanager.h


diff --git a/graphics/macgui/macwidget.h b/graphics/macgui/macwidget.h
index efab1cdd3ab..fc0fbfb575b 100644
--- a/graphics/macgui/macwidget.h
+++ b/graphics/macgui/macwidget.h
@@ -39,7 +39,7 @@ class MacWindowManager;
 class MacWidget {
 
 public:
-	MacWidget(MacWidget *parent, int x, int y, int w, int h, MacWindowManager *wm, bool focusable, uint16 border = 0, uint16 gutter = 0, uint16 shadow = 0, uint fgcolor = 0, uint bgcolor= 0xff);
+	MacWidget(MacWidget *parent, int x, int y, int w, int h, MacWindowManager *wm, bool focusable, uint16 border = 0, uint16 gutter = 0, uint16 shadow = 0, uint32 fgcolor = 0, uint32 bgcolor= 0xff);
 	virtual ~MacWidget();
 
 	/**
diff --git a/graphics/macgui/macwindowmanager.h b/graphics/macgui/macwindowmanager.h
index 310f804931f..c9d21110191 100644
--- a/graphics/macgui/macwindowmanager.h
+++ b/graphics/macgui/macwindowmanager.h
@@ -324,7 +324,7 @@ public:
 
 	void passPalette(const byte *palette, uint size);
 	template <typename T> void decomposeColor(uint32 color, byte &r, byte &g, byte &b);
-	uint findBestColor(byte cr, byte cg, byte cb);
+	uint32 findBestColor(byte cr, byte cg, byte cb);
 	uint32 findBestColor(uint32 color);
 	void setDesktopColor(byte, byte, byte);