wxQt-specific ifdefs.

common/dialog_shim.cpp

@@ -512,9 +512,10 @@ int DIALOG_SHIM::ShowQuasiModal()
 
     wxASSERT_MSG( !m_qmodal_parent_disabler, wxT( "Caller using ShowQuasiModal() twice on same "
                                                   "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

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