| @@ -527,7 +527,7 @@ public: | |||||
| { | { | ||||
| FSRef fn; | FSRef fn; | ||||
| if (FSPathMakeRef ((UInt8*) (const char*) filename, &fn, 0) == noErr) | |||||
| if (FSPathMakeRef ((UInt8*) filename.toUTF8(), &fn, 0) == noErr) | |||||
| { | { | ||||
| resFileId = FSOpenResFile (&fn, fsRdPerm); | resFileId = FSOpenResFile (&fn, fsRdPerm); | ||||
| @@ -33,6 +33,7 @@ BEGIN_JUCE_NAMESPACE | |||||
| #include "../../../events/juce_Timer.h" | #include "../../../events/juce_Timer.h" | ||||
| #include "../../../core/juce_Random.h" | #include "../../../core/juce_Random.h" | ||||
| #include "../../graphics/imaging/juce_Image.h" | #include "../../graphics/imaging/juce_Image.h" | ||||
| #include "../mouse/juce_MouseEvent.h" | |||||
| #include "juce_FileDragAndDropTarget.h" | #include "juce_FileDragAndDropTarget.h" | ||||
| bool juce_performDragDropFiles (const StringArray& files, const bool copyFiles, bool& shouldStop); | bool juce_performDragDropFiles (const StringArray& files, const bool copyFiles, bool& shouldStop); | ||||
| @@ -28,9 +28,10 @@ | |||||
| BEGIN_JUCE_NAMESPACE | BEGIN_JUCE_NAMESPACE | ||||
| #include "juce_ColourSelector.h" | #include "juce_ColourSelector.h" | ||||
| #include "../../../text/juce_LocalisedStrings.h" | |||||
| #include "../menus/juce_PopupMenu.h" | #include "../menus/juce_PopupMenu.h" | ||||
| #include "../mouse/juce_MouseEvent.h" | |||||
| #include "../../graphics/imaging/juce_Image.h" | #include "../../graphics/imaging/juce_Image.h" | ||||
| #include "../../../text/juce_LocalisedStrings.h" | |||||
| static const int swatchesPerRow = 8; | static const int swatchesPerRow = 8; | ||||
| static const int swatchHeight = 22; | static const int swatchHeight = 22; | ||||
| @@ -2215,6 +2215,9 @@ public: | |||||
| private: | private: | ||||
| Pimpl& pimpl; | Pimpl& pimpl; | ||||
| ScopedDiscOpener (const ScopedDiscOpener&); | |||||
| ScopedDiscOpener& operator= (const ScopedDiscOpener&); | |||||
| }; | }; | ||||
| DiskState getDiskState() | DiskState getDiskState() | ||||
| @@ -2391,6 +2394,8 @@ int AudioCDBurner::getNumAvailableAudioBlocks() const | |||||
| const String AudioCDBurner::burn (AudioCDBurner::BurnProgressListener* listener, bool ejectDiscAfterwards, | const String AudioCDBurner::burn (AudioCDBurner::BurnProgressListener* listener, bool ejectDiscAfterwards, | ||||
| bool performFakeBurnForTesting, int writeSpeed) | bool performFakeBurnForTesting, int writeSpeed) | ||||
| { | { | ||||
| pimpl->setIntProperty (L"WriteSpeed", writeSpeed > 0 ? writeSpeed : -1); | |||||
| pimpl->listener = listener; | pimpl->listener = listener; | ||||
| pimpl->progress = 0; | pimpl->progress = 0; | ||||
| pimpl->shouldCancel = false; | pimpl->shouldCancel = false; | ||||
| @@ -2158,6 +2158,11 @@ const char* String::toCString() const | |||||
| } | } | ||||
| } | } | ||||
| #ifdef _MSC_VER | |||||
| #pragma warning (disable: 4514 4996) | |||||
| #pragma warning (push) | |||||
| #endif | |||||
| int String::getNumBytesAsCString() const throw() | int String::getNumBytesAsCString() const throw() | ||||
| { | { | ||||
| return (int) wcstombs (0, text->text, 0); | return (int) wcstombs (0, text->text, 0); | ||||
| @@ -2173,6 +2178,10 @@ int String::copyToCString (char* destBuffer, const int maxBufferSizeBytes) const | |||||
| return numBytes; | return numBytes; | ||||
| } | } | ||||
| #ifdef _MSC_VER | |||||
| #pragma warning (pop) | |||||
| #endif | |||||
| //============================================================================== | //============================================================================== | ||||
| void String::copyToUnicode (juce_wchar* const destBuffer, const int maxCharsToCopy) const throw() | void String::copyToUnicode (juce_wchar* const destBuffer, const int maxCharsToCopy) const throw() | ||||
| { | { | ||||