[atomix/wip/gtk3-port] Cleanup old files and comments
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atomix/wip/gtk3-port] Cleanup old files and comments
- Date: Tue, 13 Jan 2015 00:57:21 +0000 (UTC)
commit d286cfc6e35d329fad088bb4ac1e39742310a7c3
Author: Robert Roth <robert roth off gmail com>
Date: Tue Jan 13 02:25:20 2015 +0200
Cleanup old files and comments
configure.ac | 2 +-
src/board.c | 1244 -------------------------------------------------------
src/board.h | 49 ---
src/goal-view.c | 4 +-
src/main.c | 37 +--
5 files changed, 5 insertions(+), 1331 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4af17a1..e600c38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ([2.63])
AC_INIT([atomix],[2.14.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=atomix])
AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([src/board.c])
+AC_CONFIG_SRCDIR([src/main.c])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.10 foreign no-dist-gzip dist-bzip2])
diff --git a/src/goal-view.c b/src/goal-view.c
index 9c7e830..b3192a0 100644
--- a/src/goal-view.c
+++ b/src/goal-view.c
@@ -46,7 +46,6 @@ void goal_view_render (Goal *goal)
static void render_view (Goal *goal)
{
- GtkImage *item;
PlayField *pf;
gint row, col;
gdouble x;
@@ -54,7 +53,6 @@ static void render_view (Goal *goal)
Tile *tile;
TileType type;
gint tile_width, tile_height;
- gint width, height;
g_return_if_fail (IS_GOAL (goal));
g_return_if_fail (GTK_IS_FIXED (goal_fixed));
@@ -79,7 +77,7 @@ static void render_view (Goal *goal)
case TILE_TYPE_ATOM:
x = col * tile_width * SCALE_FACTOR;
y = row * tile_height * SCALE_FACTOR;
- item = create_small_item (x, y, tile);
+ create_small_item (x, y, tile);
break;
diff --git a/src/main.c b/src/main.c
index 80ff23c..c0efc38 100644
--- a/src/main.c
+++ b/src/main.c
@@ -583,36 +583,7 @@ void update_menu_item_state (void)
GUI creation functions
-------------------------------------------------------------- */
-/*static GtkWidget *create_canvas_widget (GtkWidget **canvas)
-{
- GtkWidget *frame;
-
- *canvas = gnome_canvas_new_aa ();
-
- frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (*canvas));
-
- return frame;
-}*/
-
-static GtkWidget *create_board_widget (GtkWidget **fixed)
-{
- GtkWidget *frame;
-
- *fixed = gtk_fixed_new ();
-
- frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
- gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (*fixed));
-
- gtk_widget_set_halign (GTK_WIDGET (*fixed), GTK_ALIGN_CENTER);
- gtk_widget_set_valign (GTK_WIDGET (*fixed), GTK_ALIGN_CENTER);
-
- return frame;
-}
-
-static GtkWidget *create_goal_widget (GtkWidget **fixed)
+static GtkWidget *create_fixed_widget (GtkWidget **fixed)
{
GtkWidget *frame;
@@ -633,7 +604,6 @@ static void add_statistics_table_entry (GtkWidget *table, gint row,
GtkWidget **return_widget)
{
GtkWidget *label;
- GtkWidget *align;
label = gtk_label_new (label_str);
gtk_widget_set_halign (label, GTK_ALIGN_END);
@@ -646,7 +616,6 @@ static void add_statistics_table_entry (GtkWidget *table, gint row,
else
*return_widget = gtk_label_new ("NO CONTENT");
- align = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
gtk_widget_set_halign (*return_widget, GTK_ALIGN_START);
gtk_widget_set_valign (*return_widget, GTK_ALIGN_CENTER);
gtk_grid_attach (GTK_GRID (table), *return_widget,
@@ -663,8 +632,8 @@ static GtkWidget *create_mainwin_content (AtomixApp *app)
GtkWidget *table;
/* create canvas widgets */
- pf = create_board_widget (&app->fi_matrix);
- goal = create_goal_widget (&app->fi_goal);
+ pf = create_fixed_widget (&app->fi_matrix);
+ goal = create_fixed_widget (&app->fi_goal);
gtk_widget_set_size_request (GTK_WIDGET (goal), 180, 50);
/* add playfield canvas to left side */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]