[CinCV TNG] [PATCH v2] New global pointers mwindow_global and theme_global

Johannes Sixt j6t at kdbg.org
Mon Jul 10 18:25:26 CEST 2017


Am 09.07.2017 um 17:34 schrieb Einar R√ľnkaru:
> They point to MWindow and Theme object respectively.
> MWindow contains all the current state of cinelerra
> and pointers to other objects.
> Every object creating/using gui may need data from theme.
> 
> ---
> v2 difference: external declarations are added to respective headers as 
> Hannes proposed.

That's good now, thank you. There's still one glitch, though:

> diff --git a/cinelerra/mwindow.C b/cinelerra/mwindow.C
> index 0c7e3eb..6e380e7 100644
> --- a/cinelerra/mwindow.C
> +++ b/cinelerra/mwindow.C
> @@ -112,6 +112,7 @@
>   #include <string.h>
>   #include <inttypes.h>
>   
> +extern Theme *theme_global;

You shouldn't need this one.

>   
>   extern "C"
>   {
> @@ -712,6 +713,7 @@ void MWindow::init_theme()
>   	init_menus();
>   
>   	theme->check_used();
> +	theme_global = theme;
>   }
>   
>   void MWindow::init_3d()


More information about the Cinelerra mailing list