svnno****@sourc*****
svnno****@sourc*****
Wed Mar 28 10:18:53 JST 2007
Revision: 3069
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3069
Author: ikezoe
Date: 2007-03-28 10:18:52 +0900 (Wed, 28 Mar 2007)
Log Message:
-----------
* src/dialogs/kz-print-dialog.[ch]: kz_print_dialog_new
gets GtkWindow instead of KzWindow as an argument.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/dialogs/kz-print-dialog.c
kazehakase/trunk/src/dialogs/kz-print-dialog.h
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-28 01:14:21 UTC (rev 3068)
+++ kazehakase/trunk/ChangeLog 2007-03-28 01:18:52 UTC (rev 3069)
@@ -8,6 +8,8 @@
gets GtkWindow instead of KzWindow as an argument.
* src/dialogs/kz-links-dialog.[ch]: kz_links_dialog_new
gets GtkWindow instead of KzWindow as an argument.
+ * src/dialogs/kz-print-dialog.[ch]: kz_print_dialog_new
+ gets GtkWindow instead of KzWindow as an argument.
2007-03-28 Kouhei Sutou <kou****@cozmi*****>
Modified: kazehakase/trunk/src/dialogs/kz-print-dialog.c
===================================================================
--- kazehakase/trunk/src/dialogs/kz-print-dialog.c 2007-03-28 01:14:21 UTC (rev 3068)
+++ kazehakase/trunk/src/dialogs/kz-print-dialog.c 2007-03-28 01:18:52 UTC (rev 3069)
@@ -2,7 +2,7 @@
/*
* Copyright (C) 2003 Takuro Ashie
- * Copyright (C) 2004 Hiroyuki Ikzoe
+ * Copyright (C) 2004 Hiroyuki Ikezoe
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,11 +22,13 @@
#include "kz-print-dialog.h"
#include <glib/gi18n.h>
+
+#include "kz-window.h"
#include "kz-icons.h"
enum {
PROP_0,
- PROP_KZ_WINDOW
+ PROP_PARENT_WINDOW
};
@@ -95,11 +97,11 @@
g_object_class_install_property
(gobject_class,
- PROP_KZ_WINDOW,
- g_param_spec_object("kz-window",
- _("KzWindow"),
+ PROP_PARENT_WINDOW,
+ g_param_spec_object("parent-window",
+ _("ParentWindow"),
_("The parent kazehakase window"),
- KZ_TYPE_WINDOW,
+ GTK_TYPE_WINDOW,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (gobject_class, sizeof(KzPrintDialogPrivate));
@@ -120,7 +122,7 @@
default_filename = g_build_filename(g_get_current_dir(),
"file.ps", NULL);
- print->kz = NULL;
+ print->parent_window = NULL;
main_vbox = GTK_DIALOG(print)->vbox;
gtk_box_set_spacing(GTK_BOX(main_vbox), 4);
@@ -273,9 +275,9 @@
widget = GTK_WIDGET(print);
gtk_window_set_title(GTK_WINDOW(print), _("Print"));
- gtk_window_set_transient_for(GTK_WINDOW(print), GTK_WINDOW(print->kz));
+ gtk_window_set_transient_for(GTK_WINDOW(print), GTK_WINDOW(print->parent_window));
- embed = KZ_WINDOW_CURRENT_PAGE(print->kz);
+ embed = KZ_WINDOW_CURRENT_PAGE(KZ_WINDOW(print->parent_window));
if (KZ_IS_EMBED(embed))
{
@@ -305,10 +307,10 @@
{
KzPrintDialog *print = KZ_PRINT_DIALOG(object);
- if (print->kz)
+ if (print->parent_window)
{
- g_object_unref(print->kz);
- print->kz = NULL;
+ g_object_unref(print->parent_window);
+ print->parent_window = NULL;
}
free_print_info (print);
@@ -328,8 +330,8 @@
switch (prop_id)
{
- case PROP_KZ_WINDOW:
- print->kz = g_object_ref(g_value_get_object(value));
+ case PROP_PARENT_WINDOW:
+ print->parent_window = g_object_ref(g_value_get_object(value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -348,8 +350,8 @@
switch (prop_id)
{
- case PROP_KZ_WINDOW:
- g_value_set_object(value, print->kz);
+ case PROP_PARENT_WINDOW:
+ g_value_set_object(value, print->parent_window);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -359,16 +361,14 @@
GtkWidget *
-kz_print_dialog_new (KzWindow *kz)
+kz_print_dialog_new (GtkWindow *parent_window)
{
GtkWidget *widget;
widget = GTK_WIDGET(g_object_new(KZ_TYPE_PRINT_DIALOG,
- "kz-window", kz,
+ "parent-window", parent_window,
NULL));
- gtk_window_set_transient_for(GTK_WINDOW(widget),
- GTK_WINDOW(kz));
return widget;
}
Modified: kazehakase/trunk/src/dialogs/kz-print-dialog.h
===================================================================
--- kazehakase/trunk/src/dialogs/kz-print-dialog.h 2007-03-28 01:14:21 UTC (rev 3068)
+++ kazehakase/trunk/src/dialogs/kz-print-dialog.h 2007-03-28 01:18:52 UTC (rev 3069)
@@ -23,7 +23,6 @@
#include <gtk/gtk.h>
-#include "kz-window.h"
#include "kz-embed.h"
G_BEGIN_DECLS
@@ -60,7 +59,7 @@
{
GtkDialog parent;
- KzWindow *kz;
+ GtkWindow *parent_window;
PrintInfo *info;
};
@@ -70,7 +69,7 @@
};
GType kz_print_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget *kz_print_dialog_new (KzWindow *kz);
+GtkWidget *kz_print_dialog_new (GtkWindow *parent_window);
PrintInfo *kz_print_dialog_get_print_info (KzPrintDialog *print);