diff options
| author | rdaneelolivaw <devnull@localhost> | 2007-01-03 02:17:01 +0000 |
|---|---|---|
| committer | rdaneelolivaw <devnull@localhost> | 2007-01-03 02:17:01 +0000 |
| commit | dcb0fd2d94cb036c4513a6f1549f3ee93dae34ec (patch) | |
| tree | 06398ef73d667b4c717dfd19f2d5f759e3d83629 | |
| parent | e0f933ace144987173a2c539549ce38b2c514c1e (diff) | |
| download | scintilla-mirror-dcb0fd2d94cb036c4513a6f1549f3ee93dae34ec.tar.gz | |
Remove [MSVC] compile-time warnings for "empty" controlled statement and gboolean != bool
| -rw-r--r-- | gtk/PlatGTK.cxx | 8 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 50954d475..59e4d9dca 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -2283,7 +2283,7 @@ void ListBoxX::Select(int n) { return; } - bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n); + bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; if (valid) { gtk_tree_selection_select_iter(selection, &iter); @@ -2356,7 +2356,7 @@ int ListBoxX::Find(const char *prefix) { GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); - bool valid = gtk_tree_model_get_iter_first(model, &iter); + bool valid = gtk_tree_model_get_iter_first(model, &iter) != FALSE; int i = 0; while(valid) { gchar *s; @@ -2364,7 +2364,7 @@ int ListBoxX::Find(const char *prefix) { if (s && (0 == strncmp(prefix, s, strlen(prefix)))) { return i; } - valid = gtk_tree_model_iter_next(model, &iter); + valid = gtk_tree_model_iter_next(model, &iter) != FALSE; i++; } #endif @@ -2388,7 +2388,7 @@ void ListBoxX::GetValue(int n, char *value, int len) { #else GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); - bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n); + bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; if (valid) { gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); } diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 2e67f0e4f..5fcfd22a6 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -1991,10 +1991,8 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { // This will have to change for Unicode else if (key >= 0xFE00) key = KeyTranslate(key); - else if (IsUnicodeMode()) - ; // No operation #if GTK_MAJOR_VERSION < 2 - else if ((key >= 0x100) && (key < 0x1000)) + else if (!IsUnicodeMode() && (key >= 0x100) && (key < 0x1000)) key &= 0xff; #endif |