From: John Melton G0ORX <john.d.melton@googlemail.com>
Date: Sun, 6 Oct 2019 10:37:10 +0000 (+0100)
Subject: changed uintptr_t to gtk conversion macros
X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/(%5B%5E?a=commitdiff_plain;h=996476cc27d996f279ad9c553eebc034b797bf0f;p=pihpsdr.git

changed uintptr_t to gtk conversion macros
---

diff --git a/ant_menu.c b/ant_menu.c
index 5d910ac..b6bb7ec 100644
--- a/ant_menu.c
+++ b/ant_menu.c
@@ -60,8 +60,8 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static void rx_ant_cb(GtkWidget *widget, gpointer data) {
-  int b=((uintptr_t)data)>>4;
-  int ant=((uintptr_t)data)&0xF;
+  int b=(GPOINTER_TO_UINT(data))>>4;
+  int ant=(GPOINTER_TO_UINT(data))&0xF;
   BAND *band=band_get_band(b);
   band->alexRxAntenna=ant;
   if(active_receiver->id==0) {
@@ -94,7 +94,7 @@ static void dac0_antenna_cb(GtkComboBox *widget,gpointer data) {
 }
 
 static void rx_lime_ant_cb(GtkWidget *widget, gpointer data) {
-  int ant=((uintptr_t)data)&0xF;
+  int ant=(GPOINTER_TO_UINT(data))&0xF;
   BAND *band=band_get_current_band();
   band->alexRxAntenna=ant;
   if(active_receiver->id==0) {
@@ -103,8 +103,8 @@ static void rx_lime_ant_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void tx_ant_cb(GtkWidget *widget, gpointer data) {
-  int b=((uintptr_t)data)>>4;
-  int ant=((uintptr_t)data)&0xF;
+  int b=(GPOINTER_TO_UINT(data))>>4;
+  int ant=(GPOINTER_TO_UINT(data))&0xF;
   BAND *band=band_get_band(b);
   band->alexTxAntenna=ant;
   if(active_receiver->id==0) {
diff --git a/band_menu.c b/band_menu.c
index c89cefd..bde4957 100644
--- a/band_menu.c
+++ b/band_menu.c
@@ -59,7 +59,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 
 gboolean band_select_cb (GtkWidget *widget, gpointer        data) {
   GtkWidget *label;
-  int b=(uintptr_t)data;
+  int b=GPOINTER_TO_UINT(data);
   set_button_text_color(last_band,"black");
   last_band=widget;
   set_button_text_color(last_band,"orange");
diff --git a/bandstack_menu.c b/bandstack_menu.c
index 4f8dc57..3e0ffb8 100644
--- a/bandstack_menu.c
+++ b/bandstack_menu.c
@@ -58,7 +58,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static gboolean bandstack_select_cb (GtkWidget *widget, gpointer        data) {
-  int b=(uintptr_t)data;
+  int b=GPOINTER_TO_UINT(data);
   set_button_text_color(last_bandstack,"black");
   last_bandstack=widget;
   set_button_text_color(last_bandstack,"orange");
diff --git a/cw_menu.c b/cw_menu.c
index 4849673..0c4130e 100644
--- a/cw_menu.c
+++ b/cw_menu.c
@@ -104,7 +104,7 @@ static void cw_keys_reversed_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void cw_keyer_mode_cb(GtkWidget *widget, gpointer data) {
-  cw_keyer_mode=(uintptr_t)data;
+  cw_keyer_mode=GPOINTER_TO_UINT(data);
   cw_changed();
 }
 
diff --git a/display_menu.c b/display_menu.c
index 6efbe0a..05b8a89 100644
--- a/display_menu.c
+++ b/display_menu.c
@@ -55,12 +55,12 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static void detector_mode_cb(GtkWidget *widget, gpointer data) {
-  display_detector_mode=(uintptr_t)data;
+  display_detector_mode=GPOINTER_TO_UINT(data);
   SetDisplayDetectorMode(active_receiver->id, 0, display_detector_mode);
 }
 
 static void average_mode_cb(GtkWidget *widget, gpointer data) {
-  display_average_mode=(uintptr_t)data;
+  display_average_mode=GPOINTER_TO_UINT(data);
   SetDisplayAverageMode(active_receiver->id, 0, display_average_mode);
 }
 
diff --git a/dsp_menu.c b/dsp_menu.c
index 1e8fcc8..385310e 100644
--- a/dsp_menu.c
+++ b/dsp_menu.c
@@ -64,18 +64,18 @@ static void agc_hang_threshold_value_changed_cb(GtkWidget *widget, gpointer data
 }
 
 static void pre_post_agc_cb(GtkWidget *widget, gpointer data) {
-  active_receiver->nr_agc=(uintptr_t)data;
+  active_receiver->nr_agc=GPOINTER_TO_UINT(data);
   SetRXAEMNRPosition(active_receiver->id, active_receiver->nr_agc);
 
 }
 
 static void nr2_gain_cb(GtkWidget *widget, gpointer data) {
-  active_receiver->nr2_gain_method=(uintptr_t)data;
+  active_receiver->nr2_gain_method=GPOINTER_TO_UINT(data);
   SetRXAEMNRgainMethod(active_receiver->id, active_receiver->nr2_gain_method);
 }
 
 static void nr2_npe_method_cb(GtkWidget *widget, gpointer data) {
-  active_receiver->nr2_npe_method=(uintptr_t)data;
+  active_receiver->nr2_npe_method=GPOINTER_TO_UINT(data);
   SetRXAEMNRnpeMethod(active_receiver->id, active_receiver->nr2_npe_method);
 }
 
diff --git a/equalizer_menu.c b/equalizer_menu.c
index d999d0b..6824eb4 100644
--- a/equalizer_menu.c
+++ b/equalizer_menu.c
@@ -98,7 +98,7 @@ static gboolean enable_cb (GtkWidget *widget, GdkEventButton *event, gpointer da
 }
 
 static void value_changed_cb (GtkWidget *widget, gpointer data) {
-  int i=(uintptr_t)data;
+  int i=GPOINTER_TO_UINT(data);
   if(tx_menu) {
     tx_equalizer[i]=(int)gtk_range_get_value(GTK_RANGE(widget));
     SetTXAGrphEQ(transmitter->id, tx_equalizer);
diff --git a/ext.c b/ext.c
index 6fe94e3..34464a8 100644
--- a/ext.c
+++ b/ext.c
@@ -45,7 +45,7 @@
 
 int ext_vfo_mode_changed(void * data)
 {
-  int mode=(uintptr_t) data;
+  int mode=GPOINTER_TO_INT(data);
   vfo_mode_changed(mode);
   return 0;
 }
@@ -89,7 +89,7 @@ int ext_vfo_update(void *data) {
 }
 
 int ext_vfo_filter_changed(void *data) {
-  vfo_filter_changed((int)(uintptr_t)data);
+  vfo_filter_changed(GPOINTER_TO_INT(data));
   return 0;
 }
 
@@ -186,14 +186,14 @@ int ext_sliders_update(void *data) {
 
 #ifdef PURESIGNAL
 int ext_tx_set_ps(void *data) {
-  int state=(uintptr_t) data;
+  int state=(GPOINTER_TO_INT(data)
   tx_set_ps(transmitter, state);
   return 0;
 }
 #endif
 
 int ext_vfo_step(void *data) {
-  int step=(int)(long)data;
+  int step=GPOINTER_TO_INT(data);
   vfo_step(step);
   return 0;
 }
diff --git a/fft_menu.c b/fft_menu.c
index 30f5b02..84f892f 100644
--- a/fft_menu.c
+++ b/fft_menu.c
@@ -53,7 +53,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static void filter_type_cb(GtkWidget *widget, gpointer data) {
-  set_filter_type((uintptr_t)data);
+  set_filter_type(GPOINTER_TO_UINT(data));
 }
 
 #ifdef SET_FILTER_SIZE
diff --git a/filter_menu.c b/filter_menu.c
index fad3098..62f682e 100644
--- a/filter_menu.c
+++ b/filter_menu.c
@@ -58,7 +58,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 int filter_select(void *data) {
-  int f=(uintptr_t)data;
+  int f=GPOINTER_TO_UINT(data);
   vfo_filter_changed(f);
   return 0;
 }
@@ -72,8 +72,8 @@ static gboolean filter_select_cb (GtkWidget *widget, gpointer        data) {
 }
 
 static gboolean deviation_select_cb (GtkWidget *widget, gpointer data) {
-  active_receiver->deviation=(uintptr_t)data;
-  transmitter->deviation=(uintptr_t)data;
+  active_receiver->deviation=GPOINTER_TO_UINT(data);
+  transmitter->deviation=GPOINTER_TO_UINT(data);
   if(active_receiver->deviation==2500) {
     //setFilter(-4000,4000);
     set_filter(active_receiver,-4000,4000);
@@ -93,7 +93,7 @@ static gboolean deviation_select_cb (GtkWidget *widget, gpointer data) {
 }
 
 static void var_spin_low_cb (GtkWidget *widget, gpointer data) {
-  int f=(uintptr_t)data;
+  int f=GPOINTER_TO_UINT(data);
   int id=active_receiver->id;
 
   FILTER *mode_filters=filters[vfo[id].mode];
@@ -110,7 +110,7 @@ static void var_spin_low_cb (GtkWidget *widget, gpointer data) {
 }
 
 static void var_spin_high_cb (GtkWidget *widget, gpointer data) {
-  int f=(uintptr_t)data;
+  int f=GPOINTER_TO_UINT(data);
   int id=active_receiver->id;
 
   FILTER *mode_filters=filters[vfo[id].mode];
diff --git a/freedv_menu.c b/freedv_menu.c
index bceb948..f3cfbfb 100644
--- a/freedv_menu.c
+++ b/freedv_menu.c
@@ -79,7 +79,7 @@ static void audio_spin_cb (GtkWidget *widget, gpointer data) {
 }
 
 static void mode_cb(GtkWidget *widget, gpointer data) {
-  int mode=(uintptr_t)data;
+  int mode=GPOINTER_TO_INT(data);
   freedv_set_mode(active_receiver,mode);
 }
 
diff --git a/meter_menu.c b/meter_menu.c
index bd6c748..a0e7869 100644
--- a/meter_menu.c
+++ b/meter_menu.c
@@ -53,11 +53,11 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static void smeter_select_cb (GtkWidget *widget, gpointer        data) {
-  smeter=(uintptr_t)data;
+  smeter=GPOINTER_TO_UINT(data);
 }
 
 static void alc_meter_select_cb (GtkWidget *widget, gpointer        data) {
-  alc=(uintptr_t)data;
+  alc=GPOINTER_TO_UINT(data);
 }
 
 static void analog_cb(GtkWidget *widget, gpointer data) {
diff --git a/midi3.c b/midi3.c
index cfab507..d96cd79 100644
--- a/midi3.c
+++ b/midi3.c
@@ -10,6 +10,8 @@
  *
  * However, changing the volume makes sense both with MIDI_KNOB and MIDI_WHEEL.
  */
+#include <gtk/gtk.h>
+
 #include "radio.h"
 #include "vfo.h"
 #include "filter.h"
@@ -35,19 +37,19 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
 	    break;    
 	case VFO: // only wheel supported
 	    if (type == MIDI_WHEEL) {
-		g_idle_add(ext_vfo_step, (gpointer)(uintptr_t) val);
+		g_idle_add(ext_vfo_step, GINT_TO_POINTER(val));
 	    }
 	    break;
 	case TUNE: // only key supported
 	    if (type == MIDI_KEY) {
 	        new = !tune;
-		g_idle_add(ext_tune_update, (gpointer)(long) new);
+		g_idle_add(ext_tune_update, GINT_TO_POINTER(new));
 	    }
 	    break;    
 	case MOX: // only key supported
 	    if (type == MIDI_KEY) {
 	        new = !mox;
-		g_idle_add(ext_mox_update, (gpointer)(long) new);
+		g_idle_add(ext_mox_update, GINT_TO_POINTER(new));
 	    }
 	    break;    
 	case AF_GAIN: // knob or wheel supported
@@ -113,7 +115,7 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
             new+=vfo[active_receiver->id].band;
             if (new >= BANDS) new=0;
             if (new < 0) new=BANDS-1;
-	    g_idle_add(ext_vfo_band_changed, (gpointer) (uintptr_t) new);
+	    g_idle_add(ext_vfo_band_changed, GINT_TO_POINTER(new));
 	    break;
 	case FILTER_UP:      // key or wheel supported
 	case FILTER_DOWN:    // key or wheel supported
@@ -127,7 +129,7 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
 	    new+=vfo[active_receiver->id].filter;
 	    if (new >= FILTERS) new=0;
 	    if (new <0) new=FILTERS-1;
-	    g_idle_add(ext_vfo_filter_changed, (gpointer) (uintptr_t) new);
+	    g_idle_add(ext_vfo_filter_changed, GINT_TO_POINTER(new));
 	    break;
 	case MODE_UP:      // key or wheel supported
 	case MODE_DOWN:    // key or wheel supported
@@ -141,7 +143,7 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
 	    new+=vfo[active_receiver->id].mode;
 	    if (new >= MODES) new=0;
 	    if (new <0) new=MODES-1;
-	    g_idle_add(ext_vfo_mode_changed, (gpointer) (uintptr_t) new);
+	    g_idle_add(ext_vfo_mode_changed, GINT_TO_POINTER(new));
 	    break;
 	case PAN_LOW:  // only wheel supported
 	    if (type == MIDI_WHEEL) {
@@ -215,7 +217,7 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
 		    if (filter_board == ALEX && active_receiver->adc == 0) {
 		      new=active_receiver->alex_attenuation + 1;
 		      if (new > 3) new=0;
-		      g_idle_add(ext_set_alex_attenuation, (gpointer)(uintptr_t)new);
+		      g_idle_add(ext_set_alex_attenuation, GINT_TO_PONTER(new));
 		      g_idle_add(ext_update_att_preamp, NULL);
 		    }
 		    break;
@@ -302,7 +304,7 @@ void DoTheMidi(enum MIDIaction action, enum MIDItype type, int val) {
 #ifdef PURESIGNAL
 	    // toggle PURESIGNAL
 	    new=!(transmitter->puresignal);
-	    g_idle_add(ext_tx_set_ps,(gpointer) (uintptr_t) new);
+	    g_idle_add(ext_tx_set_ps,GINT_TO_POINTER(new));
 #endif
 	    break;
 	case SPLIT:
diff --git a/mode_menu.c b/mode_menu.c
index 97e2bd5..b16503c 100644
--- a/mode_menu.c
+++ b/mode_menu.c
@@ -59,7 +59,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static gboolean mode_select_cb (GtkWidget *widget, gpointer        data) {
-  int m=(uintptr_t)data;
+  int m=GPOINTER_TO_UINT(data);
   set_button_text_color(last_mode,"black");
   last_mode=widget;
   set_button_text_color(last_mode,"orange");
diff --git a/new_protocol.c b/new_protocol.c
index 0d9f833..af6e2bb 100644
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -1544,7 +1544,7 @@ fprintf(stderr,"mic_line_thread\n");
 }
 
 static gpointer iq_thread(gpointer data) {
-  int ddc=(uintptr_t)data;
+  int ddc=GPOINTER_TO_UINT(data);
   long sequence;
   unsigned char *buffer;
   fprintf(stderr,"iq_thread: ddc=%d\n",ddc);
diff --git a/oc_menu.c b/oc_menu.c
index a7f8ee3..2cbb610 100644
--- a/oc_menu.c
+++ b/oc_menu.c
@@ -57,8 +57,8 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static void oc_rx_cb(GtkWidget *widget, gpointer data) {
-  int b=((uintptr_t)data)>>4;
-  int oc=((uintptr_t)data)&0xF;
+  int b=(GPOINTER_TO_UINT(data))>>4;
+  int oc=(GPOINTER_TO_UINT(data))&0xF;
   BAND *band=band_get_band(b);
   int mask=0x01<<(oc-1);
 fprintf(stderr,"oc_rx_cb: band=%d oc=%d mask=%d\n",b,oc,mask);
@@ -74,8 +74,8 @@ fprintf(stderr,"oc_rx_cb: band=%d oc=%d mask=%d\n",b,oc,mask);
 }
 
 static void oc_tx_cb(GtkWidget *widget, gpointer data) {
-  int b=((uintptr_t)data)>>4;
-  int oc=((uintptr_t)data)&0xF;
+  int b=(GPOINTER_TO_UINT(data))>>4;
+  int oc=(GPOINTER_TO_UINT(data))&0xF;
   BAND *band=band_get_band(b);
   int mask=0x01<<(oc-1);
 
@@ -92,7 +92,7 @@ fprintf(stderr,"oc_tx_cb: band=%d oc=%d mask=%d\n",b,oc,mask);
 }
 
 static void oc_tune_cb(GtkWidget *widget, gpointer data) {
-  int oc=((uintptr_t)data)&0xF;
+  int oc=(GPOINTER_TO_UINT(data))&0xF;
   int mask=0x01<<(oc-1);
 fprintf(stderr,"oc_tune_cb: oc=%d mask=%d\n",oc,mask);
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
diff --git a/ps_menu.c b/ps_menu.c
index db1b33a..58dac1f 100644
--- a/ps_menu.c
+++ b/ps_menu.c
@@ -270,7 +270,7 @@ static int info_thread(gpointer arg) {
 //       
 //
 static void ps_ant_cb(GtkWidget *widget, gpointer data) {
-  int val = (int) (uintptr_t) data;
+  int val = GPOINTER_TO_INT(data);
   if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
     switch (val) {
       case 0:	// Internal
@@ -286,7 +286,7 @@ static void ps_ant_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void enable_cb(GtkWidget *widget, gpointer data) {
-  g_idle_add(ext_tx_set_ps,(gpointer)(long)gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
+  g_idle_add(ext_tx_set_ps,GINT_TO_PTR(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))));
 }
 
 static void auto_cb(GtkWidget *widget, gpointer data) {
diff --git a/radio_menu.c b/radio_menu.c
index 95f5814..1f4347a 100644
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -212,26 +212,26 @@ static void charly25_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void sample_rate_cb(GtkWidget *widget, gpointer data) {
-  radio_change_sample_rate((uintptr_t)data);
+  radio_change_sample_rate(GPOINTER_TO_INT(data));
 }
 
 static void receivers_cb(GtkWidget *widget, gpointer data) {
-  radio_change_receivers((uintptr_t)data);
+  radio_change_receivers(GPOINTER_TO_INT(data));
 }
 
 static void region_cb(GtkWidget *widget, gpointer data) {
   radio_change_region(gtk_combo_box_get_active (GTK_COMBO_BOX(widget)));
 /*
-  radio_change_region((uintptr_t)data);
+  radio_change_region(GPOINTER_TO_INT(data));
 */
 }
 
 static void rit_cb(GtkWidget *widget,gpointer data) {
-  rit_increment=(uintptr_t)data;
+  rit_increment=GPOINTER_TO_INT(data);
 }
 
 static void ck10mhz_cb(GtkWidget *widget, gpointer data) {
-  atlas_clock_source_10mhz = (uintptr_t)data;
+  atlas_clock_source_10mhz = GPOINTER_TO_INT(data);
 }
 
 static void ck128mhz_cb(GtkWidget *widget, gpointer data) {
diff --git a/rigctl.c b/rigctl.c
index 54b61ba..b54e84f 100644
--- a/rigctl.c
+++ b/rigctl.c
@@ -645,7 +645,7 @@ void send_resp (int client_sock,char * msg) {
 //
 
 static gpointer rigctl_server(gpointer data) {
-  int port=(uintptr_t)data;
+  int port=GPOINTER_TO_INT(data);
   int rc;
   int on=1;
   int i;
diff --git a/rigctl_menu.c b/rigctl_menu.c
index b728f80..5ec99e1 100644
--- a/rigctl_menu.c
+++ b/rigctl_menu.c
@@ -92,13 +92,13 @@ static void serial_enable_cb(GtkWidget *widget, gpointer data) {
 
 // Set Baud Rate
 static void baud_rate_cb(GtkWidget *widget, gpointer data) {
-   serial_baud_rate = (uintptr_t) data;
+   serial_baud_rate = GPOINTER_TO_INT(data);
    fprintf(stderr,"RIGCTL_MENU: Baud rate changed\n");
 }
 
 // Set Parity 0=None, 1=Even, 2=0dd
 static void parity_cb(GtkWidget *widget, gpointer data) {
-   serial_parity = (uintptr_t) data;
+   serial_parity = GPOINTER_TO_INT(data);
    fprintf(stderr,"RITCTL_MENU: Serial Parity changed=%d\n", serial_parity);
 }
 
diff --git a/rx_menu.c b/rx_menu.c
index eec1927..24db9fc 100644
--- a/rx_menu.c
+++ b/rx_menu.c
@@ -87,11 +87,11 @@ static void alex_att_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void sample_rate_cb(GtkWidget *widget, gpointer data) {
-  receiver_change_sample_rate(active_receiver,(uintptr_t)data);
+  receiver_change_sample_rate(active_receiver,GPOINTER_TO_INT(data));
 }
 
 static void adc_cb(GtkWidget *widget, gpointer data) {
-  receiver_change_adc(active_receiver,(uintptr_t)data);
+  receiver_change_adc(active_receiver,GPOINTER_TO_INT(data));
 }
 
 static void local_audio_cb(GtkWidget *widget, gpointer data) {
@@ -145,7 +145,7 @@ static void local_output_changed_cb(GtkWidget *widget, gpointer data) {
 
 static void audio_channel_cb(GtkWidget *widget, gpointer data) {
   if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
-    active_receiver->audio_channel=(uintptr_t)data;
+    active_receiver->audio_channel=GPOINTER_TO_INT(data);
   }
 }
 
diff --git a/step_menu.c b/step_menu.c
index 5fb76a6..2ab37c7 100644
--- a/step_menu.c
+++ b/step_menu.c
@@ -51,7 +51,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static gboolean step_select_cb (GtkWidget *widget, gpointer        data) {
-  step=steps[(uintptr_t)data];
+  step=steps[GPOINTER_TO_INT(data)];
   g_idle_add(ext_vfo_update,NULL);
   return FALSE;
 }
diff --git a/store_menu.c b/store_menu.c
index d584d35..b4abf1d 100644
--- a/store_menu.c
+++ b/store_menu.c
@@ -63,7 +63,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 }
 
 static gboolean store_select_cb (GtkWidget *widget, gpointer data) {
-   int index = (uintptr_t) data;
+   int index = GPOINTER_TO_INT(data);
    fprintf(stderr,"STORE BUTTON PUSHED=%d\n",index);
    char workstr[40];
      
@@ -87,7 +87,7 @@ static gboolean store_select_cb (GtkWidget *widget, gpointer data) {
 }
 
 static gboolean recall_select_cb (GtkWidget *widget, gpointer data) {
-    int index = (uintptr_t) data;
+    int index = GPOINTER_TO_INT(data);
     long long new_freq;
     
     //new_freq = mem[index].frequency;
diff --git a/toolbar.c b/toolbar.c
index 395db8e..fa210e1 100644
--- a/toolbar.c
+++ b/toolbar.c
@@ -80,7 +80,7 @@ static gint rit_plus_timer=-1;
 static gint rit_minus_timer=-1;
 
 static gboolean rit_timer_cb(gpointer data) {
-  int i=(uintptr_t)data;
+  int i=GPOINTER_TO_INT(data);
   vfo[active_receiver->id].rit+=(i*rit_increment);
   if(vfo[active_receiver->id].rit>1000) vfo[active_receiver->id].rit=1000;
   if(vfo[active_receiver->id].rit<-1000) vfo[active_receiver->id].rit=-1000;
@@ -228,7 +228,7 @@ static void rit_enable_cb(GtkWidget *widget, gpointer data) {
 }
 
 static void rit_cb(GtkWidget *widget, gpointer data) {
-  int i=(uintptr_t)data;
+  int i=GPOINTER_TO_INT(data);
   vfo[active_receiver->id].rit+=i*rit_increment;
   if(vfo[active_receiver->id].rit>1000) vfo[active_receiver->id].rit=1000;
   if(vfo[active_receiver->id].rit<-1000) vfo[active_receiver->id].rit=-1000;
diff --git a/vfo_menu.c b/vfo_menu.c
index 8f93d2d..0e5b1da 100644
--- a/vfo_menu.c
+++ b/vfo_menu.c
@@ -163,7 +163,7 @@ static gboolean freqent_select_cb (GtkWidget *widget, gpointer data) {
       // via the menu prior to changing the frequency
       //
       if (b != vfo[id].band) {
-        g_idle_add(ext_vfo_band_changed, (gpointer) (uintptr_t) b);
+        g_idle_add(ext_vfo_band_changed, GINT_TO_POINTER(b));
       }
       setFrequency(f);
       g_idle_add(ext_vfo_update,NULL);