Fixing unchecked casts

2 files changed, 11 insertions, 15 deletions

diff --git a/Linux_C_12/cCrossCallMenus_121.c b/Linux_C_12/cCrossCallMenus_121.c
index f8ef0d6..af9163f 100644
--- a/Linux_C_12/cCrossCallMenus_121.c
+++ b/Linux_C_12/cCrossCallMenus_121.c
@@ -119,7 +119,6 @@ void EvalCcRqINSERTMENUITEM (CrossCallInfo *pcci)
     printf("Got title: %s\n", title);

 

     menu = GTK_WIDGET(pcci->p2);

-    printf("Menu widget: %s\n", gtk_menu_get_title(GTK_MENU(menu)));

 

     printf("Creating new menu item\n");

     menu_item = gtk_menu_item_new_with_mnemonic(title);

@@ -186,7 +185,7 @@ void EvalCcRqITEMENABLE (CrossCallInfo *pcci)	/* parent, HITEM, onoff; no result
     menu      = GTK_WIDGET(pcci->p1);

     menu_item = GTK_WIDGET(pcci->p2);

 

-    printf("Menu widget: %s\n", gtk_menu_get_title((GtkMenu*)menu));

+    printf("Menu widget: %s\n", gtk_menu_get_title(GTK_MENU(menu)));

         printf("EvalCcRqITEMENABLE\n");

     gtk_widget_set_sensitive(menu_item, (gboolean) pcci->p3);

 

@@ -286,14 +285,12 @@ void EvalCcRqINSERTMENU (CrossCallInfo *pcci)
     if (GTK_IS_MENU_BAR(parent_menu))

     {

         printf("Adding to a menu bar.\n");

-        printf("Menu Bar Name: %s\n", gtk_menu_get_title((GtkMenu*)parent_menu));

         GtkWidget *frame = gtk_widget_get_parent(gtk_widget_get_parent(parent_menu));

         accel_group = ((GtkAccelGroup*)gtk_accel_groups_from_object (G_OBJECT(frame))->data);

     }

     else

     {

         printf("We're not adding to a menu bar!?!\n");

-        printf("Parent Menu widget: %s\n", gtk_menu_get_title((GtkMenu*)parent_menu));

         accel_group = gtk_menu_get_accel_group (GTK_MENU(parent_menu));

     }

 

@@ -305,8 +302,6 @@ void EvalCcRqINSERTMENU (CrossCallInfo *pcci)
 

     gtk_menu_item_set_submenu (GTK_MENU_ITEM (root_menu), sub_menu);

 

-    printf("Inserting menu called %s at position %d (%s)\n",

-                        gtk_menu_get_title(GTK_MENU(root_menu)), (gint) pcci->p5, title);

     if (GTK_IS_MENU_BAR(parent_menu))

     {

         gtk_menu_shell_insert(GTK_MENU_SHELL(parent_menu), root_menu, (gint) pcci->p5);

@@ -316,7 +311,6 @@ void EvalCcRqINSERTMENU (CrossCallInfo *pcci)
 

     rfree(title);

 

-    printf("New menu is called: %s\n", gtk_menu_get_title((GtkMenu*)root_menu));

     MakeReturn1Cci (pcci, (int64_t) sub_menu);

 }

 

@@ -363,8 +357,6 @@ void EvalCcRqMENUENABLE (CrossCallInfo *pcci)	/* parent, zero based position of
     {

         printf("We have a container. Checking the widget.\n");

         parent_menu = GTK_WIDGET(pcci->p1);

-        printf("Parent Menu widget: %s\n",

-                    gtk_menu_get_title(GTK_MENU(parent_menu)));

         gtk_container_foreach(GTK_CONTAINER(parent_menu), pcci->p3 ?

                         enable_menu_callback : disable_menu_callback,

                         (gpointer) (&index));

@@ -418,8 +410,9 @@ void EvalCcRqCHECKMENUITEM (CrossCallInfo *pcci) /* menu, HITEM, on/off; no resu
         GtkWidget *menu = GTK_WIDGET(pcci->p1);

         GtkWidget *menu_item = GTK_WIDGET(pcci->p2);

 

-        gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item),

-                        (gboolean) pcci->p3);

+        if (GTK_IS_CHECK_MENU_ITEM(menu_item))

+            gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item),

+                            (gboolean) pcci->p3);

     }

 

     MakeReturn0Cci (pcci);

diff --git a/Linux_C_12/cCrossCallWindows_121.c b/Linux_C_12/cCrossCallWindows_121.c
index 30fa5b0..39cab67 100644
--- a/Linux_C_12/cCrossCallWindows_121.c
+++ b/Linux_C_12/cCrossCallWindows_121.c
@@ -998,16 +998,19 @@ void EvalCcRqGETWINDOWSIZE (CrossCallInfo *pcci) /* hwnd; width,height result. *
 /*	Set the size of windows/controls. */

 void EvalCcRqSETWINDOWSIZE (CrossCallInfo *pcci) /* hwnd, w,h, update; no result. */

 {

-    GtkWindow *window;

+    GtkWidget *element;

     gint width, height;

     gboolean update,inclScrollbars;

 

-   /* printf("EvalCcRqSETWINDOWSIZE\n"); */

-    window        = GTK_WINDOW(pcci->p1);

+    printf("EvalCcRqSETWINDOWSIZE\n");

+    element       = GTK_WIDGET(pcci->p1);

     width         = pcci->p2;

     height        = pcci->p3;

     update = pcci->p4;

-    gtk_window_resize(window, width, height);

+    if (GTK_IS_WINDOW(element))

+        gtk_window_resize(GTK_WINDOW(element), width, height);

+    else

+        gtk_widget_set_size_request(element, width, height);

 #if 0

     if (update!=0)				/* still, updates are not sufficient using SetWindowPos only. */

         UpdateWindowScrollbars (hwnd);