Browse Source

Misc, this shouldn't be crashing...

gh-pages
falkTX 10 years ago
parent
commit
1b435c51a7
2 changed files with 8 additions and 3 deletions
  1. +5
    -1
      dgl/src/Window.cpp
  2. +3
    -2
      dgl/src/pugl/pugl_osx.m

+ 5
- 1
dgl/src/Window.cpp View File

@@ -194,7 +194,11 @@ struct Window::PrivateData {
mView = impl->glview;
mWindow = impl->window;
DISTRHO_SAFE_ASSERT(mView != nullptr);
DISTRHO_SAFE_ASSERT(fUsingEmbed || mWindow != nullptr);
if (fUsingEmbed) {
DISTRHO_SAFE_ASSERT(mWindow == nullptr);
} else {
DISTRHO_SAFE_ASSERT(mWindow != nullptr);
}
#elif defined(DISTRHO_OS_LINUX)
xDisplay = impl->display;
xWindow = impl->win;


+ 3
- 2
dgl/src/pugl/pugl_osx.m View File

@@ -377,8 +377,8 @@ puglCreateWindow(PuglView* view, const char* title)
//[impl->glview setBoundsSize:NSMakeSize(impl->glview->puglview->width, impl->glview->puglview->height)];

if (view->parent) {
NSView* pview = (NSView*)view->parent;
[pview addSubview:impl->glview];
//NSView* pview = (NSView*)view->parent;
//[pview addSubview:impl->glview];
return 0;
}

@@ -393,6 +393,7 @@ puglCreateWindow(PuglView* view, const char* title)
[window setTitle:titleString];
}

//[window setPuglview:nil];
[window setPuglview:view];
[window setContentView:impl->glview];
[window makeFirstResponder:impl->glview];


Loading…
Cancel
Save