mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-09 23:34:20 +00:00
Increased the warning level in a couple of OSX builds, and removed some pedantic warnings in the introjucer.
This commit is contained in:
parent
784c1f5dae
commit
234525aef9
30 changed files with 88 additions and 76 deletions
|
|
@ -1645,6 +1645,7 @@
|
|||
HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)";
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wno-strict-aliasing";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
|
||||
SDKROOT_ppc = macosx10.5;
|
||||
|
|
@ -1663,6 +1664,7 @@
|
|||
HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)";
|
||||
GCC_OPTIMIZATION_LEVEL = 3;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
OTHER_CPLUSPLUSFLAGS = "-W -Wall -Wshadow -Wno-missing-field-initializers -Wno-strict-aliasing";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.5;
|
||||
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<EXPORTFORMATS>
|
||||
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
|
||||
juceFolder="../.." documentExtensions=".jucer" objCExtraSuffix="zNNCr"
|
||||
bigIcon="rVgowdy">
|
||||
bigIcon="rVgowdy" extraCompilerFlags="-W -Wall -Wshadow -Wno-missing-field-initializers -Wno-strict-aliasing">
|
||||
<CONFIGURATIONS>
|
||||
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="Introjucer"
|
||||
osxSDK="default" osxCompatibility="default" osxArchitecture="default"/>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,11 @@ namespace AppearanceColours
|
|||
{ "Selected Text Bkgd", CodeEditorComponent::highlightColourId, false, false },
|
||||
{ "Caret", CaretComponent::caretColourId, false, true }
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
numColours = sizeof (AppearanceColours::colours) / sizeof (AppearanceColours::colours[0])
|
||||
};
|
||||
}
|
||||
|
||||
//==============================================================================
|
||||
|
|
@ -56,7 +61,7 @@ AppearanceSettings::AppearanceSettings (bool updateAppWhenChanged)
|
|||
{
|
||||
IntrojucerLookAndFeel lf;
|
||||
|
||||
for (int i = 0; i < sizeof (AppearanceColours::colours) / sizeof (AppearanceColours::colours[0]); ++i)
|
||||
for (int i = 0; i < AppearanceColours::numColours; ++i)
|
||||
getColourValue (AppearanceColours::colours[i].name) = lf.findColour (AppearanceColours::colours[i].colourID).toString();
|
||||
|
||||
CodeDocument doc;
|
||||
|
|
@ -192,7 +197,7 @@ void AppearanceSettings::updateColourScheme()
|
|||
|
||||
void AppearanceSettings::applyToLookAndFeel (LookAndFeel& lf) const
|
||||
{
|
||||
for (int i = 0; i < sizeof (AppearanceColours::colours) / sizeof (AppearanceColours::colours[0]); ++i)
|
||||
for (int i = 0; i < AppearanceColours::numColours; ++i)
|
||||
{
|
||||
Colour col;
|
||||
if (getColour (AppearanceColours::colours[i].name, col))
|
||||
|
|
@ -222,7 +227,7 @@ void AppearanceSettings::applyToCodeEditor (CodeEditorComponent& editor) const
|
|||
editor.setColourScheme (cs);
|
||||
editor.setFont (getCodeFont());
|
||||
|
||||
for (int i = 0; i < sizeof (AppearanceColours::colours) / sizeof (AppearanceColours::colours[0]); ++i)
|
||||
for (int i = 0; i < AppearanceColours::numColours; ++i)
|
||||
{
|
||||
if (AppearanceColours::colours[i].applyToEditorOnly)
|
||||
{
|
||||
|
|
@ -547,9 +552,9 @@ Rectangle<int> IntrojucerLookAndFeel::getPropertyComponentContentPosition (Prope
|
|||
return LookAndFeel::getPropertyComponentContentPosition (component);
|
||||
}
|
||||
|
||||
int IntrojucerLookAndFeel::getTabButtonOverlap (int tabDepth) { return -1; }
|
||||
int IntrojucerLookAndFeel::getTabButtonOverlap (int /*tabDepth*/) { return -1; }
|
||||
int IntrojucerLookAndFeel::getTabButtonSpaceAroundImage() { return 1; }
|
||||
int IntrojucerLookAndFeel::getTabButtonBestWidth (TabBarButton& button, int tabDepth) { return 120; }
|
||||
int IntrojucerLookAndFeel::getTabButtonBestWidth (TabBarButton&, int /*tabDepth*/) { return 120; }
|
||||
|
||||
void IntrojucerLookAndFeel::createTabTextLayout (const TabBarButton& button, const Rectangle<int>& textArea, GlyphArrangement& textLayout)
|
||||
{
|
||||
|
|
@ -700,8 +705,8 @@ void IntrojucerLookAndFeel::fillWithBackgroundTexture (Component& c, Graphics& g
|
|||
}
|
||||
|
||||
void IntrojucerLookAndFeel::drawConcertinaPanelHeader (Graphics& g, const Rectangle<int>& area,
|
||||
bool isMouseOver, bool isMouseDown,
|
||||
ConcertinaPanel& concertina, Component& panel)
|
||||
bool isMouseOver, bool /*isMouseDown*/,
|
||||
ConcertinaPanel&, Component& panel)
|
||||
{
|
||||
const Colour bkg (findColour (mainBackgroundColourId));
|
||||
|
||||
|
|
|
|||
|
|
@ -246,13 +246,13 @@ int JuceUpdater::getNumRows()
|
|||
return latestList.modules.size();
|
||||
}
|
||||
|
||||
void JuceUpdater::paintListBoxItem (int rowNumber, Graphics& g, int width, int height, bool rowIsSelected)
|
||||
void JuceUpdater::paintListBoxItem (int /*rowNumber*/, Graphics& g, int /*width*/, int /*height*/, bool rowIsSelected)
|
||||
{
|
||||
if (rowIsSelected)
|
||||
g.fillAll (findColour (TextEditor::highlightColourId));
|
||||
}
|
||||
|
||||
Component* JuceUpdater::refreshComponentForRow (int rowNumber, bool isRowSelected, Component* existingComponentToUpdate)
|
||||
Component* JuceUpdater::refreshComponentForRow (int rowNumber, bool /*isRowSelected*/, Component* existingComponentToUpdate)
|
||||
{
|
||||
class UpdateListComponent : public Component
|
||||
{
|
||||
|
|
@ -327,9 +327,7 @@ Component* JuceUpdater::refreshComponentForRow (int rowNumber, bool isRowSelecte
|
|||
if (c == nullptr)
|
||||
c = new UpdateListComponent (*this);
|
||||
|
||||
ModuleList::Module* m = latestList.modules [rowNumber];
|
||||
|
||||
if (m != nullptr)
|
||||
if (ModuleList::Module* m = latestList.modules [rowNumber])
|
||||
c->setModule (m,
|
||||
moduleList.findModuleInfo (m->uid),
|
||||
versionsToDownload.getPropertyAsValue (m->uid, nullptr));
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ bool MainWindow::isInterestedInFileDrag (const StringArray& filenames)
|
|||
return false;
|
||||
}
|
||||
|
||||
void MainWindow::filesDropped (const StringArray& filenames, int mouseX, int mouseY)
|
||||
void MainWindow::filesDropped (const StringArray& filenames, int /*mouseX*/, int /*mouseY*/)
|
||||
{
|
||||
for (int i = filenames.size(); --i >= 0;)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ public:
|
|||
//==============================================================================
|
||||
struct Type : public OpenDocumentManager::DocumentType
|
||||
{
|
||||
bool canOpenFile (const File&) { return true; }
|
||||
Document* openFile (Project* project, const File& file) { return new UnknownDocument (project, file); }
|
||||
bool canOpenFile (const File&) { return true; }
|
||||
Document* openFile (Project* p, const File& f) { return new UnknownDocument (p, f); }
|
||||
};
|
||||
|
||||
//==============================================================================
|
||||
|
|
@ -62,7 +62,7 @@ public:
|
|||
Component* createViewer() { return createEditor(); }
|
||||
void fileHasBeenRenamed (const File& newFile) { file = newFile; }
|
||||
String getState() const { return String::empty; }
|
||||
void restoreState (const String& state) {}
|
||||
void restoreState (const String&) {}
|
||||
|
||||
String getType() const
|
||||
{
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ public:
|
|||
return true;
|
||||
}
|
||||
|
||||
Document* openFile (Project* project, const File& file) { return new SourceCodeDocument (project, file); }
|
||||
Document* openFile (Project* p, const File& file) { return new SourceCodeDocument (p, file); }
|
||||
};
|
||||
|
||||
protected:
|
||||
|
|
|
|||
|
|
@ -333,19 +333,19 @@ ProjectExporter::BuildConfiguration::Ptr ProjectExporter::getConfiguration (int
|
|||
return createBuildConfig (getConfigurations().getChild (index));
|
||||
}
|
||||
|
||||
bool ProjectExporter::hasConfigurationNamed (const String& name) const
|
||||
bool ProjectExporter::hasConfigurationNamed (const String& nameToFind) const
|
||||
{
|
||||
const ValueTree configs (getConfigurations());
|
||||
for (int i = configs.getNumChildren(); --i >= 0;)
|
||||
if (configs.getChild(i) [Ids::name].toString() == name)
|
||||
if (configs.getChild(i) [Ids::name].toString() == nameToFind)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
String ProjectExporter::getUniqueConfigName (String name) const
|
||||
String ProjectExporter::getUniqueConfigName (String nm) const
|
||||
{
|
||||
String nameRoot (name);
|
||||
String nameRoot (nm);
|
||||
while (CharacterFunctions::isDigit (nameRoot.getLastCharacter()))
|
||||
nameRoot = nameRoot.dropLastCharacters (1);
|
||||
|
||||
|
|
@ -353,9 +353,9 @@ String ProjectExporter::getUniqueConfigName (String name) const
|
|||
|
||||
int suffix = 2;
|
||||
while (hasConfigurationNamed (name))
|
||||
name = nameRoot + " " + String (suffix++);
|
||||
nm = nameRoot + " " + String (suffix++);
|
||||
|
||||
return name;
|
||||
return nm;
|
||||
}
|
||||
|
||||
void ProjectExporter::addNewConfiguration (const BuildConfiguration* configToCopy)
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ public:
|
|||
Project& getProject() noexcept { return project; }
|
||||
const Project& getProject() const noexcept { return project; }
|
||||
|
||||
Value getSetting (const Identifier& name) { return settings.getPropertyAsValue (name, project.getUndoManagerFor (settings)); }
|
||||
String getSettingString (const Identifier& name) const { return settings [name]; }
|
||||
Value getSetting (const Identifier& nm) { return settings.getPropertyAsValue (nm, project.getUndoManagerFor (settings)); }
|
||||
String getSettingString (const Identifier& nm) const { return settings [nm]; }
|
||||
|
||||
Value getJuceFolderValue() { return getSetting (Ids::juceFolder); }
|
||||
String getJuceFolderString() const { return getSettingString (Ids::juceFolder); }
|
||||
|
|
@ -200,7 +200,7 @@ public:
|
|||
|
||||
Value getUserNotes() { return getValue (Ids::userNotes); }
|
||||
|
||||
Value getValue (const Identifier& name) { return config.getPropertyAsValue (name, getUndoManager()); }
|
||||
Value getValue (const Identifier& nm) { return config.getPropertyAsValue (nm, getUndoManager()); }
|
||||
UndoManager* getUndoManager() const { return project.getUndoManagerFor (config); }
|
||||
|
||||
void createPropertyEditors (PropertyListBuilder&);
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ namespace RTASHelpers
|
|||
}
|
||||
}
|
||||
|
||||
static inline void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver, const File& moduleFolder)
|
||||
static inline void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver, const File& /*moduleFolder*/)
|
||||
{
|
||||
if (isExporterSupported (exporter))
|
||||
{
|
||||
|
|
@ -370,7 +370,8 @@ namespace RTASHelpers
|
|||
String msvcPathToRTASFolder (juceFolder.getChildFile ("juce_audio_plugin_client/RTAS")
|
||||
.toWindowsStyle() + "\\");
|
||||
|
||||
exporter.msvcDelayLoadedDLLs = "DAE.dll; DigiExt.dll; DSI.dll; PluginLib.dll; DSPManager.dll";
|
||||
exporter.msvcDelayLoadedDLLs = "DAE.dll; DigiExt.dll; DSI.dll; PluginLib.dll; "
|
||||
"DSPManager.dll; DSPManager.dll; DSPManagerClientLib.dll; RTASClientLib.dll";
|
||||
|
||||
if (! exporter.getExtraLinkerFlagsString().contains ("/FORCE:multiple"))
|
||||
exporter.getExtraLinkerFlags() = exporter.getExtraLinkerFlags().toString() + " /FORCE:multiple";
|
||||
|
|
@ -528,7 +529,7 @@ namespace AAXHelpers
|
|||
exporter.addToExtraSearchPaths (aaxFolder.getChildFile ("Interfaces").getChildFile ("ACF"));
|
||||
}
|
||||
|
||||
static inline void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver, const File& moduleFolder)
|
||||
static inline void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver, const File& /*moduleFolder*/)
|
||||
{
|
||||
if (isExporterSupported (exporter))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -130,14 +130,14 @@ namespace ProjectSettingsTreeClasses
|
|||
class SettingsComp : public Component
|
||||
{
|
||||
public:
|
||||
SettingsComp (ProjectExporter::BuildConfiguration* config, const String& exporterName)
|
||||
SettingsComp (ProjectExporter::BuildConfiguration* conf, const String& expName)
|
||||
{
|
||||
addAndMakeVisible (&group);
|
||||
|
||||
PropertyListBuilder props;
|
||||
config->createPropertyEditors (props);
|
||||
conf->createPropertyEditors (props);
|
||||
group.setProperties (props);
|
||||
group.setName (exporterName + " / " + config->getName());
|
||||
group.setName (expName + " / " + conf->getName());
|
||||
parentSizeChanged();
|
||||
}
|
||||
|
||||
|
|
@ -258,14 +258,14 @@ namespace ProjectSettingsTreeClasses
|
|||
class SettingsComp : public Component
|
||||
{
|
||||
public:
|
||||
SettingsComp (ProjectExporter* exporter)
|
||||
SettingsComp (ProjectExporter* exp)
|
||||
{
|
||||
addAndMakeVisible (&group);
|
||||
|
||||
PropertyListBuilder props;
|
||||
exporter->createPropertyEditors (props);
|
||||
exp->createPropertyEditors (props);
|
||||
group.setProperties (props);
|
||||
group.setName ("Export target: " + exporter->getName());
|
||||
group.setName ("Export target: " + exp->getName());
|
||||
parentSizeChanged();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -69,13 +69,13 @@ public:
|
|||
return item.getNumChildren();
|
||||
}
|
||||
|
||||
void paintListBoxItem (int rowNumber, Graphics& g, int width, int height, bool rowIsSelected)
|
||||
void paintListBoxItem (int /*rowNumber*/, Graphics& g, int width, int height, bool /*rowIsSelected*/)
|
||||
{
|
||||
g.setColour (Colours::white.withAlpha (0.4f));
|
||||
g.fillRect (0, 0, width, height - 1);
|
||||
}
|
||||
|
||||
Component* refreshComponentForRow (int rowNumber, bool isRowSelected, Component* existingComponentToUpdate)
|
||||
Component* refreshComponentForRow (int rowNumber, bool /*isRowSelected*/, Component* existingComponentToUpdate)
|
||||
{
|
||||
if (rowNumber < getNumRows())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ void ModuleList::getDependencies (const String& moduleID, StringArray& dependenc
|
|||
}
|
||||
}
|
||||
|
||||
void ModuleList::createDependencies (const String& moduleID, OwnedArray<LibraryModule>& modules) const
|
||||
void ModuleList::createDependencies (const String& moduleID, OwnedArray<LibraryModule>&) const
|
||||
{
|
||||
ScopedPointer<LibraryModule> m (loadModule (moduleID));
|
||||
|
||||
|
|
@ -592,10 +592,10 @@ static bool exporterTargetMatches (const String& test, String target)
|
|||
|
||||
for (int i = validTargets.size(); --i >= 0;)
|
||||
{
|
||||
const String& target = validTargets[i];
|
||||
const String& targetName = validTargets[i];
|
||||
|
||||
if (target == test
|
||||
|| (target.startsWithChar ('!') && test != target.substring (1).trimStart()))
|
||||
if (targetName == test
|
||||
|| (targetName.startsWithChar ('!') && test != targetName.substring (1).trimStart()))
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -193,7 +193,7 @@ public:
|
|||
flipRow (row);
|
||||
}
|
||||
|
||||
void listBoxItemDoubleClicked (int row, const MouseEvent& e)
|
||||
void listBoxItemDoubleClicked (int row, const MouseEvent&)
|
||||
{
|
||||
flipRow (row);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -235,11 +235,11 @@ public:
|
|||
String getName() { return "Audio Plug-In"; }
|
||||
String getDescription() { return "Creates an audio plugin project"; }
|
||||
|
||||
void addSetupItems (Component& setupComp, OwnedArray<Component>& itemsCreated)
|
||||
void addSetupItems (Component&, OwnedArray<Component>& /*itemsCreated*/)
|
||||
{
|
||||
}
|
||||
|
||||
Result processResultsFromSetupItems (Component& setupComp)
|
||||
Result processResultsFromSetupItems (Component&)
|
||||
{
|
||||
return Result::ok();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ File Project::getLastDocumentOpened() { return lastDocumentOpe
|
|||
void Project::setLastDocumentOpened (const File& file) { lastDocumentOpened = file; }
|
||||
|
||||
//==============================================================================
|
||||
void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& property)
|
||||
void Project::valueTreePropertyChanged (ValueTree&, const Identifier& property)
|
||||
{
|
||||
if (property == Ids::projectType)
|
||||
setMissingDefaultValues();
|
||||
|
|
|
|||
|
|
@ -647,7 +647,7 @@ void ProjectContentComponent::getCommandInfo (const CommandID commandID, Applica
|
|||
}
|
||||
}
|
||||
|
||||
bool ProjectContentComponent::isCommandActive (const CommandID commandID)
|
||||
bool ProjectContentComponent::isCommandActive (const CommandID)
|
||||
{
|
||||
return project != nullptr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ void ProjectTreeViewBase::addFiles (const StringArray& files, int insertIndex)
|
|||
p->addFiles (files, insertIndex);
|
||||
}
|
||||
|
||||
void ProjectTreeViewBase::moveSelectedItemsTo (OwnedArray <Project::Item>& selectedNodes, int insertIndex)
|
||||
void ProjectTreeViewBase::moveSelectedItemsTo (OwnedArray <Project::Item>&, int /*insertIndex*/)
|
||||
{
|
||||
jassertfalse;
|
||||
}
|
||||
|
|
@ -116,8 +116,8 @@ void ProjectTreeViewBase::triggerAsyncRename (const Project::Item& itemToRename)
|
|||
class RenameMessage : public CallbackMessage
|
||||
{
|
||||
public:
|
||||
RenameMessage (TreeView* const t, const Project::Item& item)
|
||||
: tree (t), itemToRename (item) {}
|
||||
RenameMessage (TreeView* const t, const Project::Item& i)
|
||||
: tree (t), itemToRename (i) {}
|
||||
|
||||
void messageCallback()
|
||||
{
|
||||
|
|
@ -357,18 +357,18 @@ void ProjectTreeViewBase::treeChildrenChanged (const ValueTree& parentTree)
|
|||
}
|
||||
}
|
||||
|
||||
void ProjectTreeViewBase::valueTreePropertyChanged (ValueTree& tree, const Identifier& property)
|
||||
void ProjectTreeViewBase::valueTreePropertyChanged (ValueTree& tree, const Identifier&)
|
||||
{
|
||||
if (tree == item.state)
|
||||
repaintItem();
|
||||
}
|
||||
|
||||
void ProjectTreeViewBase::valueTreeChildAdded (ValueTree& parentTree, ValueTree& childWhichHasBeenAdded)
|
||||
void ProjectTreeViewBase::valueTreeChildAdded (ValueTree& parentTree, ValueTree&)
|
||||
{
|
||||
treeChildrenChanged (parentTree);
|
||||
}
|
||||
|
||||
void ProjectTreeViewBase::valueTreeChildRemoved (ValueTree& parentTree, ValueTree& childWhichHasBeenRemoved)
|
||||
void ProjectTreeViewBase::valueTreeChildRemoved (ValueTree& parentTree, ValueTree&)
|
||||
{
|
||||
treeChildrenChanged (parentTree);
|
||||
}
|
||||
|
|
@ -378,7 +378,7 @@ void ProjectTreeViewBase::valueTreeChildOrderChanged (ValueTree& parentTree)
|
|||
treeChildrenChanged (parentTree);
|
||||
}
|
||||
|
||||
void ProjectTreeViewBase::valueTreeParentChanged (ValueTree& tree)
|
||||
void ProjectTreeViewBase::valueTreeParentChanged (ValueTree&)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ public:
|
|||
{
|
||||
}
|
||||
|
||||
void createPropertyEditors (Project& project, PropertyListBuilder& props) const
|
||||
void createPropertyEditors (Project&, PropertyListBuilder&) const
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ void SourceFileTreeViewItem::setName (const String& newName)
|
|||
}
|
||||
}
|
||||
|
||||
ProjectTreeViewBase* SourceFileTreeViewItem::createSubItem (const Project::Item& child)
|
||||
ProjectTreeViewBase* SourceFileTreeViewItem::createSubItem (const Project::Item&)
|
||||
{
|
||||
jassertfalse
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@ public:
|
|||
SourceFileTreeViewItem (const Project::Item& item);
|
||||
~SourceFileTreeViewItem();
|
||||
|
||||
bool acceptsFileDrop (const StringArray& files) const { return false; }
|
||||
bool acceptsDragItems (const OwnedArray <Project::Item>& selectedNodes) { return false; }
|
||||
bool acceptsFileDrop (const StringArray&) const { return false; }
|
||||
bool acceptsDragItems (const OwnedArray <Project::Item>&) { return false; }
|
||||
ProjectTreeViewBase* createSubItem (const Project::Item& child);
|
||||
void showDocument();
|
||||
void showPopupMenu();
|
||||
|
|
@ -54,7 +54,7 @@ public:
|
|||
~GroupTreeViewItem();
|
||||
|
||||
bool isRoot() const { return item.isMainGroup(); }
|
||||
bool acceptsFileDrop (const StringArray& files) const { return true; }
|
||||
bool acceptsFileDrop (const StringArray&) const { return true; }
|
||||
bool acceptsDragItems (const OwnedArray <Project::Item>& selectedNodes);
|
||||
void checkFileStatus();
|
||||
void moveSelectedItemsTo (OwnedArray <Project::Item>& selectedNodes, int insertIndex);
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ Font JucerTreeViewBase::getFont() const
|
|||
return Font (getItemHeight() * 0.6f);
|
||||
}
|
||||
|
||||
void JucerTreeViewBase::paintItem (Graphics& g, int width, int height)
|
||||
void JucerTreeViewBase::paintItem (Graphics& g, int /*width*/, int /*height*/)
|
||||
{
|
||||
if (isSelected())
|
||||
g.fillAll (getOwnerView()->findColour (treeviewHighlightColourId));
|
||||
|
|
@ -96,7 +96,7 @@ float JucerTreeViewBase::getIconSize() const
|
|||
return jmin (getItemHeight() - 4.0f, 18.0f);
|
||||
}
|
||||
|
||||
void JucerTreeViewBase::paintOpenCloseButton (Graphics& g, int width, int height, bool isMouseOver)
|
||||
void JucerTreeViewBase::paintOpenCloseButton (Graphics& g, int width, int height, bool /*isMouseOver*/)
|
||||
{
|
||||
Path p;
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ void JucerTreeViewBase::invokeShowDocument()
|
|||
showDocument();
|
||||
}
|
||||
|
||||
void JucerTreeViewBase::itemDoubleClicked (const MouseEvent& e)
|
||||
void JucerTreeViewBase::itemDoubleClicked (const MouseEvent&)
|
||||
{
|
||||
invokeShowDocument();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2030,6 +2030,7 @@
|
|||
HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)";
|
||||
GCC_OPTIMIZATION_LEVEL = 0;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wno-strict-aliasing";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
|
||||
SDKROOT_ppc = macosx10.5;
|
||||
|
|
@ -2049,6 +2050,7 @@
|
|||
HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)";
|
||||
GCC_OPTIMIZATION_LEVEL = s;
|
||||
INFOPLIST_FILE = Info.plist;
|
||||
OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wno-strict-aliasing";
|
||||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.5;
|
||||
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@
|
|||
companyName="Raw Material Software Ltd.">
|
||||
<EXPORTFORMATS>
|
||||
<XCODE_MAC targetFolder="Builds/MacOSX" vstFolder="~/SDKs/vstsdk2.4" rtasFolder="~/SDKs/PT_80_SDK"
|
||||
juceFolder="../../../juce" objCExtraSuffix="JSLvvV6j" bigIcon="f4hwldS">
|
||||
juceFolder="../../../juce" objCExtraSuffix="JSLvvV6j" bigIcon="f4hwldS"
|
||||
extraCompilerFlags="-Wall -Wno-missing-field-initializers -Wno-strict-aliasing">
|
||||
<CONFIGURATIONS>
|
||||
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="JuceDemo"
|
||||
osxSDK="default" osxCompatibility="default" defines="JUCE_UNIT_TESTS=1"
|
||||
|
|
|
|||
|
|
@ -111,6 +111,9 @@
|
|||
#pragma comment(lib, PT_LIB_PATH "DigiExt.lib")
|
||||
#pragma comment(lib, PT_LIB_PATH "DSI.lib")
|
||||
#pragma comment(lib, PT_LIB_PATH "PluginLib.lib")
|
||||
#pragma comment(lib, PT_LIB_PATH "DSPManager.lib")
|
||||
#pragma comment(lib, PT_LIB_PATH "DSPManagerClientLib.lib")
|
||||
#pragma comment(lib, PT_LIB_PATH "RTASClientLib.lib")
|
||||
#endif
|
||||
|
||||
#undef Component
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ public:
|
|||
ImageType* createType() const { return new NativeImageType(); }
|
||||
|
||||
//==============================================================================
|
||||
static CGImageRef createImage (const Image& juceImage, const bool forAlpha,
|
||||
static CGImageRef createImage (const Image& juceImage, const bool /*forAlpha*/,
|
||||
CGColorSpaceRef colourSpace, const bool mustOutliveSource)
|
||||
{
|
||||
const Image::BitmapData srcData (juceImage, Image::BitmapData::readOnly);
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ private:
|
|||
}
|
||||
}
|
||||
|
||||
static void menuNeedsUpdate (id self, SEL, NSMenu* menu)
|
||||
static void menuNeedsUpdate (id, SEL, NSMenu* menu)
|
||||
{
|
||||
if (instance != nullptr)
|
||||
instance->updateMenus (menu);
|
||||
|
|
|
|||
|
|
@ -1635,7 +1635,7 @@ private:
|
|||
owner->sendDragCallback (1, sender);
|
||||
}
|
||||
|
||||
static BOOL prepareForDragOperation (id self, SEL, id <NSDraggingInfo>)
|
||||
static BOOL prepareForDragOperation (id, SEL, id <NSDraggingInfo>)
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ private:
|
|||
|
||||
void JUCE_CALLTYPE NativeMessageBox::showMessageBox (AlertWindow::AlertIconType iconType,
|
||||
const String& title, const String& message,
|
||||
Component* associatedComponent)
|
||||
Component* /*associatedComponent*/)
|
||||
{
|
||||
OSXMessageBox box (iconType, title, message, "OK", nullptr, nullptr, nullptr, false);
|
||||
(void) box.getResult();
|
||||
|
|
@ -115,7 +115,7 @@ void JUCE_CALLTYPE NativeMessageBox::showMessageBox (AlertWindow::AlertIconType
|
|||
|
||||
void JUCE_CALLTYPE NativeMessageBox::showMessageBoxAsync (AlertWindow::AlertIconType iconType,
|
||||
const String& title, const String& message,
|
||||
Component* associatedComponent)
|
||||
Component* /*associatedComponent*/)
|
||||
{
|
||||
new OSXMessageBox (iconType, title, message, "OK", nullptr, nullptr, nullptr, true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -133,8 +133,8 @@ public:
|
|||
const int columnId = owner.getHeader().getColumnIdAtX (e.x);
|
||||
|
||||
if (columnId != 0)
|
||||
if (TableListBoxModel* model = owner.getModel())
|
||||
model->cellClicked (row, columnId, e);
|
||||
if (TableListBoxModel* m = owner.getModel())
|
||||
m->cellClicked (row, columnId, e);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -171,8 +171,8 @@ public:
|
|||
const int columnId = owner.getHeader().getColumnIdAtX (e.x);
|
||||
|
||||
if (columnId != 0)
|
||||
if (TableListBoxModel* model = owner.getModel())
|
||||
model->cellClicked (row, columnId, e);
|
||||
if (TableListBoxModel* m = owner.getModel())
|
||||
m->cellClicked (row, columnId, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -181,8 +181,8 @@ public:
|
|||
const int columnId = owner.getHeader().getColumnIdAtX (e.x);
|
||||
|
||||
if (columnId != 0)
|
||||
if (TableListBoxModel* model = owner.getModel())
|
||||
model->cellDoubleClicked (row, columnId, e);
|
||||
if (TableListBoxModel* m = owner.getModel())
|
||||
m->cellDoubleClicked (row, columnId, e);
|
||||
}
|
||||
|
||||
String getTooltip()
|
||||
|
|
@ -190,8 +190,8 @@ public:
|
|||
const int columnId = owner.getHeader().getColumnIdAtX (getMouseXYRelative().getX());
|
||||
|
||||
if (columnId != 0)
|
||||
if (TableListBoxModel* model = owner.getModel())
|
||||
return model->getCellTooltip (row, columnId);
|
||||
if (TableListBoxModel* m = owner.getModel())
|
||||
return m->getCellTooltip (row, columnId);
|
||||
|
||||
return String::empty;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue