haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxQt-specific ifdefs.

This commit is contained in:
Alex Shvartzkop 2024-06-01 04:17:41 +03:00
parent 84091b163e
commit d502470e74
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/dialog_shim.cpp
View File

@ -511,10 +511,11 @@ int DIALOG_SHIM::ShowQuasiModal()
wxWindow* parent = GetParentForModalDialog( GetParent(), GetWindowStyle() ); wxWindow* parent = GetParentForModalDialog( GetParent(), GetWindowStyle() );
wxASSERT_MSG( !m_qmodal_parent_disabler, wxT( "Caller using ShowQuasiModal() twice on same " wxASSERT_MSG( !m_qmodal_parent_disabler, wxT( "Caller using ShowQuasiModal() twice on same "
"window?" ) ); "window?" ) );
#ifndef __WXQT__
// quasi-modal: disable only my "optimal" parent // quasi-modal: disable only my "optimal" parent
m_qmodal_parent_disabler = new WDO_ENABLE_DISABLE( parent ); m_qmodal_parent_disabler = new WDO_ENABLE_DISABLE( parent );
#endif
// Apple in its infinite wisdom will raise a disabled window before even passing // 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 // us the event, so we have no way to stop it. Instead, we must set an order on

2
include/gal/opengl/gl_utils.h
View File

@ -109,7 +109,7 @@ public:
} }
} }
#elif defined( _WIN32 ) #elif defined( _WIN32 ) and not defined( __WXQT__ )
const GLubyte* vendor = glGetString( GL_VENDOR ); const GLubyte* vendor = glGetString( GL_VENDOR );
//const GLubyte* renderer = glGetString( GL_RENDERER ); //const GLubyte* renderer = glGetString( GL_RENDERER );