summaryrefslogtreecommitdiff
path: root/gtk/gtkfontsel.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2000-11-06 16:44:01 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-11-06 16:44:01 +0000
commit69f42512fa819749e1a2ca9f27a1b940ca8fc0d6 (patch)
tree72d241f6e17b304a567ea61309b8518227f55266 /gtk/gtkfontsel.h
parent8aef169f86a3267070214c94372c513a9495ec89 (diff)
downloadgtk+-69f42512fa819749e1a2ca9f27a1b940ca8fc0d6.tar.gz
Derive from GtkDialog, and use stock buttons. Should be 100% source
2000-11-02 Havoc Pennington <hp@redhat.com> * gtk/gtkfilesel.h, gtk/gtkfilesel.c: Derive from GtkDialog, and use stock buttons. Should be 100% source compatible, appropriate filesel fields now point to dialog->vbox and dialog->action_area. On the bizarre side, dialog->action_area and filesel->action_area are not the same widget. (gtk_file_selection_init): Put some padding around the selection entry, so it isn't touching the GtkDialog separator. * gtk/gtkfontsel.h, gtk/gtkfontsel.c: Derive from GtkDialog, use stock buttons, etc. Should also be source compatible. Set the dialog default title in _init not _new(). * gtk/gtkcolorseldialog.c (gtk_color_selection_dialog_init): Use stock buttons; don't put a button box inside the existing dialog button box. Don't bother with push/pop colormap anymore. * gtk/gtkdialog.h (GtkResponseType): Add a bunch of more specific GTK_RESPONSE_* values. This is clearer than ACCEPT/REJECT for message dialog, and necessary for the font selection and color selection with help and apply buttons. * gtk/gtkdialog.c (gtk_dialog_add_button): Return a pointer to the created button widget. Set GTK_CAN_DEFAULT on the button. (gtk_dialog_init): Default to GTK_BUTTONBOX_END, put less spacing between buttons, put less padding around the action area. (gtk_dialog_run): Exit on unmap rather than on destroy. This will also exit the loop if the widget is hidden. (gtk_dialog_delete_event_handler): Use GTK_RESPONSE_DELETE_EVENT instead of GTK_RESPONSE_NONE; since we're already adding a bunch of GTK_RESPONSE_* stuff, this seems cleaner, and lets you special-case delete event. * gtk/gtktexttagtable.c, gtk/gtktextview.c: Fix doc comment formatting
Diffstat (limited to 'gtk/gtkfontsel.h')
-rw-r--r--gtk/gtkfontsel.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index 1cc0c8653b..a35ebd12fc 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -33,10 +33,9 @@
#include <gdk/gdk.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtkdialog.h>
#include <gtk/gtkvbox.h>
-
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@@ -93,7 +92,7 @@ struct _GtkFontSelectionClass
struct _GtkFontSelectionDialog
{
- GtkWindow window;
+ GtkDialog parent_instance;
GtkWidget *fontsel;
@@ -111,7 +110,7 @@ struct _GtkFontSelectionDialog
struct _GtkFontSelectionDialogClass
{
- GtkWindowClass parent_class;
+ GtkDialogClass parent_class;
};