now builds on osx
This commit is contained in:
parent
5fb34a3741
commit
fd40e5a884
@ -16,7 +16,12 @@
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#ifdef __linux__
|
||||
#include <linux/tcp.h>
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
#include <netinet/tcp.h>
|
||||
#endif
|
||||
|
||||
#include <strmem.h>
|
||||
#include <duprintf.h>
|
||||
|
@ -55,6 +55,7 @@ char *wavetable_get_tblname ( WaveTable *wt );
|
||||
int wavetable_fill_tables( WaveTable *wt, char *filename);
|
||||
int wavetable_get_ntables ( WaveTable *wt );
|
||||
void wavetable_foreach_wavevar(WaveTable *wt, GFunc func, gpointer *p);
|
||||
void wavetable_foreach_wavevar_sorted(WaveTable *wt, GFunc func, gpointer *p);
|
||||
WaveVar *wavetable_get_var_for_name(WaveTable *wt, char *varName, int tblno );
|
||||
void wavetable_swvar_add(WaveTable *wt, char *varName, int type, int ncols);
|
||||
int wavetable_is_multisweep( WaveTable *wt);
|
||||
|
@ -13,7 +13,7 @@
|
||||
#include <math.h>
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
#include <gdk/gdkx.h>
|
||||
// #include <gdk/gdkx.h>
|
||||
#include <X11/extensions/shape.h>
|
||||
|
||||
#include <gaw.h>
|
||||
|
@ -1206,7 +1206,7 @@ void gm_create_layout (UserData *ud)
|
||||
g_error ("Failed to create menu model 'gaw_menubar': %s\n", error->message);
|
||||
}
|
||||
|
||||
menumodel = g_object_ref (gtk_builder_get_object (builder,"menubar" ));
|
||||
menumodel = (GMenuModel*)g_object_ref (gtk_builder_get_object (builder,"menubar" ));
|
||||
ud->menuBar = gtk_menu_bar_new_from_model(menumodel);
|
||||
gtk_widget_show(ud->menuBar);
|
||||
g_assert (ud->menuBar);
|
||||
@ -1214,13 +1214,13 @@ void gm_create_layout (UserData *ud)
|
||||
/* left, top, width, height */
|
||||
0, 0, 2, 1 );
|
||||
|
||||
ud->algomodel = g_object_ref (gtk_builder_get_object (builder,"algomenu" ));
|
||||
ud->algomodel = (GMenuModel*)g_object_ref (gtk_builder_get_object (builder,"algomenu" ));
|
||||
aw_algo_menu_create( ud );
|
||||
|
||||
ud->xconvmodel = g_object_ref (gtk_builder_get_object (builder,"xconvmenu" ));
|
||||
ud->xconvmodel = (GMenuModel*)g_object_ref (gtk_builder_get_object (builder,"xconvmenu" ));
|
||||
aw_xconv_menu_create( ud );
|
||||
|
||||
ud->vlmmodel = g_object_ref (gtk_builder_get_object (builder,"VarList" ));
|
||||
ud->vlmmodel = (GMenuModel*)g_object_ref (gtk_builder_get_object (builder,"VarList" ));
|
||||
|
||||
gm_update_menu(ud->menuBar, menubarTip);
|
||||
/* sensitive widget */
|
||||
|
@ -16,7 +16,14 @@
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#ifdef __linux__
|
||||
#include <linux/tcp.h>
|
||||
#endif
|
||||
#ifdef __APPLE__
|
||||
#include <netinet/tcp.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#include <strmem.h>
|
||||
#include <duprintf.h>
|
||||
|
Loading…
Reference in New Issue
Block a user