projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5b6f8f9
)
Fix some compiler warnings
author
John Darrington
<john@darrington.wattle.id.au>
Wed, 13 Sep 2017 08:22:51 +0000
(10:22 +0200)
committer
John Darrington
<john@darrington.wattle.id.au>
Wed, 13 Sep 2017 08:22:51 +0000
(10:22 +0200)
src/ui/gui/goto-case-dialog.c
patch
|
blob
|
history
src/ui/gui/psppire-data-editor.c
patch
|
blob
|
history
src/ui/gui/psppire-data-sheet.c
patch
|
blob
|
history
src/ui/gui/psppire-text-file.c
patch
|
blob
|
history
src/ui/gui/psppire-value-entry.c
patch
|
blob
|
history
diff --git
a/src/ui/gui/goto-case-dialog.c
b/src/ui/gui/goto-case-dialog.c
index 1b5e39a45dfd204628a0f676df5baf1fd950254c..713c1e354a5d2f5cb2b9b422f9d0066b9fe7c050 100644
(file)
--- a/
src/ui/gui/goto-case-dialog.c
+++ b/
src/ui/gui/goto-case-dialog.c
@@
-66,8
+66,8
@@
goto_case_dialog (PsppireDataSheet *ds)
if (case_num >= 0 &&
case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
{
if (case_num >= 0 &&
case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
{
- ssw_sheet_scroll_to (
ds
, -1, case_num);
- ssw_sheet_set_active_cell (
ds
, -1, case_num, 0);
+ ssw_sheet_scroll_to (
SSW_SHEET (ds)
, -1, case_num);
+ ssw_sheet_set_active_cell (
SSW_SHEET (ds)
, -1, case_num, 0);
}
}
}
}
}
}
diff --git
a/src/ui/gui/psppire-data-editor.c
b/src/ui/gui/psppire-data-editor.c
index b9c6fb62148f299421bf1c8aa6f32d75a47b5dca..8ceda9c5e578abcdd88b9884e82d2a2a486fc644 100644
(file)
--- a/
src/ui/gui/psppire-data-editor.c
+++ b/
src/ui/gui/psppire-data-editor.c
@@
-31,6
+31,7
@@
#include "ui/gui/val-labs-dialog.h"
#include "ui/gui/missing-val-dialog.h"
#include "ui/gui/var-type-dialog.h"
#include "ui/gui/val-labs-dialog.h"
#include "ui/gui/missing-val-dialog.h"
#include "ui/gui/var-type-dialog.h"
+#include "ui/gui/value-variant.h"
#include "ui/gui/psppire-dict.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
#include "ui/gui/psppire-dict.h"
#include "ui/gui/psppire-data-store.h"
#include "ui/gui/psppire-data-window.h"
@@
-380,7
+381,7
@@
on_datum_entry_activate (GtkEntry *entry, PsppireDataEditor *de)
value_destroy (&val, width);
gtk_widget_grab_focus (de->data_sheet);
value_destroy (&val, width);
gtk_widget_grab_focus (de->data_sheet);
- ssw_sheet_set_active_cell (
de->data_sheet
, col, row, NULL);
+ ssw_sheet_set_active_cell (
SSW_SHEET (de->data_sheet)
, col, row, NULL);
}
}
}
}
diff --git
a/src/ui/gui/psppire-data-sheet.c
b/src/ui/gui/psppire-data-sheet.c
index 59268d21f431a3e569e8f7f3a4ddff654ebad02e..86122d35f8df3984c601971a931ef9080cda1f5c 100644
(file)
--- a/
src/ui/gui/psppire-data-sheet.c
+++ b/
src/ui/gui/psppire-data-sheet.c
@@
-360,7
+360,7
@@
psppire_data_sheet_new (void)
static gboolean
indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
{
static gboolean
indicate_filtered_case (GtkWidget *widget, cairo_t *cr, PsppireDataStore *store)
{
- guint row =
g_object_get_data (widget, "row"
);
+ guint row =
GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "row")
);
if (!psppire_data_store_filtered (store, row))
return FALSE;
if (!psppire_data_store_filtered (store, row))
return FALSE;
@@
-380,8
+380,8
@@
button_post_create (GtkWidget *button, uint i, gpointer user_data)
{
PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
{
PsppireDataStore *data_store = PSPPIRE_DATA_STORE (user_data);
- g_object_set_data (
button
, "row", GUINT_TO_POINTER (i));
- g_signal_connect_after (button, "draw",
indicate_filtered_case
, data_store);
+ g_object_set_data (
G_OBJECT (button)
, "row", GUINT_TO_POINTER (i));
+ g_signal_connect_after (button, "draw",
G_CALLBACK (indicate_filtered_case)
, data_store);
}
static void
}
static void
diff --git
a/src/ui/gui/psppire-text-file.c
b/src/ui/gui/psppire-text-file.c
index 590455d90e49151bc040dcb70d448fc90633a288..c105db786458cb52e1677d9b4c3770a433a6c8a4 100644
(file)
--- a/
src/ui/gui/psppire-text-file.c
+++ b/
src/ui/gui/psppire-text-file.c
@@
-304,7
+304,6
@@
__tree_model_get_flags (GtkTreeModel *model)
static gint
__tree_model_get_n_columns (GtkTreeModel *tree_model)
{
static gint
__tree_model_get_n_columns (GtkTreeModel *tree_model)
{
- PsppireTextFile *tf = PSPPIRE_TEXT_FILE (tree_model);
return 2;
}
return 2;
}
diff --git
a/src/ui/gui/psppire-value-entry.c
b/src/ui/gui/psppire-value-entry.c
index 30b18219d785cd74de6c159352ca7ebcddd78004..650fed8c144e2cdd0d2654f669cf4e4c71c6868d 100644
(file)
--- a/
src/ui/gui/psppire-value-entry.c
+++ b/
src/ui/gui/psppire-value-entry.c
@@
-146,7
+146,6
@@
psppire_value_entry_text_changed (GtkEntryBuffer *buffer,
static void
on_entry_activate (GtkWidget *w)
{
static void
on_entry_activate (GtkWidget *w)
{
- PsppireValueEntry *ve = PSPPIRE_VALUE_ENTRY (w);
g_signal_emit (w, signals [EDIT_DONE], 0);
}
g_signal_emit (w, signals [EDIT_DONE], 0);
}