From d502470e743ee5288e29e98c824014dc2bb7ecaf Mon Sep 17 00:00:00 2001 From: Alex Shvartzkop Date: Sat, 1 Jun 2024 04:17:41 +0300 Subject: [PATCH] wxQt-specific ifdefs. --- common/dialog_shim.cpp | 5 +++-- include/gal/opengl/gl_utils.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/dialog_shim.cpp b/common/dialog_shim.cpp index d45f1e4844..50f4178b5a 100644 --- a/common/dialog_shim.cpp +++ b/common/dialog_shim.cpp @@ -511,10 +511,11 @@ int DIALOG_SHIM::ShowQuasiModal() wxWindow* parent = GetParentForModalDialog( GetParent(), GetWindowStyle() ); wxASSERT_MSG( !m_qmodal_parent_disabler, wxT( "Caller using ShowQuasiModal() twice on same " - "window?" ) ); - + "window?" ) ); +#ifndef __WXQT__ // quasi-modal: disable only my "optimal" parent m_qmodal_parent_disabler = new WDO_ENABLE_DISABLE( parent ); +#endif // Apple in its infinite wisdom will raise a disabled window before even passing // us the event, so we have no way to stop it. Instead, we must set an order on diff --git a/include/gal/opengl/gl_utils.h b/include/gal/opengl/gl_utils.h index 2d1f3f675c..4d2153e566 100644 --- a/include/gal/opengl/gl_utils.h +++ b/include/gal/opengl/gl_utils.h @@ -109,7 +109,7 @@ public: } } -#elif defined( _WIN32 ) +#elif defined( _WIN32 ) and not defined( __WXQT__ ) const GLubyte* vendor = glGetString( GL_VENDOR ); //const GLubyte* renderer = glGetString( GL_RENDERER );