diff --git a/dox/dev_guides/upgrade/upgrade.md b/dox/dev_guides/upgrade/upgrade.md index 0193b1fcae..35df92f756 100644 --- a/dox/dev_guides/upgrade/upgrade.md +++ b/dox/dev_guides/upgrade/upgrade.md @@ -1881,6 +1881,10 @@ This change affects following parts: * Method *Image_PixMap::PixelColor()* has been extended with a new Boolean flag for performing linearization of non-linear sRGB. This flag is FALSE by default; application should consider passing TRUE instead for further handling *Quantity_Color* properly as linear RGB values. +@subsection upgrade_750_aspectwindow Aspect_Window interface change + +Unexpected const-ness of Aspect_Window::DoResize() method has been removed, so that application classes implementing this interface should be updated accordingly. + @subsection upgrade_750_rename Renaming of types Enumeration BRepOffset_Type is renamed to ChFiDS_TypeOfConcavity. diff --git a/samples/glfw/GlfwOcctWindow.cpp b/samples/glfw/GlfwOcctWindow.cpp index 20a3d485a5..8cd9f6fe4b 100644 --- a/samples/glfw/GlfwOcctWindow.cpp +++ b/samples/glfw/GlfwOcctWindow.cpp @@ -134,17 +134,17 @@ void GlfwOcctWindow::Unmap() const // Function : DoResize // Purpose : // ================================================================ -Aspect_TypeOfResize GlfwOcctWindow::DoResize() const +Aspect_TypeOfResize GlfwOcctWindow::DoResize() { if (glfwGetWindowAttrib (myGlfwWindow, GLFW_VISIBLE) == 1) { int anXPos = 0, anYPos = 0, aWidth = 0, aHeight = 0; glfwGetWindowPos (myGlfwWindow, &anXPos, &anYPos); glfwGetWindowSize(myGlfwWindow, &aWidth, &aHeight); - *const_cast(&myXLeft ) = anXPos; - *const_cast(&myXRight ) = anXPos + aWidth; - *const_cast(&myYTop ) = anYPos; - *const_cast(&myYBottom) = anYPos + aHeight; + myXLeft = anXPos; + myXRight = anXPos + aWidth; + myYTop = anYPos; + myYBottom = anYPos + aHeight; } return Aspect_TOR_UNKNOWN; } diff --git a/samples/glfw/GlfwOcctWindow.h b/samples/glfw/GlfwOcctWindow.h index 9d61dac153..b7f1a620c0 100644 --- a/samples/glfw/GlfwOcctWindow.h +++ b/samples/glfw/GlfwOcctWindow.h @@ -65,7 +65,7 @@ public: virtual Aspect_Drawable NativeParentHandle() const Standard_OVERRIDE { return 0; } //! Applies the resizing to the window - virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE; + virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE; //! Returns True if the window is opened and False if the window is closed. virtual Standard_Boolean IsMapped() const Standard_OVERRIDE; diff --git a/samples/java/jniviewer/jni/OcctJni_Window.hxx b/samples/java/jniviewer/jni/OcctJni_Window.hxx index 10ec7f01a9..d6b731ba69 100644 --- a/samples/java/jniviewer/jni/OcctJni_Window.hxx +++ b/samples/java/jniviewer/jni/OcctJni_Window.hxx @@ -44,7 +44,7 @@ public: virtual void Unmap() const Standard_OVERRIDE {} //! Applies the resizing to the window - virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; } + virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; } //! Apply the mapping change to the window virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; } diff --git a/samples/qt/AndroidQt/src/AndroidQt_Window.h b/samples/qt/AndroidQt/src/AndroidQt_Window.h index f0a0c0ec63..b465c32778 100644 --- a/samples/qt/AndroidQt/src/AndroidQt_Window.h +++ b/samples/qt/AndroidQt/src/AndroidQt_Window.h @@ -44,7 +44,7 @@ public: virtual void Unmap() const {} //! Applies the resizing to the window - virtual Aspect_TypeOfResize DoResize() const { return Aspect_TOR_UNKNOWN; } + virtual Aspect_TypeOfResize DoResize() { return Aspect_TOR_UNKNOWN; } //! Apply the mapping change to the window virtual Standard_Boolean DoMapping() const { return Standard_True; } diff --git a/samples/qt/Common/src/OcctWindow.cxx b/samples/qt/Common/src/OcctWindow.cxx index 423401a27d..767b15f230 100644 --- a/samples/qt/Common/src/OcctWindow.cxx +++ b/samples/qt/Common/src/OcctWindow.cxx @@ -81,7 +81,7 @@ void OcctWindow::Unmap() const // function : DoResize // purpose : // ======================================================================= -Aspect_TypeOfResize OcctWindow::DoResize() const +Aspect_TypeOfResize OcctWindow::DoResize() { int aMask = 0; Aspect_TypeOfResize aMode = Aspect_TOR_UNKNOWN; @@ -126,10 +126,10 @@ Aspect_TypeOfResize OcctWindow::DoResize() const break; } // end switch - *( ( Standard_Integer* )&myXLeft ) = myWidget->rect().left(); - *( ( Standard_Integer* )&myXRight ) = myWidget->rect().right(); - *( ( Standard_Integer* )&myYTop ) = myWidget->rect().top(); - *( ( Standard_Integer* )&myYBottom) = myWidget->rect().bottom(); + myXLeft = myWidget->rect().left(); + myXRight = myWidget->rect().right(); + myYTop = myWidget->rect().top(); + myYBottom = myWidget->rect().bottom(); } return aMode; diff --git a/samples/qt/Common/src/OcctWindow.h b/samples/qt/Common/src/OcctWindow.h index 34ad07774e..2943dc4131 100644 --- a/samples/qt/Common/src/OcctWindow.h +++ b/samples/qt/Common/src/OcctWindow.h @@ -51,7 +51,7 @@ public: virtual Aspect_Drawable NativeParentHandle() const; //! Applies the resizing to the window - virtual Aspect_TypeOfResize DoResize() const; + virtual Aspect_TypeOfResize DoResize(); //! Returns True if the window is opened //! and False if the window is closed. diff --git a/src/Aspect/Aspect_NeutralWindow.hxx b/src/Aspect/Aspect_NeutralWindow.hxx index e54f70ffd6..9dc568e20a 100644 --- a/src/Aspect/Aspect_NeutralWindow.hxx +++ b/src/Aspect/Aspect_NeutralWindow.hxx @@ -59,7 +59,7 @@ public: virtual void Unmap() const Standard_OVERRIDE { myIsMapped = Standard_False; } //! Resize window - do nothing. - virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; } + virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE { return Aspect_TOR_UNKNOWN; } //! Map window - do nothing. virtual Standard_Boolean DoMapping() const Standard_OVERRIDE { return Standard_True; } diff --git a/src/Aspect/Aspect_Window.hxx b/src/Aspect/Aspect_Window.hxx index 5e5289bf46..0fc634cba4 100644 --- a/src/Aspect/Aspect_Window.hxx +++ b/src/Aspect/Aspect_Window.hxx @@ -58,7 +58,7 @@ public: Standard_EXPORT virtual void Unmap() const = 0; //! Apply the resizing to the window . - Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const = 0; + Standard_EXPORT virtual Aspect_TypeOfResize DoResize() = 0; //! Apply the mapping change to the window . //! and returns TRUE if the window is mapped at screen. diff --git a/src/Cocoa/Cocoa_Window.hxx b/src/Cocoa/Cocoa_Window.hxx index 694d84d0bf..f0e8387e20 100644 --- a/src/Cocoa/Cocoa_Window.hxx +++ b/src/Cocoa/Cocoa_Window.hxx @@ -91,7 +91,7 @@ public: Standard_EXPORT virtual void Unmap() const Standard_OVERRIDE; //! Applies the resizing to the window - Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE; + Standard_EXPORT virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE; //! Apply the mapping change to the window Standard_EXPORT virtual Standard_Boolean DoMapping() const Standard_OVERRIDE; diff --git a/src/Cocoa/Cocoa_Window.mm b/src/Cocoa/Cocoa_Window.mm index 63daaa8af4..1f864cf587 100644 --- a/src/Cocoa/Cocoa_Window.mm +++ b/src/Cocoa/Cocoa_Window.mm @@ -293,7 +293,7 @@ void Cocoa_Window::Unmap() const // function : DoResize // purpose : // ======================================================================= -Aspect_TypeOfResize Cocoa_Window::DoResize() const +Aspect_TypeOfResize Cocoa_Window::DoResize() { if (myHView == NULL) { @@ -326,10 +326,10 @@ Aspect_TypeOfResize Cocoa_Window::DoResize() const default: break; } - *((Standard_Integer* )&myXLeft ) = (Standard_Integer )aBounds.origin.x; - *((Standard_Integer* )&myXRight ) = (Standard_Integer )(aBounds.origin.x + aBounds.size.width); - *((Standard_Integer* )&myYTop ) = (Standard_Integer )aBounds.origin.y; - *((Standard_Integer* )&myYBottom ) = (Standard_Integer )(aBounds.origin.y + aBounds.size.height); + myXLeft = (Standard_Integer )aBounds.origin.x; + myXRight = (Standard_Integer )(aBounds.origin.x + aBounds.size.width); + myYTop = (Standard_Integer )aBounds.origin.y; + myYBottom = (Standard_Integer )(aBounds.origin.y + aBounds.size.height); return aMode; } diff --git a/src/WNT/WNT_Window.cxx b/src/WNT/WNT_Window.cxx index 992204303d..6051a4cecf 100644 --- a/src/WNT/WNT_Window.cxx +++ b/src/WNT/WNT_Window.cxx @@ -205,7 +205,7 @@ void WNT_Window::Unmap() const // function : DoResize // purpose : // ======================================================================= -Aspect_TypeOfResize WNT_Window::DoResize() const +Aspect_TypeOfResize WNT_Window::DoResize() { if (IsVirtual()) { @@ -259,10 +259,10 @@ Aspect_TypeOfResize WNT_Window::DoResize() const break; } // end switch - *((Standard_Integer* )&aXLeft ) = wp.rcNormalPosition.left; - *((Standard_Integer* )&aXRight ) = wp.rcNormalPosition.right; - *((Standard_Integer* )&aYTop ) = wp.rcNormalPosition.top; - *((Standard_Integer* )&aYBottom) = wp.rcNormalPosition.bottom; + aXLeft = wp.rcNormalPosition.left; + aXRight = wp.rcNormalPosition.right; + aYTop = wp.rcNormalPosition.top; + aYBottom = wp.rcNormalPosition.bottom; } return mode; diff --git a/src/WNT/WNT_Window.hxx b/src/WNT/WNT_Window.hxx index cbd6a8f8de..4a60acb011 100644 --- a/src/WNT/WNT_Window.hxx +++ b/src/WNT/WNT_Window.hxx @@ -83,7 +83,7 @@ public: Standard_EXPORT virtual void Unmap() const Standard_OVERRIDE; //! Applies the resizing to the window . - Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE; + Standard_EXPORT virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE; //! Apply the mapping change to the window //! and returns TRUE if the window is mapped at screen. diff --git a/src/Xw/Xw_Window.cxx b/src/Xw/Xw_Window.cxx index 3622de9769..37d7ed690e 100644 --- a/src/Xw/Xw_Window.cxx +++ b/src/Xw/Xw_Window.cxx @@ -389,7 +389,7 @@ void Xw_Window::Unmap() const // function : DoResize // purpose : // ======================================================================= -Aspect_TypeOfResize Xw_Window::DoResize() const +Aspect_TypeOfResize Xw_Window::DoResize() { if (myXWindow == 0) { @@ -425,10 +425,10 @@ Aspect_TypeOfResize Xw_Window::DoResize() const default: break; } - *((Standard_Integer* )&myXLeft ) = aWinAttr.x; - *((Standard_Integer* )&myXRight ) = aWinAttr.x + aWinAttr.width; - *((Standard_Integer* )&myYTop ) = aWinAttr.y; - *((Standard_Integer* )&myYBottom ) = aWinAttr.y + aWinAttr.height; + myXLeft = aWinAttr.x; + myXRight = aWinAttr.x + aWinAttr.width; + myYTop = aWinAttr.y; + myYBottom = aWinAttr.y + aWinAttr.height; return aMode; } diff --git a/src/Xw/Xw_Window.hxx b/src/Xw/Xw_Window.hxx index 5356f07506..a9d806e972 100644 --- a/src/Xw/Xw_Window.hxx +++ b/src/Xw/Xw_Window.hxx @@ -71,7 +71,7 @@ public: Standard_EXPORT virtual void Unmap() const Standard_OVERRIDE; //! Applies the resizing to the window - Standard_EXPORT virtual Aspect_TypeOfResize DoResize() const Standard_OVERRIDE; + Standard_EXPORT virtual Aspect_TypeOfResize DoResize() Standard_OVERRIDE; //! Apply the mapping change to the window Standard_EXPORT virtual Standard_Boolean DoMapping() const Standard_OVERRIDE;