| @@ -259,7 +259,7 @@ | |||||
| INSTALL_PATH = "$(HOME)/Applications"; | INSTALL_PATH = "$(HOME)/Applications"; | ||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; | MACOSX_DEPLOYMENT_TARGET = 10.11; | ||||
| MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | ||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.juce.demorunner; | PRODUCT_BUNDLE_IDENTIFIER = com.juce.demorunner; | ||||
| PRODUCT_NAME = "DemoRunner"; | PRODUCT_NAME = "DemoRunner"; | ||||
| SDKROOT_ppc = macosx10.5; | SDKROOT_ppc = macosx10.5; | ||||
| @@ -298,7 +298,7 @@ | |||||
| LLVM_LTO = YES; | LLVM_LTO = YES; | ||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; | MACOSX_DEPLOYMENT_TARGET = 10.11; | ||||
| MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | ||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.juce.demorunner; | PRODUCT_BUNDLE_IDENTIFIER = com.juce.demorunner; | ||||
| PRODUCT_NAME = "DemoRunner"; | PRODUCT_NAME = "DemoRunner"; | ||||
| SDKROOT_ppc = macosx10.5; | SDKROOT_ppc = macosx10.5; | ||||
| @@ -30,7 +30,7 @@ | |||||
| </MAINGROUP> | </MAINGROUP> | ||||
| <EXPORTFORMATS> | <EXPORTFORMATS> | ||||
| <XCODE_MAC targetFolder="Builds/MacOSX" smallIcon="YyqWd2" bigIcon="YyqWd2" | <XCODE_MAC targetFolder="Builds/MacOSX" smallIcon="YyqWd2" bigIcon="YyqWd2" | ||||
| extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code" | |||||
| extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code" | |||||
| customXcodeResourceFolders="../Audio ../BLOCKS ../DSP ../GUI ../Utilities"> | customXcodeResourceFolders="../Audio ../BLOCKS ../DSP ../GUI ../Utilities"> | ||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION isDebug="1" name="Debug"/> | <CONFIGURATION isDebug="1" name="Debug"/> | ||||
| @@ -833,7 +833,7 @@ | |||||
| INSTALL_PATH = "$(HOME)/Applications"; | INSTALL_PATH = "$(HOME)/Applications"; | ||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; | MACOSX_DEPLOYMENT_TARGET = 10.11; | ||||
| MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | ||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; | PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; | ||||
| PRODUCT_NAME = "Projucer"; | PRODUCT_NAME = "Projucer"; | ||||
| SDKROOT_ppc = macosx10.5; | SDKROOT_ppc = macosx10.5; | ||||
| @@ -870,7 +870,7 @@ | |||||
| LLVM_LTO = YES; | LLVM_LTO = YES; | ||||
| MACOSX_DEPLOYMENT_TARGET = 10.11; | MACOSX_DEPLOYMENT_TARGET = 10.11; | ||||
| MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | ||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; | PRODUCT_BUNDLE_IDENTIFIER = com.juce.theprojucer; | ||||
| PRODUCT_NAME = "Projucer"; | PRODUCT_NAME = "Projucer"; | ||||
| SDKROOT_ppc = macosx10.5; | SDKROOT_ppc = macosx10.5; | ||||
| @@ -8,7 +8,7 @@ | |||||
| <EXPORTFORMATS> | <EXPORTFORMATS> | ||||
| <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" | <XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK" | ||||
| documentExtensions=".jucer" objCExtraSuffix="zkVtji" bigIcon="rv1F4h" | documentExtensions=".jucer" objCExtraSuffix="zkVtji" bigIcon="rv1F4h" | ||||
| extraLinkerFlags="" extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code" | |||||
| extraLinkerFlags="" extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code" | |||||
| customPList="<plist> <dict> 	<key>NSAppTransportSecurity</key> 	<dict> 		<key>NSAllowsArbitraryLoads</key> 		<true/> 		<key>NSExceptionDomains</key> 		<dict> 			<key>amazonaws.com</key> 			<dict> 				<key>NSExceptionAllowsInsecureHTTPLoads</key> 				<true/> 				<key>NSIncludesSubdomains</key> 				<true/> 			</dict> 		</dict> 	</dict> </dict> </plist>" | customPList="<plist> <dict> 	<key>NSAppTransportSecurity</key> 	<dict> 		<key>NSAllowsArbitraryLoads</key> 		<true/> 		<key>NSExceptionDomains</key> 		<dict> 			<key>amazonaws.com</key> 			<dict> 				<key>NSExceptionAllowsInsecureHTTPLoads</key> 				<true/> 				<key>NSIncludesSubdomains</key> 				<true/> 			</dict> 		</dict> 	</dict> </dict> </plist>" | ||||
| extraFrameworks="AudioUnit; Accelerate; AVFoundation; CoreAudio; CoreAudioKit; CoreMIDI; DiscRecording; QuartzCore; AudioToolbox; OpenGL; QTKit; QuickTime"> | extraFrameworks="AudioUnit; Accelerate; AVFoundation; CoreAudio; CoreAudioKit; CoreMIDI; DiscRecording; QuartzCore; AudioToolbox; OpenGL; QTKit; QuickTime"> | ||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| @@ -170,11 +170,11 @@ public: | |||||
| } | } | ||||
| //============================================================================== | //============================================================================== | ||||
| class ImageButtonResourceProperty : public ImageResourceProperty <ImageButton> | |||||
| class ImageButtonResourceProperty : public ImageResourceProperty<ImageButton> | |||||
| { | { | ||||
| public: | public: | ||||
| ImageButtonResourceProperty (ComponentLayout& layout_, ImageButton* const owner_, const ImageRole role_, const String& name) | ImageButtonResourceProperty (ComponentLayout& layout_, ImageButton* const owner_, const ImageRole role_, const String& name) | ||||
| : ImageResourceProperty <ImageButton> (*layout_.getDocument(), owner_, name, true), | |||||
| : ImageResourceProperty<ImageButton> (*layout_.getDocument(), owner_, name, true), | |||||
| role (role_), | role (role_), | ||||
| layout (layout_) | layout (layout_) | ||||
| { | { | ||||
| @@ -195,29 +195,28 @@ public: | |||||
| ComponentLayout& layout; | ComponentLayout& layout; | ||||
| }; | }; | ||||
| class SetImageResourceAction : public ComponentUndoableAction <ImageButton> | |||||
| class SetImageResourceAction : public ComponentUndoableAction<ImageButton> | |||||
| { | { | ||||
| public: | public: | ||||
| SetImageResourceAction (ImageButton* const button, | SetImageResourceAction (ImageButton* const button, | ||||
| ComponentLayout& layout_, | ComponentLayout& layout_, | ||||
| const ImageRole role_, | const ImageRole role_, | ||||
| const String& newResource_) | const String& newResource_) | ||||
| : ComponentUndoableAction <ImageButton> (button, layout_), | |||||
| : ComponentUndoableAction<ImageButton> (button, layout_), | |||||
| newResource (newResource_), | newResource (newResource_), | ||||
| role (role_), | |||||
| layout (layout_) | |||||
| role (role_) | |||||
| { | { | ||||
| oldResource = ImageButtonHandler::getImageResource (button, role_); | oldResource = ImageButtonHandler::getImageResource (button, role_); | ||||
| } | } | ||||
| bool perform() | |||||
| bool perform() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageResource (layout, getComponent(), role, newResource, false); | ImageButtonHandler::setImageResource (layout, getComponent(), role, newResource, false); | ||||
| return true; | return true; | ||||
| } | } | ||||
| bool undo() | |||||
| bool undo() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageResource (layout, getComponent(), role, oldResource, false); | ImageButtonHandler::setImageResource (layout, getComponent(), role, oldResource, false); | ||||
| @@ -227,7 +226,6 @@ public: | |||||
| private: | private: | ||||
| String newResource, oldResource; | String newResource, oldResource; | ||||
| const ImageRole role; | const ImageRole role; | ||||
| ComponentLayout& layout; | |||||
| }; | }; | ||||
| //============================================================================== | //============================================================================== | ||||
| @@ -258,27 +256,26 @@ public: | |||||
| } | } | ||||
| //============================================================================== | //============================================================================== | ||||
| class SetImageKeepsPropAction : public ComponentUndoableAction <ImageButton> | |||||
| class SetImageKeepsPropAction : public ComponentUndoableAction<ImageButton> | |||||
| { | { | ||||
| public: | public: | ||||
| SetImageKeepsPropAction (ImageButton* const button, | SetImageKeepsPropAction (ImageButton* const button, | ||||
| ComponentLayout& layout_, | ComponentLayout& layout_, | ||||
| const bool newState_) | const bool newState_) | ||||
| : ComponentUndoableAction <ImageButton> (button, layout_), | |||||
| newState (newState_), | |||||
| layout (layout_) | |||||
| : ComponentUndoableAction<ImageButton> (button, layout_), | |||||
| newState (newState_) | |||||
| { | { | ||||
| oldState = ImageButtonHandler::doesImageKeepProportions (button); | oldState = ImageButtonHandler::doesImageKeepProportions (button); | ||||
| } | } | ||||
| bool perform() | |||||
| bool perform() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageKeepProportions (layout, getComponent(), newState, false); | ImageButtonHandler::setImageKeepProportions (layout, getComponent(), newState, false); | ||||
| return true; | return true; | ||||
| } | } | ||||
| bool undo() | |||||
| bool undo() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageKeepProportions (layout, getComponent(), oldState, false); | ImageButtonHandler::setImageKeepProportions (layout, getComponent(), oldState, false); | ||||
| @@ -287,7 +284,6 @@ public: | |||||
| private: | private: | ||||
| bool newState, oldState; | bool newState, oldState; | ||||
| ComponentLayout& layout; | |||||
| }; | }; | ||||
| static bool doesImageKeepProportions (ImageButton* button) | static bool doesImageKeepProportions (ImageButton* button) | ||||
| @@ -309,12 +305,12 @@ public: | |||||
| } | } | ||||
| } | } | ||||
| class ImageButtonProportionProperty : public ComponentBooleanProperty <ImageButton> | |||||
| class ImageButtonProportionProperty : public ComponentBooleanProperty<ImageButton> | |||||
| { | { | ||||
| public: | public: | ||||
| ImageButtonProportionProperty (ComponentLayout& layout_, ImageButton* const owner_) | ImageButtonProportionProperty (ComponentLayout& layout_, ImageButton* const owner_) | ||||
| : ComponentBooleanProperty <ImageButton> ("proportional", "maintain image proportions", "scale to fit", | |||||
| owner_, *layout_.getDocument()), | |||||
| : ComponentBooleanProperty<ImageButton> ("proportional", "maintain image proportions", "scale to fit", | |||||
| owner_, *layout_.getDocument()), | |||||
| layout (layout_) | layout (layout_) | ||||
| { | { | ||||
| } | } | ||||
| @@ -334,29 +330,28 @@ public: | |||||
| }; | }; | ||||
| //============================================================================== | //============================================================================== | ||||
| class SetImageOpacityAction : public ComponentUndoableAction <ImageButton> | |||||
| class SetImageOpacityAction : public ComponentUndoableAction<ImageButton> | |||||
| { | { | ||||
| public: | public: | ||||
| SetImageOpacityAction (ImageButton* const button, | SetImageOpacityAction (ImageButton* const button, | ||||
| ComponentLayout& layout_, | ComponentLayout& layout_, | ||||
| const ImageRole role_, | const ImageRole role_, | ||||
| const float newState_) | const float newState_) | ||||
| : ComponentUndoableAction <ImageButton> (button, layout_), | |||||
| : ComponentUndoableAction<ImageButton> (button, layout_), | |||||
| role (role_), | role (role_), | ||||
| newState (newState_), | |||||
| layout (layout_) | |||||
| newState (newState_) | |||||
| { | { | ||||
| oldState = ImageButtonHandler::getImageOpacity (button, role_); | oldState = ImageButtonHandler::getImageOpacity (button, role_); | ||||
| } | } | ||||
| bool perform() | |||||
| bool perform() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageOpacity (layout, getComponent(), role, newState, false); | ImageButtonHandler::setImageOpacity (layout, getComponent(), role, newState, false); | ||||
| return true; | return true; | ||||
| } | } | ||||
| bool undo() | |||||
| bool undo() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageOpacity (layout, getComponent(), role, oldState, false); | ImageButtonHandler::setImageOpacity (layout, getComponent(), role, oldState, false); | ||||
| @@ -366,7 +361,6 @@ public: | |||||
| private: | private: | ||||
| const ImageRole role; | const ImageRole role; | ||||
| float newState, oldState; | float newState, oldState; | ||||
| ComponentLayout& layout; | |||||
| }; | }; | ||||
| static float getImageOpacity (ImageButton* button, const ImageRole role) | static float getImageOpacity (ImageButton* button, const ImageRole role) | ||||
| @@ -400,12 +394,12 @@ public: | |||||
| { | { | ||||
| } | } | ||||
| void setValue (double newValue) | |||||
| void setValue (double newValue) override | |||||
| { | { | ||||
| setImageOpacity (layout, owner, role, (float) newValue, true); | setImageOpacity (layout, owner, role, (float) newValue, true); | ||||
| } | } | ||||
| double getValue() const | |||||
| double getValue() const override | |||||
| { | { | ||||
| return getImageOpacity (owner, role); | return getImageOpacity (owner, role); | ||||
| } | } | ||||
| @@ -417,7 +411,7 @@ public: | |||||
| }; | }; | ||||
| //============================================================================== | //============================================================================== | ||||
| class SetImageColourAction : public ComponentUndoableAction <ImageButton> | |||||
| class SetImageColourAction : public ComponentUndoableAction<ImageButton> | |||||
| { | { | ||||
| public: | public: | ||||
| SetImageColourAction (ImageButton* const button, | SetImageColourAction (ImageButton* const button, | ||||
| @@ -426,20 +420,19 @@ public: | |||||
| Colour newState_) | Colour newState_) | ||||
| : ComponentUndoableAction<ImageButton> (button, layout_), | : ComponentUndoableAction<ImageButton> (button, layout_), | ||||
| role (role_), | role (role_), | ||||
| newState (newState_), | |||||
| layout (layout_) | |||||
| newState (newState_) | |||||
| { | { | ||||
| oldState = ImageButtonHandler::getImageColour (button, role_); | oldState = ImageButtonHandler::getImageColour (button, role_); | ||||
| } | } | ||||
| bool perform() | |||||
| bool perform() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageColour (layout, getComponent(), role, newState, false); | ImageButtonHandler::setImageColour (layout, getComponent(), role, newState, false); | ||||
| return true; | return true; | ||||
| } | } | ||||
| bool undo() | |||||
| bool undo() override | |||||
| { | { | ||||
| showCorrectTab(); | showCorrectTab(); | ||||
| ImageButtonHandler::setImageColour (layout, getComponent(), role, oldState, false); | ImageButtonHandler::setImageColour (layout, getComponent(), role, oldState, false); | ||||
| @@ -449,7 +442,6 @@ public: | |||||
| private: | private: | ||||
| const ImageRole role; | const ImageRole role; | ||||
| Colour newState, oldState; | Colour newState, oldState; | ||||
| ComponentLayout& layout; | |||||
| }; | }; | ||||
| static Colour getImageColour (ImageButton* button, const ImageRole role) | static Colour getImageColour (ImageButton* button, const ImageRole role) | ||||
| @@ -200,7 +200,7 @@ | |||||
| INSTALL_PATH = "/usr/bin"; | INSTALL_PATH = "/usr/bin"; | ||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; | MACOSX_DEPLOYMENT_TARGET = 10.10; | ||||
| MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | ||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.roli.UnitTestRunner; | PRODUCT_BUNDLE_IDENTIFIER = com.roli.UnitTestRunner; | ||||
| PRODUCT_NAME = "UnitTestRunner"; | PRODUCT_NAME = "UnitTestRunner"; | ||||
| SDKROOT_ppc = macosx10.5; | SDKROOT_ppc = macosx10.5; | ||||
| @@ -236,7 +236,7 @@ | |||||
| LLVM_LTO = YES; | LLVM_LTO = YES; | ||||
| MACOSX_DEPLOYMENT_TARGET = 10.10; | MACOSX_DEPLOYMENT_TARGET = 10.10; | ||||
| MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; | ||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code"; | |||||
| PRODUCT_BUNDLE_IDENTIFIER = com.roli.UnitTestRunner; | PRODUCT_BUNDLE_IDENTIFIER = com.roli.UnitTestRunner; | ||||
| PRODUCT_NAME = "UnitTestRunner"; | PRODUCT_NAME = "UnitTestRunner"; | ||||
| SDKROOT_ppc = macosx10.5; | SDKROOT_ppc = macosx10.5; | ||||
| @@ -9,7 +9,7 @@ | |||||
| </GROUP> | </GROUP> | ||||
| </MAINGROUP> | </MAINGROUP> | ||||
| <EXPORTFORMATS> | <EXPORTFORMATS> | ||||
| <XCODE_MAC targetFolder="Builds/MacOSX" extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code" | |||||
| <XCODE_MAC targetFolder="Builds/MacOSX" extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare -Wint-conversion -Wconditional-uninitialized -Woverloaded-virtual -Wreorder -Wconstant-conversion -Wsign-conversion -Wunused-private-field -Wbool-conversion -Wextra-semi -Wno-ignored-qualifiers -Wunreachable-code" | |||||
| extraDefs=""> | extraDefs=""> | ||||
| <CONFIGURATIONS> | <CONFIGURATIONS> | ||||
| <CONFIGURATION name="Debug" osxCompatibility="10.10 SDK" isDebug="1" targetName="UnitTestRunner" | <CONFIGURATION name="Debug" osxCompatibility="10.10 SDK" isDebug="1" targetName="UnitTestRunner" | ||||
| @@ -159,22 +159,16 @@ TextPropertyComponent::TextPropertyComponent (const String& name, | |||||
| createEditor (maxNumChars, isEditable); | createEditor (maxNumChars, isEditable); | ||||
| } | } | ||||
| TextPropertyComponent::TextPropertyComponent (const Value& valueToControl, | |||||
| const String& name, | |||||
| int maxNumChars, | |||||
| bool isMultiLine, | |||||
| bool isEditable) | |||||
| : TextPropertyComponent (name, maxNumChars, isMultiLine, isEditable) | |||||
| TextPropertyComponent::TextPropertyComponent (const Value& valueToControl, const String& name, | |||||
| int maxNumChars, bool multiLine, bool isEditable) | |||||
| : TextPropertyComponent (name, maxNumChars, multiLine, isEditable) | |||||
| { | { | ||||
| textEditor->getTextValue().referTo (valueToControl); | textEditor->getTextValue().referTo (valueToControl); | ||||
| } | } | ||||
| TextPropertyComponent::TextPropertyComponent (ValueWithDefault& valueToControl, | |||||
| const String& name, | |||||
| int maxNumChars, | |||||
| bool isMultiLine, | |||||
| bool isEditable) | |||||
| : TextPropertyComponent (name, maxNumChars, isMultiLine, isEditable) | |||||
| TextPropertyComponent::TextPropertyComponent (ValueWithDefault& valueToControl, const String& name, | |||||
| int maxNumChars, bool multiLine, bool isEditable) | |||||
| : TextPropertyComponent (name, maxNumChars, multiLine, isEditable) | |||||
| { | { | ||||
| textEditor->getTextValue().referTo (Value (new RemapperValueSourceWithDefault (valueToControl))); | textEditor->getTextValue().referTo (Value (new RemapperValueSourceWithDefault (valueToControl))); | ||||
| textEditor->setTextToDisplayWhenEmpty (valueToControl.getDefault(), 0.5f); | textEditor->setTextToDisplayWhenEmpty (valueToControl.getDefault(), 0.5f); | ||||