Browse Source

Update DGL

tags/v2.1-alpha1-winvst
falkTX 7 years ago
parent
commit
eae5b55426
2 changed files with 5 additions and 3 deletions
  1. +3
    -1
      source/modules/dgl/src/Window.cpp
  2. +2
    -2
      source/modules/dgl/src/pugl/pugl_win.cpp

+ 3
- 1
source/modules/dgl/src/Window.cpp View File

@@ -396,7 +396,6 @@ struct Window::PrivateData {
#elif defined(DISTRHO_OS_MAC) #elif defined(DISTRHO_OS_MAC)
if (mWindow != nullptr) if (mWindow != nullptr)
[mWindow makeKeyWindow]; [mWindow makeKeyWindow];
[NSApp activateIgnoringOtherApps:YES];
#else #else
XRaiseWindow(xDisplay, xWindow); XRaiseWindow(xDisplay, xWindow);
XSetInputFocus(xDisplay, xWindow, RevertToPointerRoot, CurrentTime); XSetInputFocus(xDisplay, xWindow, RevertToPointerRoot, CurrentTime);
@@ -1202,6 +1201,9 @@ bool Window::openFileBrowser(const FileBrowserOptions& options)
# else # else
// not implemented // not implemented
return false; return false;

// unused
(void)options;
# endif # endif
} }
#endif #endif


+ 2
- 2
source/modules/dgl/src/pugl/pugl_win.cpp View File

@@ -418,7 +418,7 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
} }


void void
puglGrabFocus(PuglView*)
puglGrabFocus(PuglView* /*view*/)
{ {
// TODO // TODO
} }
@@ -474,7 +474,7 @@ puglGetNativeWindow(PuglView* view)
} }


void* void*
puglGetContext(PuglView*)
puglGetContext(PuglView* /*view*/)
{ {
#ifdef PUGL_HAVE_CAIRO #ifdef PUGL_HAVE_CAIRO
if (view->ctx_type == PUGL_CAIRO) { if (view->ctx_type == PUGL_CAIRO) {


Loading…
Cancel
Save