diff options
| author | Jon Phillips <jon@fabricatorz.com> | 2006-08-24 23:19:11 +0000 |
|---|---|---|
| committer | kidproto <kidproto@users.sourceforge.net> | 2006-08-24 23:19:11 +0000 |
| commit | 1cab31d2570e92b86ccf48c143290ef5b6f4db10 (patch) | |
| tree | df995977df306ec09174f1d714014359f8594409 /src/widgets | |
| parent | Ok, committed msgloan's patch to convert gbooleans to bools thus completing (diff) | |
| download | inkscape-1cab31d2570e92b86ccf48c143290ef5b6f4db10.tar.gz inkscape-1cab31d2570e92b86ccf48c143290ef5b6f4db10.zip | |
Cleaned up more of the gboolean to bool janitorial task...great!
(bzr r1634)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/icon.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/sp-xmlview-tree.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/toolbox.cpp | 18 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 0fadffdc8..b170d69f8 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -35,6 +35,8 @@ #include "icon.h" +// JON: keeping legacy gboolean because of old code +// TODO: replace gboolean with bool static gboolean icon_prerender_task(gpointer data); static void addPreRender( Inkscape::IconSize lsize, gchar const *name ); diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp index d6fd92d78..578951456 100644 --- a/src/widgets/sp-xmlview-tree.cpp +++ b/src/widgets/sp-xmlview-tree.cpp @@ -41,6 +41,8 @@ static void comment_content_changed (Inkscape::XML::Node * repr, const gchar * o static void tree_move (GtkCTree * tree, GtkCTreeNode * node, GtkCTreeNode * new_parent, GtkCTreeNode * new_sibling); +// JON: Must keep this as gboolean legacy +// TODO: convert to use bool static gboolean check_drag (GtkCTree * tree, GtkCTreeNode * node, GtkCTreeNode * new_parent, GtkCTreeNode * new_sibling); static GtkCTreeNode * ref_to_sibling (GtkCTreeNode * parent, Inkscape::XML::Node * ref); diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index e42f58954..f474cd735 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -2941,8 +2941,8 @@ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl) { GtkToggleButton *button = GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (tbl), "style-bold")); - gboolean active = gtk_toggle_button_get_active (button); - gboolean check = (query->font_weight.computed >= SP_CSS_FONT_WEIGHT_700); + bool active = gtk_toggle_button_get_active (button); + bool check = (query->font_weight.computed >= SP_CSS_FONT_WEIGHT_700); if (active != check) { @@ -2955,8 +2955,8 @@ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl) { GtkToggleButton *button = GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (tbl), "style-italic")); - gboolean active = gtk_toggle_button_get_active (button); - gboolean check = (query->font_style.computed != SP_CSS_FONT_STYLE_NORMAL); + bool active = gtk_toggle_button_get_active (button); + bool check = (query->font_style.computed != SP_CSS_FONT_STYLE_NORMAL); if (active != check) { @@ -3233,7 +3233,7 @@ sp_text_toolbox_orientation_toggled (GtkRadioButton *button, gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas)); } -gboolean +bool sp_text_toolbox_size_keypress (GtkWidget *w, GdkEventKey *event, gpointer data) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -3253,7 +3253,7 @@ sp_text_toolbox_size_keypress (GtkWidget *w, GdkEventKey *event, gpointer data) return FALSE; } -gboolean +bool sp_text_toolbox_family_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -3269,7 +3269,7 @@ sp_text_toolbox_family_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl) return FALSE; } -gboolean +bool sp_text_toolbox_family_list_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; @@ -3364,7 +3364,7 @@ sp_text_toolbox_text_popdown_clicked (GtkButton *button, } } -gboolean +bool sp_text_toolbox_entry_focus_in (GtkWidget *entry, GdkEventFocus *event, GObject *tbl) @@ -3373,7 +3373,7 @@ sp_text_toolbox_entry_focus_in (GtkWidget *entry, return FALSE; } -gboolean +bool sp_text_toolbox_popdown_focus_out (GtkWidget *popdown, GdkEventFocus *event, GObject *tbl) |