diff --git a/build/linux/platform_specific_code/juce_linux_Windowing.cpp b/build/linux/platform_specific_code/juce_linux_Windowing.cpp index d89e2f0fd8..b99c786142 100644 --- a/build/linux/platform_specific_code/juce_linux_Windowing.cpp +++ b/build/linux/platform_specific_code/juce_linux_Windowing.cpp @@ -306,7 +306,7 @@ static void getModifierMapping() throw() static int currentModifiers = 0; -void ModifierKeys::updateCurrentModifiers() +void ModifierKeys::updateCurrentModifiers() throw() { currentModifierFlags = currentModifiers; } diff --git a/build/macosx/platform_specific_code/juce_mac_Windowing.cpp b/build/macosx/platform_specific_code/juce_mac_Windowing.cpp index a801b28b6d..8bed02bccb 100644 --- a/build/macosx/platform_specific_code/juce_mac_Windowing.cpp +++ b/build/macosx/platform_specific_code/juce_mac_Windowing.cpp @@ -142,7 +142,7 @@ static void updateModifiers (EventRef theEvent) currentModifiers |= ModifierKeys::commandModifier; } -void ModifierKeys::updateCurrentModifiers() +void ModifierKeys::updateCurrentModifiers() throw() { currentModifierFlags = currentModifiers; } diff --git a/build/win32/platform_specific_code/juce_win32_Windowing.cpp b/build/win32/platform_specific_code/juce_win32_Windowing.cpp index 5f9946bd4d..a7a7803e5d 100644 --- a/build/win32/platform_specific_code/juce_win32_Windowing.cpp +++ b/build/win32/platform_specific_code/juce_win32_Windowing.cpp @@ -442,7 +442,7 @@ static void updateKeyModifiers() throw() currentModifiers |= ModifierKeys::altModifier; } -void ModifierKeys::updateCurrentModifiers() +void ModifierKeys::updateCurrentModifiers() throw() { currentModifierFlags = currentModifiers; } diff --git a/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj b/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj index 596e825f78..a6e99e0a05 100644 --- a/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj +++ b/extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj @@ -37,7 +37,7 @@ 84F30CD008FEAAA20087E26C /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Main.cpp; path = ../common/Main.cpp; sourceTree = SOURCE_ROOT; }; 84F30CEC08FEAD7A0087E26C /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = ""; }; 8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; - 8D0C4E970486CD37000505A6 /* juce_application.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = juce_application.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D0C4E970486CD37000505A6 /* juce_application.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = juce_application.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ diff --git a/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj b/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj index 5bba53ebee..829eccdd00 100644 --- a/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj +++ b/extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj @@ -32,7 +32,7 @@ 84EAE2F309DAAF0B00288D0A /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EAE2F109DAAF0B00288D0A /* AGL.framework */; }; 84EAE2F409DAAF0B00288D0A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EAE2F209DAAF0B00288D0A /* OpenGL.framework */; }; 84F8DB0B099CA8DD00E911ED /* QuickTimeDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F8DB0A099CA8DD00E911ED /* QuickTimeDemo.cpp */; }; - 84FDB0950C15BDDD00CD0087 /* libjuce.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB0940C15BDCE00CD0087 /* libjuce.a */; }; + 84FDB0950C15BDDD00CD0087 /* libjucedebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB0940C15BDCE00CD0087 /* libjucedebug.a */; }; 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; /* End PBXBuildFile section */ @@ -85,7 +85,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 84FDB0950C15BDDD00CD0087 /* libjuce.a in Frameworks */, + 84FDB0950C15BDDD00CD0087 /* libjucedebug.a in Frameworks */, 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, 84C49F2606C0F3200066071B /* CoreAudio.framework in Frameworks */, 84C4A41106C0F9A00066071B /* IOKit.framework in Frameworks */, @@ -181,7 +181,7 @@ 84FDB0900C15BDCE00CD0087 /* Products */ = { isa = PBXGroup; children = ( - 84FDB0940C15BDCE00CD0087 /* libjuce.a */, + 84FDB0940C15BDCE00CD0087 /* libjucedebug.a */, ); name = Products; sourceTree = ""; @@ -244,10 +244,10 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 84FDB0940C15BDCE00CD0087 /* libjuce.a */ = { + 84FDB0940C15BDCE00CD0087 /* libjucedebug.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = libjuce.a; + path = libjucedebug.a; remoteRef = 84FDB0930C15BDCE00CD0087 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; diff --git a/extras/juce demo/src/MainDemoWindow.cpp b/extras/juce demo/src/MainDemoWindow.cpp index 396e962f20..e87c898430 100644 --- a/extras/juce demo/src/MainDemoWindow.cpp +++ b/extras/juce demo/src/MainDemoWindow.cpp @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with JUCE; if not, visit www.gnu.org/licenses or write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------ diff --git a/juce_Config.h b/juce_Config.h index dc00e749e0..ed813d00bd 100644 --- a/juce_Config.h +++ b/juce_Config.h @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with JUCE; if not, visit www.gnu.org/licenses or write to the - Free Software Foundation, Inc., 59 Temple Place, Suite 330, + Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ------------------------------------------------------------------------------ @@ -38,7 +38,7 @@ */ //============================================================================= -/** The name of the namespace that all Juce classes and functions will be +/** The name of the namespace that all Juce classes and functions will be put inside. If this is not defined, no namespace will be used. */ #ifndef JUCE_NAMESPACE @@ -50,7 +50,7 @@ always use Logger::writeToLog() to write a message when an assertion happens. Enabling it will also leave this turned on in release builds. When it's disabled, - however, the jassert and jassertfalse macros will not be compiled in a + however, the jassert and jassertfalse macros will not be compiled in a release build. @see jassert, jassertfalse, Logger @@ -60,8 +60,8 @@ #endif //============================================================================= -/** Comment out this macro if you haven't got the Steinberg ASIO SDK, without - which the ASIOAudioIODevice class can't be built. See the comments in the +/** Comment out this macro if you haven't got the Steinberg ASIO SDK, without + which the ASIOAudioIODevice class can't be built. See the comments in the ASIOAudioIODevice class's header file for more info about this. (This only affects a Win32 build) @@ -77,12 +77,12 @@ #endif //============================================================================= -/** Comment out this macro if you don't want to enable QuickTime or if you don't - have QuickTime installed. If it's not enabled, the QuickTimeWindow class will +/** Comment out this macro if you don't want to enable QuickTime or if you don't + have QuickTime installed. If it's not enabled, the QuickTimeWindow class will be unavailable. On Windows, if you enable this, you'll need to make sure the Apple Quicktime.dll - file is found on your include path. By default the Quicktime installer will have + file is found on your include path. By default the Quicktime installer will have put this in the "/Program Files/QuickTime" folder. Only QuickTime version 7 or later is currently supported. */ @@ -91,8 +91,8 @@ #endif //============================================================================= -/** Comment out this macro if you don't want to enable OpenGL or if you don't - have the appropriate headers and libraries available. If it's not enabled, the +/** Comment out this macro if you don't want to enable OpenGL or if you don't + have the appropriate headers and libraries available. If it's not enabled, the OpenGLComponent class will be unavailable. */ #ifndef JUCE_OPENGL @@ -117,7 +117,7 @@ /** Enabling this macro means that all regions that get repainted will have a coloured line drawn around them. - This is handy if you're trying to optimise drawing, because it lets you easily see + This is handy if you're trying to optimise drawing, because it lets you easily see when anything is being repainted unnecessarily. */ #ifndef JUCE_ENABLE_REPAINT_DEBUGGING diff --git a/src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.h b/src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.h index 0bf1a75625..60d542e242 100644 --- a/src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.h +++ b/src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.h @@ -193,7 +193,7 @@ private: static int currentModifierFlags; friend class ComponentPeer; - static void updateCurrentModifiers(); + static void updateCurrentModifiers() throw(); }; diff --git a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp index b9eccc5e82..fe19cfd66a 100644 --- a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp +++ b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp @@ -64,7 +64,7 @@ static VoidArray heavyweightPeers (4); //============================================================================== ComponentPeer::ComponentPeer (Component* const component_, - const int styleFlags_) + const int styleFlags_) throw() : component (component_), styleFlags (styleFlags_), lastPaintTime (0), @@ -110,7 +110,7 @@ bool ComponentPeer::isValidPeer (const ComponentPeer* const peer) throw() return heavyweightPeers.contains (const_cast (peer)); } -void ComponentPeer::updateCurrentModifiers() +void ComponentPeer::updateCurrentModifiers() throw() { ModifierKeys::updateCurrentModifiers(); } @@ -538,7 +538,7 @@ void ComponentPeer::handleBroughtToFront() component->internalBroughtToFront(); } -void ComponentPeer::setConstrainer (ComponentBoundsConstrainer* newConstrainer) +void ComponentPeer::setConstrainer (ComponentBoundsConstrainer* const newConstrainer) throw() { constrainer = newConstrainer; } @@ -628,7 +628,7 @@ void ComponentPeer::handleFocusLoss() } } -Component* ComponentPeer::getLastFocusedSubcomponent() const +Component* ComponentPeer::getLastFocusedSubcomponent() const throw() { return (component->isParentOf (lastFocusedComponent) && lastFocusedComponent->isShowing()) ? lastFocusedComponent @@ -659,12 +659,12 @@ void ComponentPeer::handleUserClosingWindow() } //============================================================================== -void ComponentPeer::clearMaskedRegion() +void ComponentPeer::clearMaskedRegion() throw() { maskedRegion.clear(); } -void ComponentPeer::addMaskedRegion (int x, int y, int w, int h) +void ComponentPeer::addMaskedRegion (int x, int y, int w, int h) throw() { maskedRegion.add (x, y, w, h); } diff --git a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h index 7aae0e1780..98263ee1d0 100644 --- a/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h +++ b/src/juce_appframework/gui/components/windows/juce_ComponentPeer.h @@ -89,7 +89,7 @@ public: a combination of the values in the StyleFlags enum */ ComponentPeer (Component* const component, - const int styleFlags); + const int styleFlags) throw(); /** Destructor. */ virtual ~ComponentPeer(); @@ -182,7 +182,7 @@ public: The constrainer won't be deleted by this object, so the caller must manage its lifetime. */ - void setConstrainer (ComponentBoundsConstrainer* newConstrainer); + void setConstrainer (ComponentBoundsConstrainer* const newConstrainer) throw(); /** Returns the current constrainer, if one has been set. */ ComponentBoundsConstrainer* getConstrainer() const throw() { return constrainer; } @@ -250,7 +250,7 @@ public: /** Called when the window loses keyboard focus. */ void handleFocusLoss(); - Component* getLastFocusedSubcomponent() const; + Component* getLastFocusedSubcomponent() const throw(); /** Called when a key is pressed. @@ -304,7 +304,7 @@ public: @see addMaskedRegion */ - void clearMaskedRegion(); + void clearMaskedRegion() throw(); /** Adds a rectangle to the set of areas not to paint over. @@ -315,7 +315,7 @@ public: The masked region is cleared each time before a paint happens, so a component will have to make sure it calls this every time it's painted. */ - void addMaskedRegion (int x, int y, int w, int h); + void addMaskedRegion (int x, int y, int w, int h) throw(); //============================================================================== /** Returns the number of currently-active peers. @@ -347,7 +347,7 @@ protected: uint32 lastPaintTime; ComponentBoundsConstrainer* constrainer; - static void updateCurrentModifiers(); + static void updateCurrentModifiers() throw(); /** @internal */ void handleMessage (const Message& message);