Commit 78899d39 authored by Darin Adler's avatar Darin Adler
Browse files

Updated to reflect completed tasks.

	* RENAMING: Updated to reflect completed tasks.

	* components/notes/ntl-notes.c: (make_notes_view):
	* components/websearch/ntl-web-search.c: (make_obj):
	Changed to use simplified clipboard API.

	* components/services/trilobite/libtrilobite/.cvsignore:
	Ignore generated files.

	* libnautilus-extensions/gtkscrollframe.c:
	* libnautilus-extensions/gtkscrollframe.h:
	Renamed GtkScrollFrame to NautilusScrollFrame so we won't conflict
	if a GtkScrollFrame actually gets added to gtk some day. The file
	still needs renaming (mentioned in RENAMING).

	* libnautilus/nautilus-clipboard.h:
	* libnautilus/nautilus-clipboard.c: (cut_callback),
	(copy_callback), (paste_callback), (clear_callback),
	(add_menu_item), (add_menu_items_callback),
	(remove_menu_items_callback), (nautilus_clipboard_set_up_editable):
	Simplified clipboard implementation. Does the same thing the old
	code did without needing a class and with a simpler API.

	* nautilus-widgets/nautilus-preferences-item.c:
	* src/file-manager/fm-icon-text-window.c:
	* src/nautilus-zoom-control.c:
	* src/ntl-window.c:
	Renamed _cb to _callback. Some other (minor) cleanup.

	* src/file-manager/Makefile.am:
	* src/file-manager/desktop-canvas.c: [removed]
	* src/file-manager/desktop-canvas.h: [removed]
	* src/file-manager/desktop-menu.c: [removed]
	* src/file-manager/desktop-menu.h: [removed]
	* src/file-manager/gnome-desktop.c: [removed]
	Now that I'm doing the desktop work, I know we don't need these.
	I'll be deleting the desktop source files that Havoc added as I
	harvest the useful code from them.

	* src/file-manager/fm-directory-view.c:
	(bonobo_control_activate_callback): Add comments.

	* src/nautilus-zoom-control.h: Fixed problem where the zoom
	control didn't know if it was an event box or a pixmap.

	* src/ntl-index-panel.c: (nautilus_index_panel_add_meta_view):
	Fixed bug that was trashing the sidebar panel names. I put
	the g_free call in the wrong place.

	* src/ntl-uri-map.c: (sidebar_panel_preference_is_on):
	Fixed bug where the sidebar preference wasn't saved. I found
	another place with another copy of the preference path. This
	sort of thing really needs to go in a header file, I think.
parent 967aace7
2000-05-25 Darin Adler <darin@eazel.com>
* RENAMING: Updated to reflect completed tasks.
* components/notes/ntl-notes.c: (make_notes_view):
* components/websearch/ntl-web-search.c: (make_obj):
Changed to use simplified clipboard API.
* components/services/trilobite/libtrilobite/.cvsignore:
Ignore generated files.
* libnautilus-extensions/gtkscrollframe.c:
* libnautilus-extensions/gtkscrollframe.h:
Renamed GtkScrollFrame to NautilusScrollFrame so we won't conflict
if a GtkScrollFrame actually gets added to gtk some day. The file
still needs renaming (mentioned in RENAMING).
* libnautilus/nautilus-clipboard.h:
* libnautilus/nautilus-clipboard.c: (cut_callback),
(copy_callback), (paste_callback), (clear_callback),
(add_menu_item), (add_menu_items_callback),
(remove_menu_items_callback), (nautilus_clipboard_set_up_editable):
Simplified clipboard implementation. Does the same thing the old
code did without needing a class and with a simpler API.
* nautilus-widgets/nautilus-preferences-item.c:
* src/file-manager/fm-icon-text-window.c:
* src/nautilus-zoom-control.c:
* src/ntl-window.c:
Renamed _cb to _callback. Some other (minor) cleanup.
* src/file-manager/Makefile.am:
* src/file-manager/desktop-canvas.c: [removed]
* src/file-manager/desktop-canvas.h: [removed]
* src/file-manager/desktop-menu.c: [removed]
* src/file-manager/desktop-menu.h: [removed]
* src/file-manager/gnome-desktop.c: [removed]
Now that I'm doing the desktop work, I know we don't need these.
I'll be deleting the desktop source files that Havoc added as I
harvest the useful code from them.
* src/file-manager/fm-directory-view.c:
(bonobo_control_activate_callback): Add comments.
* src/nautilus-zoom-control.h: Fixed problem where the zoom
control didn't know if it was an event box or a pixmap.
* src/ntl-index-panel.c: (nautilus_index_panel_add_meta_view):
Fixed bug that was trashing the sidebar panel names. I put
the g_free call in the wrong place.
* src/ntl-uri-map.c: (sidebar_panel_preference_is_on):
Fixed bug where the sidebar preference wasn't saved. I found
another place with another copy of the preference path. This
sort of thing really needs to go in a header file, I think.
2000-05-25 J Shane Culpepper <pepper@eazel.com>
* nautilus-installer/Makefile:
......
......@@ -7,10 +7,8 @@ file names
----------
components/history/ntl-history-view.c -> components/history/nautilus-history-view.c
components/notes/ntl-notes.c -> components/notes/nautilus-notes.c
libnautilus/nautilus-content-view-frame.c -> libnautilus/nautilus-content-view.c
libnautilus/nautilus-content-view-frame.h -> libnautilus/nautilus-content-view.h
libnautilus/nautilus-meta-view-frame.c -> libnautilus/nautilus-meta-view.c
libnautilus/nautilus-meta-view-frame.h -> libnautilus/nautilus-meta-view.h
libnautilus-extensions/gtkscrollframe.c -> libnautilus-extensions/nautilus-scroll-frame.c
libnautilus-extensions/gtkscrollframe.h -> libnautilus-extensions/nautilus-scroll-frame.h
libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c
libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h
src/nautilus-index-tabs.c -> src/nautilus-sidebar-tabs.c
......@@ -20,8 +18,6 @@ src/nautilus-index-title.h -> src/nautilus-sidebar-title.h
src/nautilus-zoomable-frame-svr.c -> src/nautilus-zoomable-frame-corba.c
src/ntl-app.c -> src/nautilus-application.c
src/ntl-app.h -> src/nautilus-application.h
src/ntl-content-view.c -> src/nautilus-content-view-frame.c
src/ntl-content-view.h -> src/nautilus-content-view-frame.h
src/ntl-index-panel.c -> src/nautilus-sidebar.c
src/ntl-index-panel.h -> src/nautilus-sidebar.h
src/ntl-main.c -> src/nautilus-main.c
......@@ -62,4 +58,3 @@ StatusRequestInfo -> Status (or StatusRequest)
--------------
function names
--------------
*_cb -> *_callback
......@@ -143,7 +143,6 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
GtkWidget *vbox;
Notes *notes;
NautilusBackground *background;
NautilusClipboardInfo *info;
g_return_val_if_fail (strcmp (goad_id, "OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185") == 0, NULL);
notes = g_new0 (Notes, 1);
......@@ -158,7 +157,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
notes->note_text_field = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (notes->note_text_field), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), notes->note_text_field, TRUE, TRUE, 0);
background = nautilus_get_widget_background (GTK_WIDGET (notes->note_text_field));
background = nautilus_get_widget_background (notes->note_text_field);
nautilus_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
gtk_widget_show_all (vbox);
......@@ -174,19 +173,11 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
notes_notify_location_change, notes);
/* handle selections */
info = nautilus_clipboard_info_new ();
nautilus_clipboard_info_set_view (info, notes->view);
nautilus_clipboard_info_set_clipboard_owner (info, GTK_WIDGET (notes->note_text_field));
nautilus_clipboard_info_set_component_name (info, _("Notes"));
gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_in_event",
GTK_SIGNAL_FUNC (nautilus_component_merge_bonobo_items_cb), info);
gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_out_event",
GTK_SIGNAL_FUNC (nautilus_component_unmerge_bonobo_items_cb), info);
gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", nautilus_clipboard_info_destroy, info);
/* set description */
return BONOBO_OBJECT (notes->view);
nautilus_clipboard_set_up_editable
(GTK_EDITABLE (notes->note_text_field),
nautilus_view_get_bonobo_control (notes->view));
return BONOBO_OBJECT (notes->view);
}
int
......@@ -222,8 +213,9 @@ main(int argc, char *argv[])
g_thread_init (NULL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi ("OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
make_notes_view, NULL);
factory = bonobo_generic_factory_new_multi
("OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
make_notes_view, NULL);
do {
bonobo_main();
......
......@@ -143,7 +143,6 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
GtkWidget *vbox;
Notes *notes;
NautilusBackground *background;
NautilusClipboardInfo *info;
g_return_val_if_fail (strcmp (goad_id, "OAFIID:ntl_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185") == 0, NULL);
notes = g_new0 (Notes, 1);
......@@ -158,7 +157,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
notes->note_text_field = gtk_text_new (NULL, NULL);
gtk_text_set_editable (GTK_TEXT (notes->note_text_field), TRUE);
gtk_box_pack_start (GTK_BOX (vbox), notes->note_text_field, TRUE, TRUE, 0);
background = nautilus_get_widget_background (GTK_WIDGET (notes->note_text_field));
background = nautilus_get_widget_background (notes->note_text_field);
nautilus_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
gtk_widget_show_all (vbox);
......@@ -174,19 +173,11 @@ make_notes_view (BonoboGenericFactory *Factory, const char *goad_id, gpointer cl
notes_notify_location_change, notes);
/* handle selections */
info = nautilus_clipboard_info_new ();
nautilus_clipboard_info_set_view (info, notes->view);
nautilus_clipboard_info_set_clipboard_owner (info, GTK_WIDGET (notes->note_text_field));
nautilus_clipboard_info_set_component_name (info, _("Notes"));
gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_in_event",
GTK_SIGNAL_FUNC (nautilus_component_merge_bonobo_items_cb), info);
gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_out_event",
GTK_SIGNAL_FUNC (nautilus_component_unmerge_bonobo_items_cb), info);
gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", nautilus_clipboard_info_destroy, info);
/* set description */
return BONOBO_OBJECT (notes->view);
nautilus_clipboard_set_up_editable
(GTK_EDITABLE (notes->note_text_field),
nautilus_view_get_bonobo_control (notes->view));
return BONOBO_OBJECT (notes->view);
}
int
......@@ -222,8 +213,9 @@ main(int argc, char *argv[])
g_thread_init (NULL);
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi ("OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
make_notes_view, NULL);
factory = bonobo_generic_factory_new_multi
("OAFIID:ntl_notes_view_factory:4b39e388-3ca2-4d68-9f3d-c137ee62d5b0",
make_notes_view, NULL);
do {
bonobo_main();
......
Makefile
Makefile.in
*.la
*.lo
.deps
.libs
*.lo
*.la
Makefile
Makefile.in
trilobite-service-common.c
trilobite-service-skels.c
trilobite-service-stubs.c
trilobite-service.h
......@@ -167,7 +167,6 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
{
GtkWidget *vbox;
WebSearchView *hview;
NautilusClipboardInfo *info;
g_return_val_if_fail(!strcmp(goad_id, "OAFIID:ntl_websearch_view:8216e1e4-6b01-4a28-82d9-5df30ed7d044"), NULL);
......@@ -225,15 +224,8 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure)
gtk_signal_connect(GTK_OBJECT(hview->view), "notify_location_change", web_search_notify_location_change, hview);
/* handle selections */
info = nautilus_clipboard_info_new ();
nautilus_clipboard_info_set_view (info, hview->view);
nautilus_clipboard_info_set_clipboard_owner (info, GTK_WIDGET (hview->ent_params));
nautilus_clipboard_info_set_component_name (info, _("WebSearch"));
gtk_signal_connect (GTK_OBJECT (hview->ent_params), "focus_in_event",
GTK_SIGNAL_FUNC (nautilus_component_merge_bonobo_items_cb), info);
gtk_signal_connect (GTK_OBJECT (hview->ent_params), "focus_out_event",
GTK_SIGNAL_FUNC (nautilus_component_unmerge_bonobo_items_cb), info);
gtk_signal_connect (GTK_OBJECT (hview->ent_params), "destroy", nautilus_clipboard_info_destroy, info);
nautilus_clipboard_set_up_editable (GTK_EDITABLE (hview->ent_params),
nautilus_view_get_bonobo_control (hview->view));
return BONOBO_OBJECT (hview->view);
}
......
This diff is collapsed.
......@@ -25,70 +25,62 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_SCROLL_FRAME_H__
#define __GTK_SCROLL_FRAME_H__
#ifndef GTK_SCROLL_FRAME_H
#define GTK_SCROLL_FRAME_H
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_SCROLL_FRAME (gtk_scroll_frame_get_type ())
#define GTK_SCROLL_FRAME(obj) (GTK_CHECK_CAST ((obj), \
GTK_TYPE_SCROLL_FRAME, GtkScrollFrame))
#define GTK_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
GTK_TYPE_SCROLL_FRAME, GtkScrollFrameClass))
#define GTK_IS_SCROLL_FRAME(obj) (GTK_CHECK_TYPE ((obj), \
GTK_TYPE_SCROLL_FRAME))
#define GTK_IS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
GTK_TYPE_SCROLL_FRAME))
typedef struct _GtkScrollFrame GtkScrollFrame;
typedef struct _GtkScrollFrameClass GtkScrollFrameClass;
struct _GtkScrollFrame
#define NAUTILUS_TYPE_SCROLL_FRAME (nautilus_scroll_frame_get_type ())
#define NAUTILUS_SCROLL_FRAME(obj) (GTK_CHECK_CAST ((obj), \
NAUTILUS_TYPE_SCROLL_FRAME, NautilusScrollFrame))
#define NAUTILUS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
NAUTILUS_TYPE_SCROLL_FRAME, NautilusScrollFrameClass))
#define NAUTILUS_IS_SCROLL_FRAME(obj) (GTK_CHECK_TYPE ((obj), \
NAUTILUS_TYPE_SCROLL_FRAME))
#define NAUTILUS_IS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
NAUTILUS_TYPE_SCROLL_FRAME))
typedef struct NautilusScrollFrame NautilusScrollFrame;
typedef struct NautilusScrollFrameClass NautilusScrollFrameClass;
typedef struct NautilusScrollFrameDetails NautilusScrollFrameDetails;
struct NautilusScrollFrame
{
GtkBin bin;
/* Private data */
gpointer priv;
NautilusScrollFrameDetails *details;
};
struct _GtkScrollFrameClass
struct NautilusScrollFrameClass
{
GtkBinClass parent_class;
};
GtkType gtk_scroll_frame_get_type (void);
GtkWidget *gtk_scroll_frame_new (GtkAdjustment *hadj, GtkAdjustment *vadj);
void gtk_scroll_frame_set_hadjustment (GtkScrollFrame *sf, GtkAdjustment *adj);
void gtk_scroll_frame_set_vadjustment (GtkScrollFrame *sf, GtkAdjustment *adj);
GtkAdjustment *gtk_scroll_frame_get_hadjustment (GtkScrollFrame *sf);
GtkAdjustment *gtk_scroll_frame_get_vadjustment (GtkScrollFrame *sf);
void gtk_scroll_frame_set_policy (GtkScrollFrame *sf,
GtkPolicyType hsb_policy,
GtkPolicyType vsb_policy);
void gtk_scroll_frame_set_placement (GtkScrollFrame *sf, GtkCornerType frame_placement);
void gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type);
void gtk_scroll_frame_set_scrollbar_spacing (GtkScrollFrame *sf, guint spacing);
void gtk_scroll_frame_add_with_viewport (GtkScrollFrame *sf, GtkWidget *child);
GtkType nautilus_scroll_frame_get_type (void);
GtkWidget * nautilus_scroll_frame_new (GtkAdjustment *h_adjustment,
GtkAdjustment *v_adjustment);
void nautilus_scroll_frame_set_hadjustment (NautilusScrollFrame *frame,
GtkAdjustment *adj);
void nautilus_scroll_frame_set_vadjustment (NautilusScrollFrame *frame,
GtkAdjustment *adj);
GtkAdjustment *nautilus_scroll_frame_get_hadjustment (NautilusScrollFrame *frame);
GtkAdjustment *nautilus_scroll_frame_get_vadjustment (NautilusScrollFrame *frame);
void nautilus_scroll_frame_set_policy (NautilusScrollFrame *frame,
GtkPolicyType h_scroll_policy,
GtkPolicyType v_scroll_policy);
void nautilus_scroll_frame_set_placement (NautilusScrollFrame *frame,
GtkCornerType frame_placement);
void nautilus_scroll_frame_set_shadow_type (NautilusScrollFrame *frame,
GtkShadowType shadow_type);
void nautilus_scroll_frame_set_scrollbar_spacing (NautilusScrollFrame *frame,
guint spacing);
void nautilus_scroll_frame_add_with_viewport (NautilusScrollFrame *frame,
GtkWidget *child);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_SCROLL_FRAME_H__ */
#endif /* GTK_SCROLL_FRAME_H */
......@@ -78,10 +78,10 @@ static void preferences_item_create_enum (NautilusPreferencesItem
const NautilusPreference *prefrence);
static void preferences_item_create_boolean (NautilusPreferencesItem *item,
const NautilusPreference *prefrence);
static void enum_radio_group_changed_cb (GtkWidget *button_group,
static void enum_radio_group_changed_callback (GtkWidget *button_group,
GtkWidget *button,
gpointer user_data);
static void boolean_button_toggled_cb (GtkWidget *button_group,
static void boolean_button_toggled_callback (GtkWidget *button_group,
gpointer user_data);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
......@@ -309,7 +309,7 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
gtk_signal_connect (GTK_OBJECT (item->details->child),
"changed",
GTK_SIGNAL_FUNC (enum_radio_group_changed_cb),
GTK_SIGNAL_FUNC (enum_radio_group_changed_callback),
(gpointer) item);
}
......@@ -338,7 +338,7 @@ preferences_item_create_boolean (NautilusPreferencesItem *item,
gtk_signal_connect (GTK_OBJECT (item->details->child),
"toggled",
GTK_SIGNAL_FUNC (boolean_button_toggled_cb),
GTK_SIGNAL_FUNC (boolean_button_toggled_callback),
(gpointer) item);
}
......@@ -362,7 +362,7 @@ nautilus_preferences_item_new (const gchar *preference_name,
}
static void
enum_radio_group_changed_cb (GtkWidget *buttons, GtkWidget * button, gpointer user_data)
enum_radio_group_changed_callback (GtkWidget *buttons, GtkWidget * button, gpointer user_data)
{
NautilusPreferencesItem *item = (NautilusPreferencesItem *) user_data;
const NautilusPreference *preference;
......@@ -380,7 +380,7 @@ enum_radio_group_changed_cb (GtkWidget *buttons, GtkWidget * button, gpointer us
}
static void
boolean_button_toggled_cb (GtkWidget *button, gpointer user_data)
boolean_button_toggled_callback (GtkWidget *button, gpointer user_data)
{
NautilusPreferencesItem *item = (NautilusPreferencesItem *) user_data;
gboolean active_state;
......
......@@ -25,70 +25,62 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_SCROLL_FRAME_H__
#define __GTK_SCROLL_FRAME_H__
#ifndef GTK_SCROLL_FRAME_H
#define GTK_SCROLL_FRAME_H
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_SCROLL_FRAME (gtk_scroll_frame_get_type ())
#define GTK_SCROLL_FRAME(obj) (GTK_CHECK_CAST ((obj), \
GTK_TYPE_SCROLL_FRAME, GtkScrollFrame))
#define GTK_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
GTK_TYPE_SCROLL_FRAME, GtkScrollFrameClass))
#define GTK_IS_SCROLL_FRAME(obj) (GTK_CHECK_TYPE ((obj), \
GTK_TYPE_SCROLL_FRAME))
#define GTK_IS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
GTK_TYPE_SCROLL_FRAME))
typedef struct _GtkScrollFrame GtkScrollFrame;
typedef struct _GtkScrollFrameClass GtkScrollFrameClass;
struct _GtkScrollFrame
#define NAUTILUS_TYPE_SCROLL_FRAME (nautilus_scroll_frame_get_type ())
#define NAUTILUS_SCROLL_FRAME(obj) (GTK_CHECK_CAST ((obj), \
NAUTILUS_TYPE_SCROLL_FRAME, NautilusScrollFrame))
#define NAUTILUS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
NAUTILUS_TYPE_SCROLL_FRAME, NautilusScrollFrameClass))
#define NAUTILUS_IS_SCROLL_FRAME(obj) (GTK_CHECK_TYPE ((obj), \
NAUTILUS_TYPE_SCROLL_FRAME))
#define NAUTILUS_IS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
NAUTILUS_TYPE_SCROLL_FRAME))
typedef struct NautilusScrollFrame NautilusScrollFrame;
typedef struct NautilusScrollFrameClass NautilusScrollFrameClass;
typedef struct NautilusScrollFrameDetails NautilusScrollFrameDetails;
struct NautilusScrollFrame
{
GtkBin bin;
/* Private data */
gpointer priv;
NautilusScrollFrameDetails *details;
};
struct _GtkScrollFrameClass
struct NautilusScrollFrameClass
{
GtkBinClass parent_class;
};
GtkType gtk_scroll_frame_get_type (void);
GtkWidget *gtk_scroll_frame_new (GtkAdjustment *hadj, GtkAdjustment *vadj);
void gtk_scroll_frame_set_hadjustment (GtkScrollFrame *sf, GtkAdjustment *adj);
void gtk_scroll_frame_set_vadjustment (GtkScrollFrame *sf, GtkAdjustment *adj);
GtkAdjustment *gtk_scroll_frame_get_hadjustment (GtkScrollFrame *sf);
GtkAdjustment *gtk_scroll_frame_get_vadjustment (GtkScrollFrame *sf);
void gtk_scroll_frame_set_policy (GtkScrollFrame *sf,
GtkPolicyType hsb_policy,
GtkPolicyType vsb_policy);
void gtk_scroll_frame_set_placement (GtkScrollFrame *sf, GtkCornerType frame_placement);
void gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type);
void gtk_scroll_frame_set_scrollbar_spacing (GtkScrollFrame *sf, guint spacing);
void gtk_scroll_frame_add_with_viewport (GtkScrollFrame *sf, GtkWidget *child);
GtkType nautilus_scroll_frame_get_type (void);
GtkWidget * nautilus_scroll_frame_new (GtkAdjustment *h_adjustment,
GtkAdjustment *v_adjustment);
void nautilus_scroll_frame_set_hadjustment (NautilusScrollFrame *frame,
GtkAdjustment *adj);
void nautilus_scroll_frame_set_vadjustment (NautilusScrollFrame *frame,
GtkAdjustment *adj);
GtkAdjustment *nautilus_scroll_frame_get_hadjustment (NautilusScrollFrame *frame);
GtkAdjustment *nautilus_scroll_frame_get_vadjustment (NautilusScrollFrame *frame);
void nautilus_scroll_frame_set_policy (NautilusScrollFrame *frame,
GtkPolicyType h_scroll_policy,
GtkPolicyType v_scroll_policy);
void nautilus_scroll_frame_set_placement (NautilusScrollFrame *frame,
GtkCornerType frame_placement);
void nautilus_scroll_frame_set_shadow_type (NautilusScrollFrame *frame,
GtkShadowType shadow_type);
void nautilus_scroll_frame_set_scrollbar_spacing (NautilusScrollFrame *frame,
guint spacing);
void nautilus_scroll_frame_add_with_viewport (NautilusScrollFrame *frame,
GtkWidget *child);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_SCROLL_FRAME_H__ */
#endif /* GTK_SCROLL_FRAME_H */
This diff is collapsed.
......@@ -25,70 +25,62 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_SCROLL_FRAME_H__
#define __GTK_SCROLL_FRAME_H__
#ifndef GTK_SCROLL_FRAME_H
#define GTK_SCROLL_FRAME_H
#include <gdk/gdk.h>
#include <gtk/gtkbin.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_SCROLL_FRAME (gtk_scroll_frame_get_type ())
#define GTK_SCROLL_FRAME(obj) (GTK_CHECK_CAST ((obj), \
GTK_TYPE_SCROLL_FRAME, GtkScrollFrame))
#define GTK_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
GTK_TYPE_SCROLL_FRAME, GtkScrollFrameClass))
#define GTK_IS_SCROLL_FRAME(obj) (GTK_CHECK_TYPE ((obj), \
GTK_TYPE_SCROLL_FRAME))
#define GTK_IS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
GTK_TYPE_SCROLL_FRAME))
typedef struct _GtkScrollFrame GtkScrollFrame;
typedef struct _GtkScrollFrameClass GtkScrollFrameClass;
struct _GtkScrollFrame
#define NAUTILUS_TYPE_SCROLL_FRAME (nautilus_scroll_frame_get_type ())
#define NAUTILUS_SCROLL_FRAME(obj) (GTK_CHECK_CAST ((obj), \
NAUTILUS_TYPE_SCROLL_FRAME, NautilusScrollFrame))
#define NAUTILUS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), \
NAUTILUS_TYPE_SCROLL_FRAME, NautilusScrollFrameClass))
#define NAUTILUS_IS_SCROLL_FRAME(obj) (GTK_CHECK_TYPE ((obj), \
NAUTILUS_TYPE_SCROLL_FRAME))
#define NAUTILUS_IS_SCROLL_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), \
NAUTILUS_TYPE_SCROLL_FRAME))
typedef struct NautilusScrollFrame NautilusScrollFrame;
typedef struct NautilusScrollFrameClass NautilusScrollFrameClass;
typedef struct NautilusScrollFrameDetails NautilusScrollFrameDetails;
struct NautilusScrollFrame
{
GtkBin bin;
/* Private data */
gpointer priv;
NautilusScrollFrameDetails *details;
};
struct _GtkScrollFrameClass
struct NautilusScrollFrameClass
{
GtkBinClass parent_class;
};
GtkType gtk_scroll_frame_get_type (void);
GtkWidget *gtk_scroll_frame_new (GtkAdjustment *hadj, GtkAdjustment *vadj);
void gtk_scroll_frame_set_hadjustment (GtkScrollFrame *sf, GtkAdjustment *adj);
void gtk_scroll_frame_set_vadjustment (GtkScrollFrame *sf, GtkAdjustment *adj);
GtkAdjustment *gtk_scroll_frame_get_hadjustment (GtkScrollFrame *sf);
GtkAdjustment *gtk_scroll_frame_get_vadjustment (GtkScrollFrame *sf);
void gtk_scroll_frame_set_policy (GtkScrollFrame *sf,
GtkPolicyType hsb_policy,
GtkPolicyType vsb_policy);
void gtk_scroll_frame_set_placement (GtkScrollFrame *sf, GtkCornerType frame_placement);
void gtk_scroll_frame_set_shadow_type (GtkScrollFrame *sf, GtkShadowType shadow_type);
void gtk_scroll_frame_set_scrollbar_spacing (GtkScrollFrame *sf, guint spacing);
void gtk_scroll_frame_add_with_viewport (GtkScrollFrame *sf, GtkWidget *child);
GtkType nautilus_scroll_frame_get_type (void);
GtkWidget * nautilus_scroll_frame_new (GtkAdjustment *h_adjustment,
GtkAdjustment *v_adjustment);
void nautilus_scroll_frame_set_hadjustment (NautilusScrollFrame *frame,