Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Solaris compiler errors "Cannot cast from void* to integer of smaller size"

Browse Source
This commit is contained in:
Paul Cornett
2020-10-23 19:42:24 -07:00
parent ba4df6d996
commit 0a70d3241d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gtk/app.cpp
View File

@@ -101,7 +101,7 @@ static gboolean wxapp_idle_callback(gpointer)
} }
// 0: no change, 1: focus in, 2: focus out // 0: no change, 1: focus in, 2: focus out
static int gs_focusChange; static wxUIntPtr gs_focusChange;
extern "C" { extern "C" {
static gboolean static gboolean
@@ -109,7 +109,7 @@ wx_focus_event_hook(GSignalInvocationHint*, unsigned, const GValue* param_values
{ {
// If focus change on TLW // If focus change on TLW
if (GTK_IS_WINDOW(g_value_peek_pointer(param_values))) if (GTK_IS_WINDOW(g_value_peek_pointer(param_values)))
gs_focusChange = GPOINTER_TO_INT(data); gs_focusChange = wxUIntPtr(data);
return true; return true;
} }

5
src/gtk/clipbrd.cpp
View File

@@ -269,13 +269,14 @@ selection_handler( GtkWidget *WXUNUSED(widget),
if ( !data ) if ( !data )
return; return;
unsigned timestamp = unsigned(wxUIntPtr(signal_data));
// ICCCM says that TIMESTAMP is a required atom. // ICCCM says that TIMESTAMP is a required atom.
// In particular, it satisfies Klipper, which polls // In particular, it satisfies Klipper, which polls
// TIMESTAMP to see if the clipboards content has changed. // TIMESTAMP to see if the clipboards content has changed.
// It shall return the time which was used to set the data. // It shall return the time which was used to set the data.
if (gtk_selection_data_get_target(selection_data) == g_timestampAtom) if (gtk_selection_data_get_target(selection_data) == g_timestampAtom)
{ {
guint timestamp = GPOINTER_TO_UINT (signal_data);
gtk_selection_data_set(selection_data, gtk_selection_data_set(selection_data,
GDK_SELECTION_TYPE_INTEGER, GDK_SELECTION_TYPE_INTEGER,
32, 32,
@@ -295,7 +296,7 @@ selection_handler( GtkWidget *WXUNUSED(widget),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_target(selection_data)))).c_str(), wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_target(selection_data)))).c_str(),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_data_type(selection_data)))).c_str(), wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_data_type(selection_data)))).c_str(),
wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_selection(selection_data)))).c_str(), wxString::FromAscii(wxGtkString(gdk_atom_name(gtk_selection_data_get_selection(selection_data)))).c_str(),
GPOINTER_TO_UINT( signal_data ) timestamp
); );
if ( !data->IsSupportedFormat( format ) ) if ( !data->IsSupportedFormat( format ) )