Fix declaration-after-statement compile error, remove C++ comments, remove unused...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/win_gtk.c b/src/gtk/win_gtk.c
index 4f396aafd1d6222b224a95ba33f3c4ec9846eb58..aa9b115a5620b9a0420e177d4428daff5c8884da 100644 (file)
--- a/src/gtk/win_gtk.c
+++ b/src/gtk/win_gtk.c
@@ -22,7 +22,6 @@ extern "C" {
 
 typedef struct _GtkPizzaChild GtkPizzaChild;
 typedef struct _GtkPizzaClass GtkPizzaClass;
 
 typedef struct _GtkPizzaChild GtkPizzaChild;
 typedef struct _GtkPizzaClass GtkPizzaClass;

-typedef struct _GtkPizzaAdjData  GtkPizzaAdjData;

 
 struct _GtkPizzaClass
 {
 
 struct _GtkPizzaClass
 {


@@ -40,12 +39,6 @@ struct _GtkPizzaChild
     gint y;
 };
 
     gint y;
 };
 

-struct _GtkPizzaAdjData
-{
-    gint dx;
-    gint dy;
-};
-

 static void gtk_pizza_class_init    (GtkPizzaClass    *klass);
 static void gtk_pizza_init          (GtkPizza         *pizza);
 
 static void gtk_pizza_class_init    (GtkPizzaClass    *klass);
 static void gtk_pizza_init          (GtkPizza         *pizza);
 


@@ -253,7 +246,7 @@ void       gtk_pizza_set_xoffset     (GtkPizza          *pizza, gint xoffset)
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
     pizza->m_xoffset = xoffset;
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
     pizza->m_xoffset = xoffset;

-    // do something
+    /* do something */

 }
 
 void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset)
 }
 
 void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset)


@@ -262,7 +255,7 @@ void       gtk_pizza_set_yoffset     (GtkPizza          *pizza, gint yoffset)
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
     pizza->m_xoffset = yoffset;
     g_return_if_fail (GTK_IS_PIZZA (pizza));
 
     pizza->m_xoffset = yoffset;

-    // do something
+    /* do something */

 }
 
 gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza)
 }
 
 gint       gtk_pizza_get_rtl_offset  (GtkPizza          *pizza)


@@ -744,12 +737,9 @@ gtk_pizza_scroll (GtkPizza *pizza, gint dx, gint dy)
     if (pizza->bin_window)
         gdk_window_scroll( pizza->bin_window, -dx, -dy );
         
     if (pizza->bin_window)
         gdk_window_scroll( pizza->bin_window, -dx, -dy );
         

-    tmp_list = pizza->children;
-    while (tmp_list)
+    for (tmp_list = pizza->children; tmp_list; tmp_list = tmp_list->next)

     {
         GtkPizzaChild *child = tmp_list->data;
     {
         GtkPizzaChild *child = tmp_list->data;

-        tmp_list = tmp_list->next;
-

         GtkAllocation alloc = child->widget->allocation;
         alloc.x -= dx;
         alloc.y -= dy;
         GtkAllocation alloc = child->widget->allocation;
         alloc.x -= dx;
         alloc.y -= dy;