From 2998131b740db789c44ff20b93aa8857c17fed29 Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Mon, 15 Aug 2022 14:22:43 -0230 Subject: [PATCH 1/2] Updated Xcode build for missing class. --- src/macos/stella.xcodeproj/project.pbxproj | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/macos/stella.xcodeproj/project.pbxproj b/src/macos/stella.xcodeproj/project.pbxproj index bd4acfed8..61514eb6c 100644 --- a/src/macos/stella.xcodeproj/project.pbxproj +++ b/src/macos/stella.xcodeproj/project.pbxproj @@ -455,6 +455,8 @@ DC84FC572677C64200E60ADE /* CartARMWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC84FC552677C64200E60ADE /* CartARMWidget.hxx */; }; DC857D352482F66200C7C14F /* CartCreator.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC857D332482F66200C7C14F /* CartCreator.cxx */; }; DC857D362482F66200C7C14F /* CartCreator.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC857D342482F66200C7C14F /* CartCreator.hxx */; }; + DC8685C128AAAF7E00DF21AA /* RomImageWidget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC8685BF28AAAF7D00DF21AA /* RomImageWidget.cxx */; }; + DC8685C228AAAF7E00DF21AA /* RomImageWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC8685C028AAAF7E00DF21AA /* RomImageWidget.hxx */; }; DC8C1BAD14B25DE7006440EE /* CartCM.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC8C1BA714B25DE7006440EE /* CartCM.cxx */; }; DC8C1BAE14B25DE7006440EE /* CartCM.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC8C1BA814B25DE7006440EE /* CartCM.hxx */; }; DC8C1BAF14B25DE7006440EE /* CompuMate.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC8C1BA914B25DE7006440EE /* CompuMate.cxx */; }; @@ -1287,6 +1289,8 @@ DC84FC552677C64200E60ADE /* CartARMWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartARMWidget.hxx; sourceTree = ""; }; DC857D332482F66200C7C14F /* CartCreator.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartCreator.cxx; sourceTree = ""; }; DC857D342482F66200C7C14F /* CartCreator.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartCreator.hxx; sourceTree = ""; }; + DC8685BF28AAAF7D00DF21AA /* RomImageWidget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RomImageWidget.cxx; sourceTree = ""; }; + DC8685C028AAAF7E00DF21AA /* RomImageWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = RomImageWidget.hxx; sourceTree = ""; }; DC8C1BA714B25DE7006440EE /* CartCM.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CartCM.cxx; sourceTree = ""; }; DC8C1BA814B25DE7006440EE /* CartCM.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartCM.hxx; sourceTree = ""; }; DC8C1BA914B25DE7006440EE /* CompuMate.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompuMate.cxx; sourceTree = ""; }; @@ -2315,6 +2319,8 @@ DC5AAC2B1FCB24DF00C420A6 /* RadioButtonWidget.hxx */, DC4613650D92C03600D8DAB9 /* RomAuditDialog.cxx */, DC4613660D92C03600D8DAB9 /* RomAuditDialog.hxx */, + DC8685BF28AAAF7D00DF21AA /* RomImageWidget.cxx */, + DC8685C028AAAF7E00DF21AA /* RomImageWidget.hxx */, DCE3BBF50C95CEDC00A671DF /* RomInfoWidget.cxx */, DCE3BBF60C95CEDC00A671DF /* RomInfoWidget.hxx */, 2DDBEACA084578BF00812C11 /* ScrollBarWidget.cxx */, @@ -2979,6 +2985,7 @@ DCDFF08220B781B0001227C0 /* DispatchResult.hxx in Headers */, DCE9681A2761128200E99839 /* Icons.hxx in Headers */, DCF8621A21C9D43300F95F52 /* StaggeredLogger.hxx in Headers */, + DC8685C228AAAF7E00DF21AA /* RomImageWidget.hxx in Headers */, DCE9681627553F1000E99839 /* FavoritesManager.hxx in Headers */, DCAAE5E31715887B0080BB82 /* CartF0Widget.hxx in Headers */, DCAAE5E51715887B0080BB82 /* CartF4SCWidget.hxx in Headers */, @@ -3194,6 +3201,7 @@ DC6DC91E205DB879004A5FC3 /* PhysicalJoystick.cxx in Sources */, E08FCD5323A037EB0051F59B /* QisBlitter.cxx in Sources */, DCCE0355225104BF008C246F /* StellaSettingsDialog.cxx in Sources */, + DC8685C128AAAF7E00DF21AA /* RomImageWidget.cxx in Sources */, 2D91748A09BA90380026E9FF /* Control.cxx in Sources */, 2D91748C09BA90380026E9FF /* Driving.cxx in Sources */, E0306E101F93E916003DDD52 /* FrameLayoutDetector.cxx in Sources */, From a9e63c1349a18fccad440f26df4f82bfdf746c2f Mon Sep 17 00:00:00 2001 From: Stephen Anthony Date: Tue, 16 Aug 2022 14:05:33 -0230 Subject: [PATCH 2/2] Fix minor compile warning in g++. --- src/gui/RomImageWidget.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/RomImageWidget.cxx b/src/gui/RomImageWidget.cxx index f9c36ed59..23f51c21b 100644 --- a/src/gui/RomImageWidget.cxx +++ b/src/gui/RomImageWidget.cxx @@ -111,7 +111,7 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full) }); } -#ifdef PNG_SUPPORT +#ifdef PNG_SUPPORT if(!full) { myImageIdx = 0; @@ -121,7 +121,7 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full) // Get a valid filename representing a snapshot file for this rom and load the snapshot const string& path = instance().snapshotLoadDir().getPath(); // 1. Try to load first snapshot by property name - string fileName = path + myProperties.get(PropType::Cart_Name) + ".png"; + string fileName = path + myProperties.get(PropType::Cart_Name) + ".png"; mySurfaceIsValid = loadPng(fileName); if(!mySurfaceIsValid) @@ -252,7 +252,7 @@ void RomImageWidget::handleMouseUp(int x, int y, MouseButton b, int clickCount) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void RomImageWidget::handleMouseMoved(int x, int y) { - if(x < _w / 2 != myMouseLeft) + if((x < _w / 2) != myMouseLeft) setDirty(); myMouseLeft = x < _w / 2; }