diff --git a/modules/juce_core/containers/juce_Array.h b/modules/juce_core/containers/juce_Array.h index 710dcba83b..d7f1808f99 100644 --- a/modules/juce_core/containers/juce_Array.h +++ b/modules/juce_core/containers/juce_Array.h @@ -1025,9 +1025,11 @@ public: //============================================================================== + #ifndef DOXYGEN // Note that the swapWithArray method has been replaced by a more flexible templated version, // and renamed "swapWith" to be more consistent with the names used in other classes. JUCE_DEPRECATED_WITH_BODY (void swapWithArray (Array& other) noexcept, { swapWith (other); }) + #endif private: //============================================================================== diff --git a/modules/juce_core/containers/juce_HashMap.h b/modules/juce_core/containers/juce_HashMap.h index 2608ad5c3a..da737fd9ab 100644 --- a/modules/juce_core/containers/juce_HashMap.h +++ b/modules/juce_core/containers/juce_HashMap.h @@ -109,11 +109,10 @@ public: //============================================================================== /** Creates an empty hash-map. - The numberOfSlots parameter specifies the number of hash entries the map will - use. This will be the "upperLimit" parameter that is passed to your generateHash() - function. The number of hash slots will grow automatically if necessary, or - it can be remapped manually using remapTable(). - + @param numberOfSlots Specifies the number of hash entries the map will use. This will be + the "upperLimit" parameter that is passed to your generateHash() + function. The number of hash slots will grow automatically if necessary, + or it can be remapped manually using remapTable(). @param hashFunction An instance of HashFunctionType, which will be copied and stored to use with the HashMap. This parameter can be omitted if HashFunctionType has a default constructor. diff --git a/modules/juce_core/containers/juce_OwnedArray.h b/modules/juce_core/containers/juce_OwnedArray.h index b59e25d23d..7a70c95d79 100644 --- a/modules/juce_core/containers/juce_OwnedArray.h +++ b/modules/juce_core/containers/juce_OwnedArray.h @@ -875,9 +875,11 @@ public: //============================================================================== + #ifndef DOXYGEN // Note that the swapWithArray method has been replaced by a more flexible templated version, // and renamed "swapWith" to be more consistent with the names used in other classes. JUCE_DEPRECATED_WITH_BODY (void swapWithArray (OwnedArray& other) noexcept, { swapWith (other); }) + #endif private: //============================================================================== diff --git a/modules/juce_core/containers/juce_ReferenceCountedArray.h b/modules/juce_core/containers/juce_ReferenceCountedArray.h index 0e0e5cd4d4..c70320897e 100644 --- a/modules/juce_core/containers/juce_ReferenceCountedArray.h +++ b/modules/juce_core/containers/juce_ReferenceCountedArray.h @@ -858,9 +858,11 @@ public: //============================================================================== + #ifndef DOXYGEN // Note that the swapWithArray method has been replaced by a more flexible templated version, // and renamed "swapWith" to be more consistent with the names used in other classes. JUCE_DEPRECATED_WITH_BODY (void swapWithArray (ReferenceCountedArray& other) noexcept, { swapWith (other); }) + #endif private: //============================================================================== diff --git a/modules/juce_graphics/geometry/juce_Rectangle.h b/modules/juce_graphics/geometry/juce_Rectangle.h index 640a50cdfd..5541e3f5ea 100644 --- a/modules/juce_graphics/geometry/juce_Rectangle.h +++ b/modules/juce_graphics/geometry/juce_Rectangle.h @@ -827,8 +827,10 @@ public: parseIntAfterSpace (toks[3])); } + #ifndef DOXYGEN // This has been renamed by transformedBy, in order to match the method names used in the Point class. JUCE_DEPRECATED_WITH_BODY (Rectangle transformed (const AffineTransform& t) const noexcept, { return transformedBy (t); }) + #endif private: template friend class Rectangle; diff --git a/modules/juce_gui_basics/components/juce_Desktop.cpp b/modules/juce_gui_basics/components/juce_Desktop.cpp index 50e7af1b30..360cf13fd0 100644 --- a/modules/juce_gui_basics/components/juce_Desktop.cpp +++ b/modules/juce_gui_basics/components/juce_Desktop.cpp @@ -413,7 +413,7 @@ bool operator!= (const Desktop::Displays::Display& d1, const Desktop::Displays:: void Desktop::Displays::init (Desktop& desktop) { - findDisplays (desktop.masterScaleFactor); + findDisplays (desktop.getGlobalScaleFactor()); jassert (displays.size() > 0); } @@ -483,7 +483,6 @@ void Desktop::setGlobalScaleFactor (float newScaleFactor) noexcept if (masterScaleFactor != newScaleFactor) { masterScaleFactor = newScaleFactor; - displays->refresh(); } } diff --git a/modules/juce_gui_basics/components/juce_Desktop.h b/modules/juce_gui_basics/components/juce_Desktop.h index 8c56af5bbc..b1f3475773 100644 --- a/modules/juce_gui_basics/components/juce_Desktop.h +++ b/modules/juce_gui_basics/components/juce_Desktop.h @@ -403,14 +403,14 @@ private: friend class DeletedAtShutdown; friend class TopLevelWindowManager; - OwnedArray mouseSources; + OwnedArray mouseSources; bool addMouseInputSource(); - ListenerList mouseListeners; - ListenerList focusListeners; + ListenerList mouseListeners; + ListenerList focusListeners; - Array desktopComponents; - Array peers; + Array desktopComponents; + Array peers; ScopedPointer displays; @@ -436,7 +436,7 @@ private: void timerCallback() override; void resetTimer(); - ListenerList & getMouseListeners(); + ListenerList& getMouseListeners(); MouseInputSource* getOrCreateMouseInputSource (int touchIndex); void addDesktopComponent (Component*); diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h index aee00eabf7..2c2c5f9609 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.h @@ -247,7 +247,7 @@ public: @param isMouseOverButton whether the mouse is currently over the button (also true if it's held down) @param isButtonDown whether the mouse button's held down */ - virtual void drawScrollbarButton (Graphics&, + virtual void drawScrollbarButton (Graphics& g, ScrollBar& scrollbar, int width, int height, int buttonDirection, @@ -272,7 +272,7 @@ public: currently dragging the thumb @param isMouseDown whether the mouse is currently dragging the scrollbar */ - virtual void drawScrollbar (Graphics&, + virtual void drawScrollbar (Graphics& g, ScrollBar& scrollbar, int x, int y, int width, int height, diff --git a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp index ffd4de10b6..85a0ed5841 100644 --- a/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp +++ b/modules/juce_opengl/opengl/juce_OpenGLShaderProgram.cpp @@ -41,7 +41,9 @@ OpenGLShaderProgram::~OpenGLShaderProgram() noexcept double OpenGLShaderProgram::getLanguageVersion() { #if JUCE_OPENGL_ES - jassertfalse; // doesn't work in ES + // GLES doesn't support this version number, but that shouldn't matter since + // on GLES you probably won't need to check it. + jassertfalse; return 0; #else return String ((const char*) glGetString (GL_SHADING_LANGUAGE_VERSION)) @@ -66,6 +68,8 @@ bool OpenGLShaderProgram::addShader (const char* const code, GLenum type) errorLog = String (infoLog, (size_t) infoLogLength); #if JUCE_DEBUG + // Your GLSL code contained compile errors! + // Hopefully this compile log should help to explain what went wrong. DBG (errorLog); jassertfalse; #endif @@ -94,6 +98,8 @@ bool OpenGLShaderProgram::link() noexcept errorLog = String (infoLog, (size_t) infoLogLength); #if JUCE_DEBUG + // Your GLSL code contained link errors! + // Hopefully this compile log should help to explain what went wrong. DBG (errorLog); jassertfalse; #endif