Diff of /src/hugin1/hugin/GLViewer.cpp [8d6de6] .. [dd7a6b]  Maximize  Restore

Switch to unified view

a/src/hugin1/hugin/GLViewer.cpp b/src/hugin1/hugin/GLViewer.cpp
...
...
204
            int args[], 
204
            int args[], 
205
            GLPreviewFrame *frame_in,
205
            GLPreviewFrame *frame_in,
206
            wxGLContext * shared_context
206
            wxGLContext * shared_context
207
            ) :
207
            ) :
208
#if defined __WXGTK__ || wxCHECK_VERSION(2,9,0)
208
#if defined __WXGTK__ || wxCHECK_VERSION(2,9,0)
209
          wxGLCanvas(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize,
209
          wxGLCanvas(parent, wxID_ANY, args, wxDefaultPosition, wxDefaultSize,
210
                     0, wxT("GLPreviewCanvas"), args, wxNullPalette)
210
                     0, wxT("GLPreviewCanvas"), wxNullPalette)
211
#else
211
#else
212
          wxGLCanvas(parent,shared_context,wxID_ANY,wxDefaultPosition,
212
          wxGLCanvas(parent,shared_context,wxID_ANY,wxDefaultPosition,
213
                     wxDefaultSize,0,wxT("GLPreviewCanvas"),args,wxNullPalette)
213
                     wxDefaultSize,0,wxT("GLPreviewCanvas"),args,wxNullPalette)
214
#endif
214
#endif
215
{
215
{
...
...
445
445
446
    DEBUG_DEBUG("RESIZED_OUT");
446
    DEBUG_DEBUG("RESIZED_OUT");
447
   
447
   
448
    if (frame->CanResize()) {
448
    if (frame->CanResize()) {
449
        DEBUG_DEBUG("RESIZED_IN");
449
        DEBUG_DEBUG("RESIZED_IN");
450
#if !wxCHECK_VERSION(3,0,1)
450
        wxGLCanvas::OnSize(e);
451
        wxGLCanvas::OnSize(e);
452
#endif
451
        if(!IsShown()) return;
453
        if(!IsShown()) return;
452
        // if we have a render at this point, tell it the new size.
454
        // if we have a render at this point, tell it the new size.
453
        DEBUG_DEBUG("RESIZED_IN_SHOWN");
455
        DEBUG_DEBUG("RESIZED_IN_SHOWN");
454
        if (m_renderer)
456
        if (m_renderer)
455
        {
457
        {