]>
Commit | Line | Data |
---|---|---|
247d8c9a ŁK |
1 | iff -uNr gdlmm-3.2.1/gdl/gdlmm/docklayout.cc gdlmm-3.3.2/gdl/gdlmm/docklayout.cc |
2 | --- gdlmm-3.2.1/gdl/gdlmm/docklayout.cc 2011-10-17 22:02:12.000000000 +0200 | |
3 | +++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc 2011-11-23 18:47:10.000000000 +0100 | |
4 | @@ -165,11 +165,6 @@ | |
5 | return Glib::ListHandler<Glib::ustring>::list_to_vector(gdl_dock_layout_get_layouts(gobj(), static_cast<int>(include_default)), Glib::OWNERSHIP_SHALLOW); | |
6 | } | |
7 | ||
8 | -void DockLayout::run_manager() | |
9 | -{ | |
10 | -gdl_dock_layout_run_manager(gobj()); | |
11 | -} | |
12 | - | |
13 | bool DockLayout::load_from_file(const std::string& filename) | |
14 | { | |
15 | return gdl_dock_layout_load_from_file(gobj(), filename.c_str()); | |
16 | diff -uNr gdlmm-3.2.1/gdl/gdlmm/docklayout.h gdlmm-3.3.2/gdl/gdlmm/docklayout.h | |
17 | --- gdlmm-3.2.1/gdl/gdlmm/docklayout.h 2011-10-17 22:02:12.000000000 +0200 | |
18 | +++ gdlmm-3.3.2/gdl/gdlmm/docklayout.h 2011-11-23 18:47:10.000000000 +0100 | |
19 | @@ -114,9 +114,6 @@ | |
20 | std::vector<Glib::ustring> get_layouts(bool include_default); | |
21 | ||
22 | ||
23 | - void run_manager(); | |
24 | - | |
25 | - | |
26 | bool load_from_file(const std::string& filename); | |
27 | ||
28 | ||
29 | diff -uNr gdlmm-3.2.1/gdl/src/docklayout.hg gdlmm-3.3.2/gdl/src/docklayout.hg | |
30 | --- gdlmm-3.2.1/gdl/src/docklayout.hg 2011-10-17 22:01:29.000000000 +0200 | |
31 | +++ gdlmm-3.3.2/gdl/src/docklayout.hg 2011-11-23 18:40:16.000000000 +0100 | |
32 | @@ -52,8 +52,6 @@ | |
33 | #m4 _CONVERSION(`GList*',`std::vector<Glib::ustring>',`Glib::ListHandler<Glib::ustring>::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)') | |
34 | _WRAP_METHOD(std::vector<Glib::ustring> get_layouts(bool include_default), gdl_dock_layout_get_layouts) | |
35 | ||
36 | - _WRAP_METHOD(void run_manager(), gdl_dock_layout_run_manager) | |
37 | - | |
38 | _WRAP_METHOD(bool load_from_file(const std::string& filename), gdl_dock_layout_load_from_file) | |
39 | ||
40 | _WRAP_METHOD(bool save_to_file(const std::string& filename), gdl_dock_layout_save_to_file) | |
41 | diff -uNr gdlmm-3.2.1/gdl/src/gdl_method.defs gdlmm-3.3.2/gdl/src/gdl_method.defs | |
42 | --- gdlmm-3.2.1/gdl/src/gdl_method.defs 2011-10-17 22:01:29.000000000 +0200 | |
43 | +++ gdlmm-3.3.2/gdl/src/gdl_method.defs 2011-11-23 18:40:16.000000000 +0100 | |
44 | @@ -532,12 +532,6 @@ | |
45 | ) | |
46 | ) | |
47 | ||
48 | -(define-method run_manager | |
49 | - (of-object "GdlDockLayout") | |
50 | - (c-name "gdl_dock_layout_run_manager") | |
51 | - (return-type "none") | |
52 | -) | |
53 | - | |
54 | (define-method load_from_file | |
55 | (of-object "GdlDockLayout") | |
56 | (c-name "gdl_dock_layout_load_from_file") | |
57 | --- gdlmm-3.3.2/gdl/gdlmm/docklayout.cc.get_layouts_ui 2011-11-23 19:47:10.000000000 +0200 | |
58 | +++ gdlmm-3.3.2/gdl/gdlmm/docklayout.cc 2012-04-23 00:35:26.839494884 +0300 | |
59 | @@ -180,11 +180,6 @@ | |
60 | return gdl_dock_layout_is_dirty(const_cast<GdlDockLayout*>(gobj())); | |
61 | } | |
62 | ||
63 | -Gtk::Widget* DockLayout::get_layouts_ui() | |
64 | -{ | |
65 | - return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj())); | |
66 | -} | |
67 | - | |
68 | ||
69 | #ifdef GLIBMM_PROPERTIES_ENABLED | |
70 | Glib::PropertyProxy_ReadOnly<bool> DockLayout::property_dirty() const | |
71 | diff --git a/gdl/src/dock.hg b/gdl/src/dock.hg | |
72 | index 6637f05..0bbb262 100644 | |
73 | --- a/gdl/src/dock.hg | |
74 | +++ b/gdl/src/dock.hg | |
75 | @@ -56,7 +56,7 @@ public: | |
76 | ||
77 | //_WRAP_METHOD(void xor_rect(GdkRectangle *rect), gdl_dock_xor_rect) | |
78 | ||
79 | - _WRAP_METHOD(void xor_rect_hide(), gdl_dock_xor_rect_hide) | |
80 | + _WRAP_METHOD(void hide_preview(), gdl_dock_hide_preview) | |
81 | ||
82 | _WRAP_PROPERTY("default-title", Glib::ustring) | |
83 | ||
84 | diff --git a/gdl/src/docklayout.hg b/gdl/src/docklayout.hg | |
85 | index 155d58b..e45266e 100644 | |
86 | --- a/gdl/src/docklayout.hg | |
87 | +++ b/gdl/src/docklayout.hg | |
88 | @@ -58,9 +58,6 @@ public: | |
89 | ||
90 | _WRAP_METHOD(bool is_dirty() const, gdl_dock_layout_is_dirty) | |
91 | ||
92 | - _WRAP_METHOD(Gtk::Widget* get_layouts_ui(), gdl_dock_layout_get_layouts_ui) | |
93 | - | |
94 | - | |
95 | _WRAP_PROPERTY("dirty", bool) | |
96 | ||
97 | _WRAP_PROPERTY("master", Glib::RefPtr<DockMaster>) |