Mercurial > octave

annotate libinterp/corefcn/graphics-toolkit.cc @ 28345:c5f12165d294 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move stray base_graphics_toolkit function to graphics-toolkit.cc * graphics-toolkit.cc (base_graphics_toolkit::finalize): Move here from graphics.cc. This function should have been moved with other functions in changeset 41795b504a8b.
author John W. Eaton <jwe@octave.org>
date Thu, 21 May 2020 09:14:27 -0400
parents bd51beb6205e
children 43ad651cf5a0 0a5b15007766
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
3 // Copyright (C) 2007-2020 The Octave Project Developers
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
23774
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 #if defined (HAVE_CONFIG_H)
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 # include "config.h"
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #endif
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 #include "graphics.h"
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31 #include "gtk-manager.h"
27335
50216d7a2f6b eliminate static wrapper functions in gh_manager class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
32 #include "interpreter-private.h"
23774
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33
27734
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
34 namespace octave
23774
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 {
27734
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
36 void
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
37 base_graphics_toolkit::update (const graphics_handle& h, int id)
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
38 {
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
39 gh_manager& gh_mgr
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
40 = octave::__get_gh_manager__ ("base_graphics_toolkit::update");
27335
50216d7a2f6b eliminate static wrapper functions in gh_manager class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
41
27734
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
42 graphics_object go = gh_mgr.get_object (h);
23774
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43
27734
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
44 update (go, id);
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
45 }
27335
50216d7a2f6b eliminate static wrapper functions in gh_manager class
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
46
27734
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
47 bool
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
48 base_graphics_toolkit::initialize (const graphics_handle& h)
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
49 {
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
50 gh_manager& gh_mgr
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
51 = octave::__get_gh_manager__ ("base_graphics_toolkit::initialize");
23774
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52
27734
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
53 graphics_object go = gh_mgr.get_object (h);
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
54
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
55 return initialize (go);
a9780be9ecbc move graphics_toolkit class inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27335
diff changeset
56 }
28345
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
57
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
58 void
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
59 base_graphics_toolkit::finalize (const graphics_handle& h)
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
60 {
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
61 gh_manager& gh_mgr
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
62 = octave::__get_gh_manager__ ("base_graphics_toolkit::finalize");
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
63
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
64 graphics_object go = gh_mgr.get_object (h);
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
65
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
66 finalize (go);
c5f12165d294 move stray base_graphics_toolkit function to graphics-toolkit.cc
John W. Eaton <jwe@octave.org>
parents: 27923
diff changeset
67 }
23774
41795b504a8b don't use singleton for gtk_manager
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 }