Browse Source

tags/2021-05-28
jules 18 years ago
parent
commit
7d0cf66fad
10 changed files with 34 additions and 34 deletions
  1. +1
    -1
      build/linux/platform_specific_code/juce_linux_Windowing.cpp
  2. +1
    -1
      build/macosx/platform_specific_code/juce_mac_Windowing.cpp
  3. +1
    -1
      build/win32/platform_specific_code/juce_win32_Windowing.cpp
  4. +1
    -1
      extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj
  5. +5
    -5
      extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj
  6. +1
    -1
      extras/juce demo/src/MainDemoWindow.cpp
  7. +11
    -11
      juce_Config.h
  8. +1
    -1
      src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.h
  9. +6
    -6
      src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp
  10. +6
    -6
      src/juce_appframework/gui/components/windows/juce_ComponentPeer.h

+ 1
- 1
build/linux/platform_specific_code/juce_linux_Windowing.cpp View File

@@ -306,7 +306,7 @@ static void getModifierMapping() throw()
static int currentModifiers = 0;
void ModifierKeys::updateCurrentModifiers()
void ModifierKeys::updateCurrentModifiers() throw()
{
currentModifierFlags = currentModifiers;
}


+ 1
- 1
build/macosx/platform_specific_code/juce_mac_Windowing.cpp View File

@@ -142,7 +142,7 @@ static void updateModifiers (EventRef theEvent)
currentModifiers |= ModifierKeys::commandModifier;
}

void ModifierKeys::updateCurrentModifiers()
void ModifierKeys::updateCurrentModifiers() throw()
{
currentModifierFlags = currentModifiers;
}


+ 1
- 1
build/win32/platform_specific_code/juce_win32_Windowing.cpp View File

@@ -442,7 +442,7 @@ static void updateKeyModifiers() throw()
currentModifiers |= ModifierKeys::altModifier;
}
void ModifierKeys::updateCurrentModifiers()
void ModifierKeys::updateCurrentModifiers() throw()
{
currentModifierFlags = currentModifiers;
}


+ 1
- 1
extras/example projects/example_project_for_Mac/juce_application.xcodeproj/project.pbxproj View File

@@ -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 = "<absolute>"; };
8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
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 */


+ 5
- 5
extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj View File

@@ -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 = "<group>";
@@ -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;
};


+ 1
- 1
extras/juce demo/src/MainDemoWindow.cpp View File

@@ -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
------------------------------------------------------------------------------


+ 11
- 11
juce_Config.h View File

@@ -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


+ 1
- 1
src/juce_appframework/gui/components/keyboard/juce_ModifierKeys.h View File

@@ -193,7 +193,7 @@ private:
static int currentModifierFlags;
friend class ComponentPeer;
static void updateCurrentModifiers();
static void updateCurrentModifiers() throw();
};


+ 6
- 6
src/juce_appframework/gui/components/windows/juce_ComponentPeer.cpp View File

@@ -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 <ComponentPeer*> (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);
}


+ 6
- 6
src/juce_appframework/gui/components/windows/juce_ComponentPeer.h View File

@@ -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);


Loading…
Cancel
Save