fullscreen segv fix, popup for 4opts preview, renderfarm print fix, pan widget upgrad...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / cwindowgui.C

diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C
index 0d8b755a6cc18c9703ffd1c5423db97e92fdb835..a93964c4c54074764712679504bd529517fa8ab3 100644 (file)
--- a/cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/cinelerra-5.1/cinelerra/cwindowgui.C
@@ -480,7 +480,7 @@ int CWindowGUI::keypress_event()
                break;
        case 'f':
                unlock_window();
                break;
        case 'f':
                unlock_window();

-               if(mwindow->session->cwindow_fullscreen)
+               if( canvas->get_fullscreen() )

                        canvas->stop_fullscreen();
                else
                        canvas->start_fullscreen();
                        canvas->stop_fullscreen();
                else
                        canvas->start_fullscreen();


@@ -506,7 +506,7 @@ int CWindowGUI::keypress_event()
                break;
        case ESC:
                unlock_window();
                break;
        case ESC:
                unlock_window();

-               if(mwindow->session->cwindow_fullscreen)
+               if( canvas->get_fullscreen() )

                        canvas->stop_fullscreen();
                lock_window("CWindowGUI::keypress_event 4");
                result = 1;
                        canvas->stop_fullscreen();
                lock_window("CWindowGUI::keypress_event 4");
                result = 1;


@@ -1093,17 +1093,6 @@ void CWindowCanvas::status_event()
        gui->draw_status(1);
 }
 
        gui->draw_status(1);
 }
 

-int CWindowCanvas::get_fullscreen()
-{
-       return mwindow->session->cwindow_fullscreen;
-}
-
-void CWindowCanvas::set_fullscreen(int value)
-{
-       mwindow->session->cwindow_fullscreen = value;
-}
-
-

 void CWindowCanvas::update_zoom(int x, int y, float zoom)
 {
        use_scrollbars = mwindow->edl->session->cwindow_scrollbars;
 void CWindowCanvas::update_zoom(int x, int y, float zoom)
 {
        use_scrollbars = mwindow->edl->session->cwindow_scrollbars;