作図ソフト dia の改良版
修訂 | 428fc8b549a7b751cf0482652ef0b83e17dcc793 (tree) |
---|---|
時間 | 2004-03-20 19:25:07 |
作者 | Lars Clausen <lclausen@src....> |
Commiter | Lars Clausen |
Version 0.93-pre1
@@ -1,3 +1,17 @@ | ||
1 | +2004-03-19 Lars Clausen <lars@raeder.dk> | |
2 | + | |
3 | + * xmldocs.make: Fixed apparent uninstall error. | |
4 | + | |
5 | + * config.h.win32: | |
6 | + * doc/en/dia-manual.xml: | |
7 | + * doc/pl/dia-manual.xml: | |
8 | + * dia.spec: | |
9 | + * configure.in: | |
10 | + * NEWS: Version 0.93-pre1. | |
11 | + | |
12 | + * lib/dialinechooser.[ch]: Patch from pborelli@katamail.com (paolo | |
13 | + borelli): Remove some deprecated stuff. | |
14 | + | |
1 | 15 | 2004-03-18 Lars Clausen <lars@raeder.dk> |
2 | 16 | |
3 | 17 | * Makefile.am: Try better uninstall thing for scrollkeeper. |
@@ -15,7 +15,7 @@ | ||
15 | 15 | #define GETTEXT_PACKAGE "dia" |
16 | 16 | #define LOCALEDIR "../lib/locale" |
17 | 17 | |
18 | -#define VERSION "0.92.2+cvs" | |
18 | +#define VERSION "0.93-pre1" | |
19 | 19 | |
20 | 20 | /* |
21 | 21 | * We are linking libxml as DLL with either msvc or mingw, but this |
@@ -1,6 +1,6 @@ | ||
1 | 1 | dnl Process this -*- autoconf -*- file with autoconf to produce a |
2 | 2 | dnl configure script. |
3 | -AC_INIT(dia, 0.92.2+cvs, http://bugzilla.gnome.org/enter_bug.cgi?product=dia) | |
3 | +AC_INIT(dia, 0.93-pre1, http://bugzilla.gnome.org/enter_bug.cgi?product=dia) | |
4 | 4 | AC_CONFIG_SRCDIR(app/diagram.c) |
5 | 5 | AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION) |
6 | 6 |
@@ -1,12 +1,12 @@ | ||
1 | 1 | %define name dia |
2 | 2 | # This is the full Dia version |
3 | -%define ver 0.92.2 | |
3 | +%define ver 0.93 | |
4 | 4 | |
5 | 5 | Summary: A gtk+ based diagram creation program. |
6 | 6 | Name: %name |
7 | 7 | Version: %ver |
8 | 8 | # This indicates changes to the spec file after last time %ver has changed. |
9 | -Release: 1 | |
9 | +Release: pre1 | |
10 | 10 | Copyright: GPL |
11 | 11 | Group: Applications/ |
12 | 12 | Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{ver}.tar.gz |
@@ -7,6 +7,12 @@ entities= | ||
7 | 7 | include $(top_srcdir)/xmldocs.make |
8 | 8 | dist-hook: app-dist-hook |
9 | 9 | |
10 | -EXTRA_DIST = dia.1 dia-manual.xml | |
10 | +EXTRA_DIST += \ | |
11 | + dia.1 \ | |
12 | + dia-manual.xml \ | |
13 | + graphics/line_props.png \ | |
14 | + graphics/home_network.png \ | |
15 | + graphics/line_icon.png \ | |
16 | + graphics/greendots.png | |
11 | 17 | |
12 | 18 | man_MANS = dia.1 |
@@ -8,7 +8,7 @@ | ||
8 | 8 | |
9 | 9 | [ |
10 | 10 | |
11 | - <!ENTITY VERSION "0.92.2"> | |
11 | + <!ENTITY VERSION "0.93-pre1"> | |
12 | 12 | |
13 | 13 | <!ENTITY INTRODUCTION SYSTEM "intro.xml"> |
14 | 14 |
@@ -7,4 +7,8 @@ entities= | ||
7 | 7 | include $(top_srcdir)/xmldocs.make |
8 | 8 | dist-hook: app-dist-hook |
9 | 9 | |
10 | -EXTRA_DIST = dia-manual.xml | |
10 | +EXTRA_DIST += \ | |
11 | + dia-manual.xml \ | |
12 | + graphics/line_props.png \ | |
13 | + graphics/home_network.png \ | |
14 | + graphics/greendots.png |
@@ -23,8 +23,6 @@ | ||
23 | 23 | #include <config.h> |
24 | 24 | #endif |
25 | 25 | |
26 | -#undef GTK_DISABLE_DEPRECATED /* GtkTypeInfo, gtk_widget_queue_clear, ... */ | |
27 | - | |
28 | 26 | #include "intl.h" |
29 | 27 | #include "widgets.h" |
30 | 28 | #include "dialinechooser.h" |
@@ -32,16 +30,9 @@ | ||
32 | 30 | static const char *button_menu_key = "dia-button-menu"; |
33 | 31 | static const char *menuitem_enum_key = "dia-menuitem-value"; |
34 | 32 | |
35 | -static gint close_and_hide(GtkWidget *wid, GdkEventAny *event) | |
36 | -{ | |
37 | - gtk_widget_hide(wid); | |
38 | - return TRUE; | |
39 | -} | |
40 | - | |
41 | 33 | |
42 | 34 | /* --------------- DiaLinePreview -------------------------------- */ |
43 | 35 | |
44 | -static GtkType dia_line_preview_get_type (void); | |
45 | 36 | static void dia_line_preview_set(DiaLinePreview *line, LineStyle lstyle); |
46 | 37 | |
47 | 38 | static void dia_line_preview_class_init (DiaLinePreviewClass *klass); |
@@ -49,25 +40,28 @@ static void dia_line_preview_init (DiaLinePreview *arrow); | ||
49 | 40 | static gint dia_line_preview_expose (GtkWidget *widget, |
50 | 41 | GdkEventExpose *event); |
51 | 42 | |
52 | -static GtkType | |
43 | +GType | |
53 | 44 | dia_line_preview_get_type (void) |
54 | 45 | { |
55 | - static GtkType line_type = 0; | |
56 | - | |
57 | - if (!line_type) { | |
58 | - static const GtkTypeInfo line_info = { | |
59 | - "DiaLinePreview", | |
60 | - sizeof (DiaLinePreview), | |
61 | - sizeof (DiaLinePreviewClass), | |
62 | - (GtkClassInitFunc) dia_line_preview_class_init, | |
63 | - (GtkObjectInitFunc) dia_line_preview_init, | |
64 | - /* reserved_1 */ NULL, | |
65 | - /* reserved_2 */ NULL, | |
66 | - (GtkClassInitFunc) NULL, | |
67 | - }; | |
68 | - line_type = gtk_type_unique (GTK_TYPE_MISC, &line_info); | |
69 | - } | |
70 | - return line_type; | |
46 | + static GType type = 0; | |
47 | + | |
48 | + if (!type) { | |
49 | + static const GTypeInfo info = { | |
50 | + sizeof (DiaLinePreviewClass), | |
51 | + (GBaseInitFunc) NULL, | |
52 | + (GBaseFinalizeFunc) NULL, | |
53 | + (GClassInitFunc) dia_line_preview_class_init, | |
54 | + (GClassFinalizeFunc) NULL, | |
55 | + NULL, | |
56 | + sizeof (DiaLinePreview), | |
57 | + 0, | |
58 | + (GInstanceInitFunc) dia_line_preview_init | |
59 | + }; | |
60 | + | |
61 | + type = g_type_register_static (GTK_TYPE_MISC, "DiaLinePreview", &info, 0); | |
62 | + } | |
63 | + | |
64 | + return type; | |
71 | 65 | } |
72 | 66 | |
73 | 67 | static void |
@@ -75,7 +69,7 @@ dia_line_preview_class_init (DiaLinePreviewClass *class) | ||
75 | 69 | { |
76 | 70 | GtkWidgetClass *widget_class; |
77 | 71 | |
78 | - widget_class = (GtkWidgetClass *)class; | |
72 | + widget_class = GTK_WIDGET_CLASS(class); | |
79 | 73 | widget_class->expose_event = dia_line_preview_expose; |
80 | 74 | } |
81 | 75 |
@@ -87,14 +81,13 @@ dia_line_preview_init (DiaLinePreview *line) | ||
87 | 81 | GTK_WIDGET (line)->requisition.width = 40 + GTK_MISC (line)->xpad * 2; |
88 | 82 | GTK_WIDGET (line)->requisition.height = 15 + GTK_MISC (line)->ypad * 2; |
89 | 83 | |
90 | - | |
91 | 84 | line->lstyle = LINESTYLE_SOLID; |
92 | 85 | } |
93 | 86 | |
94 | 87 | GtkWidget * |
95 | 88 | dia_line_preview_new (LineStyle lstyle) |
96 | 89 | { |
97 | - DiaLinePreview *line = gtk_type_new (dia_line_preview_get_type()); | |
90 | + DiaLinePreview *line = g_object_new(DIA_TYPE_LINE_PREVIEW, NULL); | |
98 | 91 | |
99 | 92 | line->lstyle = lstyle; |
100 | 93 | return GTK_WIDGET(line); |
@@ -106,7 +99,7 @@ dia_line_preview_set(DiaLinePreview *line, LineStyle lstyle) | ||
106 | 99 | if (line->lstyle != lstyle) { |
107 | 100 | line->lstyle = lstyle; |
108 | 101 | if (GTK_WIDGET_DRAWABLE(line)) |
109 | - gtk_widget_queue_clear(GTK_WIDGET(line)); | |
102 | + gtk_widget_queue_draw(GTK_WIDGET(line)); | |
110 | 103 | } |
111 | 104 | } |
112 | 105 |
@@ -187,32 +180,41 @@ dia_line_preview_expose(GtkWidget *widget, GdkEventExpose *event) | ||
187 | 180 | |
188 | 181 | static void dia_line_chooser_class_init (DiaLineChooserClass *klass); |
189 | 182 | static void dia_line_chooser_init (DiaLineChooser *arrow); |
190 | -static gint dia_line_chooser_event (GtkWidget *widget, | |
191 | - GdkEvent *event); | |
192 | -static void dia_line_chooser_dialog_ok (DiaLineChooser *lchooser); | |
193 | -static void dia_line_chooser_dialog_cancel (DiaLineChooser *lchooser); | |
194 | -static void dia_line_chooser_change_line_style (GtkMenuItem *mi, | |
195 | - DiaLineChooser *lchooser); | |
196 | - | |
197 | -GtkType | |
183 | + | |
184 | +GType | |
198 | 185 | dia_line_chooser_get_type (void) |
199 | 186 | { |
200 | - static GtkType arrow_type = 0; | |
201 | - | |
202 | - if (!arrow_type) { | |
203 | - static const GtkTypeInfo arrow_info = { | |
204 | - "DiaLineChooser", | |
205 | - sizeof (DiaLineChooser), | |
206 | - sizeof (DiaLineChooserClass), | |
207 | - (GtkClassInitFunc) dia_line_chooser_class_init, | |
208 | - (GtkObjectInitFunc) dia_line_chooser_init, | |
209 | - /* reserved_1 */ NULL, | |
210 | - /* reserved_2 */ NULL, | |
211 | - (GtkClassInitFunc) NULL, | |
212 | - }; | |
213 | - arrow_type = gtk_type_unique (GTK_TYPE_BUTTON, &arrow_info); | |
214 | - } | |
215 | - return arrow_type; | |
187 | + static GType type = 0; | |
188 | + | |
189 | + if (!type) { | |
190 | + static const GTypeInfo info = { | |
191 | + sizeof (DiaLineChooserClass), | |
192 | + (GBaseInitFunc) NULL, | |
193 | + (GBaseFinalizeFunc) NULL, | |
194 | + (GClassInitFunc) dia_line_chooser_class_init, | |
195 | + (GClassFinalizeFunc) NULL, | |
196 | + NULL, | |
197 | + sizeof (DiaLineChooser), | |
198 | + 0, | |
199 | + (GInstanceInitFunc) dia_line_chooser_init | |
200 | + }; | |
201 | + | |
202 | + type = g_type_register_static (GTK_TYPE_BUTTON, "DiaLineChooser", &info, 0); | |
203 | + } | |
204 | + | |
205 | + return type; | |
206 | +} | |
207 | + | |
208 | +static gint | |
209 | +dia_line_chooser_event(GtkWidget *widget, GdkEvent *event) | |
210 | +{ | |
211 | + if (event->type == GDK_BUTTON_PRESS && event->button.button == 1) { | |
212 | + GtkMenu *menu = g_object_get_data(G_OBJECT(widget), button_menu_key); | |
213 | + gtk_menu_popup(menu, NULL, NULL, NULL, NULL, | |
214 | + event->button.button, event->button.time); | |
215 | + return TRUE; | |
216 | + } | |
217 | + return FALSE; | |
216 | 218 | } |
217 | 219 | |
218 | 220 | static void |
@@ -220,11 +222,54 @@ dia_line_chooser_class_init (DiaLineChooserClass *class) | ||
220 | 222 | { |
221 | 223 | GtkWidgetClass *widget_class; |
222 | 224 | |
223 | - widget_class = (GtkWidgetClass *)class; | |
225 | + widget_class = GTK_WIDGET_CLASS(class); | |
224 | 226 | widget_class->event = dia_line_chooser_event; |
225 | 227 | } |
226 | 228 | |
227 | 229 | static void |
230 | +dia_line_chooser_dialog_response (GtkWidget *dialog, | |
231 | + gint response_id, | |
232 | + DiaLineChooser *lchooser) | |
233 | +{ | |
234 | + LineStyle new_style; | |
235 | + real new_dash; | |
236 | + | |
237 | + if (response_id == GTK_RESPONSE_OK) { | |
238 | + dia_line_style_selector_get_linestyle(lchooser->selector, | |
239 | + &new_style, &new_dash); | |
240 | + if (new_style != lchooser->lstyle || new_dash != lchooser->dash_length) { | |
241 | + lchooser->lstyle = new_style; | |
242 | + lchooser->dash_length = new_dash; | |
243 | + dia_line_preview_set(lchooser->preview, new_style); | |
244 | + if (lchooser->callback) | |
245 | + (* lchooser->callback)(new_style, new_dash, lchooser->user_data); | |
246 | + } | |
247 | + } else { | |
248 | + dia_line_style_selector_set_linestyle(lchooser->selector, | |
249 | + lchooser->lstyle, | |
250 | + lchooser->dash_length); | |
251 | + } | |
252 | + gtk_widget_hide(lchooser->dialog); | |
253 | +} | |
254 | + | |
255 | +static void | |
256 | +dia_line_chooser_change_line_style(GtkMenuItem *mi, DiaLineChooser *lchooser) | |
257 | +{ | |
258 | + LineStyle lstyle = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mi), | |
259 | + menuitem_enum_key)); | |
260 | + | |
261 | + if (lchooser->lstyle != lstyle) { | |
262 | + dia_line_preview_set(lchooser->preview, lstyle); | |
263 | + lchooser->lstyle = lstyle; | |
264 | + dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle, | |
265 | + lchooser->dash_length); | |
266 | + if (lchooser->callback) | |
267 | + (* lchooser->callback)(lchooser->lstyle, lchooser->dash_length, | |
268 | + lchooser->user_data); | |
269 | + } | |
270 | +} | |
271 | + | |
272 | +static void | |
228 | 273 | dia_line_chooser_init (DiaLineChooser *lchooser) |
229 | 274 | { |
230 | 275 | GtkWidget *wid; |
@@ -239,10 +284,18 @@ dia_line_chooser_init (DiaLineChooser *lchooser) | ||
239 | 284 | gtk_widget_show(wid); |
240 | 285 | lchooser->preview = DIA_LINE_PREVIEW(wid); |
241 | 286 | |
242 | - lchooser->dialog = wid = gtk_dialog_new(); | |
243 | - gtk_window_set_title(GTK_WINDOW(wid), _("Line Style Properties")); | |
244 | - g_signal_connect(GTK_OBJECT(wid), "delete_event", | |
245 | - G_CALLBACK(close_and_hide), NULL); | |
287 | + lchooser->dialog = gtk_dialog_new_with_buttons(_("Line Style Properties"), | |
288 | + NULL, | |
289 | + GTK_DIALOG_NO_SEPARATOR, | |
290 | + GTK_STOCK_CANCEL, | |
291 | + GTK_RESPONSE_CANCEL, | |
292 | + GTK_STOCK_OK, | |
293 | + GTK_RESPONSE_OK, | |
294 | + NULL); | |
295 | + gtk_dialog_set_default_response(GTK_DIALOG(lchooser->dialog), | |
296 | + GTK_RESPONSE_OK); | |
297 | + g_signal_connect(G_OBJECT(lchooser->dialog), "response", | |
298 | + G_CALLBACK(dia_line_chooser_dialog_response), lchooser); | |
246 | 299 | |
247 | 300 | wid = dia_line_style_selector_new(); |
248 | 301 | gtk_container_set_border_width(GTK_CONTAINER(wid), 5); |
@@ -251,54 +304,32 @@ dia_line_chooser_init (DiaLineChooser *lchooser) | ||
251 | 304 | gtk_widget_show(wid); |
252 | 305 | lchooser->selector = DIALINESTYLESELECTOR(wid); |
253 | 306 | |
254 | - wid = gtk_button_new_with_label(_("OK")); | |
255 | - GTK_WIDGET_SET_FLAGS(wid, GTK_CAN_DEFAULT); | |
256 | - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(lchooser->dialog)->action_area), | |
257 | - wid); | |
258 | - gtk_widget_grab_default(wid); | |
259 | - g_signal_connect_swapped(GTK_OBJECT(wid), "clicked", | |
260 | - G_CALLBACK(dia_line_chooser_dialog_ok), | |
261 | - GTK_OBJECT(lchooser)); | |
262 | - gtk_widget_show(wid); | |
263 | - | |
264 | - wid = gtk_button_new_with_label(_("Cancel")); | |
265 | - GTK_WIDGET_SET_FLAGS(wid, GTK_CAN_DEFAULT); | |
266 | - gtk_container_add(GTK_CONTAINER(GTK_DIALOG(lchooser->dialog)->action_area), | |
267 | - wid); | |
268 | - g_signal_connect_swapped(GTK_OBJECT(wid), "clicked", | |
269 | - G_CALLBACK(dia_line_chooser_dialog_cancel), | |
270 | - GTK_OBJECT(lchooser)); | |
271 | - | |
272 | 307 | menu = gtk_menu_new(); |
273 | - gtk_object_set_data_full(GTK_OBJECT(lchooser), button_menu_key, menu, | |
274 | - (GtkDestroyNotify)gtk_widget_unref); | |
308 | + g_object_set_data_full(G_OBJECT(lchooser), button_menu_key, menu, | |
309 | + (GDestroyNotify)gtk_widget_unref); | |
275 | 310 | for (i = 0; i <= LINESTYLE_DOTTED; i++) { |
276 | 311 | mi = gtk_menu_item_new(); |
277 | - gtk_object_set_data(GTK_OBJECT(mi), menuitem_enum_key, GINT_TO_POINTER(i)); | |
312 | + g_object_set_data(G_OBJECT(mi), menuitem_enum_key, GINT_TO_POINTER(i)); | |
278 | 313 | ln = dia_line_preview_new(i); |
279 | 314 | gtk_container_add(GTK_CONTAINER(mi), ln); |
280 | 315 | gtk_widget_show(ln); |
281 | - g_signal_connect(GTK_OBJECT(mi), "activate", | |
282 | - G_CALLBACK(dia_line_chooser_change_line_style), | |
283 | - lchooser); | |
284 | - gtk_container_add(GTK_CONTAINER(menu), mi); | |
285 | - gtk_widget_show(mi); | |
316 | + g_signal_connect(G_OBJECT(mi), "activate", | |
317 | + G_CALLBACK(dia_line_chooser_change_line_style), lchooser); | |
318 | + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); | |
319 | + gtk_widget_show (mi); | |
286 | 320 | } |
287 | 321 | mi = gtk_menu_item_new_with_label(_("Details...")); |
288 | - g_signal_connect_swapped(GTK_OBJECT(mi), "activate", | |
289 | - G_CALLBACK(gtk_widget_show), | |
290 | - GTK_OBJECT(lchooser->dialog)); | |
291 | - gtk_container_add(GTK_CONTAINER(menu), mi); | |
292 | - gtk_widget_show(mi); | |
293 | - | |
294 | - gtk_widget_show(wid); | |
322 | + g_signal_connect_swapped(G_OBJECT(mi), "activate", | |
323 | + G_CALLBACK(gtk_widget_show), lchooser->dialog); | |
324 | + gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); | |
325 | + gtk_widget_show (mi); | |
295 | 326 | } |
296 | 327 | |
297 | 328 | GtkWidget * |
298 | 329 | dia_line_chooser_new(DiaChangeLineCallback callback, |
299 | 330 | gpointer user_data) |
300 | 331 | { |
301 | - DiaLineChooser *chooser = gtk_type_new(dia_line_chooser_get_type()); | |
332 | + DiaLineChooser *chooser = g_object_new(DIA_TYPE_LINE_CHOOSER, NULL); | |
302 | 333 | |
303 | 334 | chooser->callback = callback; |
304 | 335 | chooser->user_data = user_data; |
@@ -306,57 +337,3 @@ dia_line_chooser_new(DiaChangeLineCallback callback, | ||
306 | 337 | return GTK_WIDGET(chooser); |
307 | 338 | } |
308 | 339 | |
309 | -static gint | |
310 | -dia_line_chooser_event(GtkWidget *widget, GdkEvent *event) | |
311 | -{ | |
312 | - if (event->type == GDK_BUTTON_PRESS && event->button.button == 1) { | |
313 | - GtkMenu *menu = gtk_object_get_data(GTK_OBJECT(widget), button_menu_key); | |
314 | - gtk_menu_popup(menu, NULL, NULL, NULL, NULL, | |
315 | - event->button.button, event->button.time); | |
316 | - return TRUE; | |
317 | - } | |
318 | - return FALSE; | |
319 | -} | |
320 | - | |
321 | -static void | |
322 | -dia_line_chooser_dialog_ok (DiaLineChooser *lchooser) | |
323 | -{ | |
324 | - LineStyle new_style; | |
325 | - real new_dash; | |
326 | - | |
327 | - dia_line_style_selector_get_linestyle(lchooser->selector, | |
328 | - &new_style, &new_dash); | |
329 | - if (new_style != lchooser->lstyle || new_dash != lchooser->dash_length) { | |
330 | - lchooser->lstyle = new_style; | |
331 | - lchooser->dash_length = new_dash; | |
332 | - dia_line_preview_set(lchooser->preview, new_style); | |
333 | - if (lchooser->callback) | |
334 | - (* lchooser->callback)(new_style, new_dash, lchooser->user_data); | |
335 | - } | |
336 | - gtk_widget_hide(lchooser->dialog); | |
337 | -} | |
338 | -static void | |
339 | -dia_line_chooser_dialog_cancel (DiaLineChooser *lchooser) | |
340 | -{ | |
341 | - dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle, | |
342 | - lchooser->dash_length); | |
343 | - gtk_widget_hide(lchooser->dialog); | |
344 | -} | |
345 | - | |
346 | -static void | |
347 | -dia_line_chooser_change_line_style(GtkMenuItem *mi, DiaLineChooser *lchooser) | |
348 | -{ | |
349 | - LineStyle lstyle = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mi), | |
350 | - menuitem_enum_key)); | |
351 | - | |
352 | - if (lchooser->lstyle != lstyle) { | |
353 | - dia_line_preview_set(lchooser->preview, lstyle); | |
354 | - lchooser->lstyle = lstyle; | |
355 | - dia_line_style_selector_set_linestyle(lchooser->selector, lchooser->lstyle, | |
356 | - lchooser->dash_length); | |
357 | - if (lchooser->callback) | |
358 | - (* lchooser->callback)(lchooser->lstyle, lchooser->dash_length, | |
359 | - lchooser->user_data); | |
360 | - } | |
361 | -} | |
362 | - |
@@ -18,6 +18,7 @@ | ||
18 | 18 | * along with this program; if not, write to the Free Software |
19 | 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
20 | 20 | */ |
21 | + | |
21 | 22 | #ifndef DIALINECHOOSER_H |
22 | 23 | #define DIALINECHOOSER_H |
23 | 24 |
@@ -26,30 +27,41 @@ | ||
26 | 27 | #include <gtk/gtk.h> |
27 | 28 | |
28 | 29 | /* --------------- DiaLinePreview -------------------------------- */ |
29 | -typedef struct _DiaLinePreview DiaLinePreview; | |
30 | -typedef struct _DiaLinePreviewClass DiaLinePreviewClass; | |
31 | - | |
30 | +GType dia_line_preview_get_type (void); | |
32 | 31 | |
33 | -#define DIA_LINE_PREVIEW(obj) (GTK_CHECK_CAST((obj),dia_line_preview_get_type(), DiaLinePreview)) | |
34 | -#define DIA_LINE_PREVIEW_CLASS(obj) (GTK_CHECK_CLASS_CAST((obj), dia_line_preview_get_type(), DiaLinePreviewClass)) | |
32 | +#define DIA_TYPE_LINE_PREVIEW (dia_line_preview_get_type ()) | |
33 | +#define DIA_LINE_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_LINE_PREVIEW, DiaLinePreview)) | |
34 | +#define DIA_LINE_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_LINE_PREVIEW, DiaLinePreviewClass)) | |
35 | +#define DIA_IS_LINE_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_LINE_PREVIEW)) | |
36 | +#define DIA_IS_LINE_PREVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DIA_TYPE_LINE_PREVIEW)) | |
37 | +#define DIA_LINE_PREVIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_LINE_PREVIEW, DiaLinePreviewClass)) | |
35 | 38 | |
36 | -GtkWidget *dia_line_preview_new (LineStyle lstyle); | |
39 | +typedef struct _DiaLinePreview DiaLinePreview; | |
40 | +typedef struct _DiaLinePreviewClass DiaLinePreviewClass; | |
37 | 41 | |
38 | 42 | struct _DiaLinePreview |
39 | 43 | { |
40 | 44 | GtkMisc misc; |
41 | 45 | LineStyle lstyle; |
42 | 46 | }; |
47 | + | |
43 | 48 | struct _DiaLinePreviewClass |
44 | 49 | { |
45 | 50 | GtkMiscClass parent_class; |
46 | 51 | }; |
47 | 52 | |
53 | +GtkWidget *dia_line_preview_new (LineStyle lstyle); | |
54 | + | |
55 | + | |
48 | 56 | /* ------- Code for DiaLineChooser ---------------------- */ |
49 | -GtkType dia_line_chooser_get_type (void); | |
57 | +GType dia_line_chooser_get_type (void); | |
50 | 58 | |
51 | -#define DIA_LINE_CHOOSER(obj) (GTK_CHECK_CAST((obj),dia_line_chooser_get_type(), DiaLineChooser)) | |
52 | -#define DIA_LINE_CHOOSER_CLASS(obj) (GTK_CHECK_CLASS_CAST((obj), dia_line_chooser_get_type(), DiaLineChooserClass)) | |
59 | +#define DIA_TYPE_LINE_CHOOSER (dia_line_chooser_get_type ()) | |
60 | +#define DIA_LINE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DIA_TYPE_LINE_CHOOSER, DiaLineChooser)) | |
61 | +#define DIA_LINE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DIA_TYPE_LINE_CHOOSER, DiaLineChooserClass)) | |
62 | +#define DIA_IS_LINE_CHOOSER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DIA_TYPE_LINE_CHOOSER)) | |
63 | +#define DIA_IS_LINE_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DIA_TYPE_LINE_CHOOSER)) | |
64 | +#define DIA_LINE_CHOOSER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DIA_TYPE_LINE_CHOOSER, DiaLineChooserClass)) | |
53 | 65 | |
54 | 66 | typedef struct _DiaLineChooser DiaLineChooser; |
55 | 67 | typedef struct _DiaLineChooserClass DiaLineChooserClass; |
@@ -70,6 +82,7 @@ struct _DiaLineChooser | ||
70 | 82 | GtkWidget *dialog; |
71 | 83 | DiaLineStyleSelector *selector; |
72 | 84 | }; |
85 | + | |
73 | 86 | struct _DiaLineChooserClass |
74 | 87 | { |
75 | 88 | GtkButtonClass parent_class; |
@@ -79,4 +92,5 @@ struct _DiaLineChooserClass | ||
79 | 92 | GtkWidget *dia_line_chooser_new (DiaChangeLineCallback callback, |
80 | 93 | gpointer user_data); |
81 | 94 | |
82 | -#endif | |
95 | + | |
96 | +#endif /* DIALINECHOOSER_H */ |
@@ -6,4 +6,3 @@ IMAGES = \ | ||
6 | 6 | |
7 | 7 | EXTRA_DIST = $(IMAGES) |
8 | 8 | image_DATA = $(IMAGES) |
9 | - |
@@ -83,7 +83,7 @@ uninstall-local-doc: | ||
83 | 83 | -if test "$(figdir)"; then \ |
84 | 84 | for file in $(srcdir)/$(figdir)/*.png; do \ |
85 | 85 | basefile=`echo $$file | sed -e 's,^.*/,,'`; \ |
86 | - rm -f $(docdir)/$(figdir)/$$basefile; \ | |
86 | + rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \ | |
87 | 87 | done; \ |
88 | 88 | rmdir $(DESTDIR)$(docdir)/$(figdir); \ |
89 | 89 | fi |