Skip to content

P
proview
Commit 7febf8b4 authored by claes's avatar claes
Browse files
Options

More gtk

parent 5d2c973c
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 37 deletions
wb/exe/wb/gtk/os_linux/link_rule.mk
View file @ 7febf8b4
......@@ -10,8 +10,7 @@ ifeq ($(export_type),exp)
-lpwr_wb_gtk -lpwr_wb -lpwr_wb_gtk -lpwr_wb -lpwr_rt_gtk -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_co_gtk -lpwr_co \
`pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lantlr -lgdk_imlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\
-lpwr_msg_dummy -lantlr \
-lrpcsvc -lpthread -lm -ldb_cxx -lz
else
link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_gtk \
......@@ -22,8 +21,7 @@ else
-lpwr_wb_gtk -lpwr_wb -lpwr_rt_gtk -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_co_gtk -lpwr_co \
`pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lantlr -lgdk_imlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\
-lpwr_msg_dummy -lantlr \
-lrpcsvc -lpthread -lm -ldb_cxx -lz
endif
endif
wb/exe/wb_cmd/gtk/os_linux/link_rule.mk
View file @ 7febf8b4
......@@ -9,7 +9,6 @@ link_rule_mk := 1
-lpwr_wb_gtk -lpwr_wb -lpwr_rt_gtk -lpwr_rt -lpwr_ge_gtk -lpwr_ge \
-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_co_gtk -lpwr_co \
`pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lantlr -lgdk_imlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\
-lpwr_msg_dummy -lantlr \
-lrpcsvc -lpthread -lm -ldb_cxx -lz
endif
xtt/exe/rt_xtt/gtk/os_linux/link_rule.mk
View file @ 7febf8b4
......@@ -9,8 +9,7 @@ ifeq ($(export_type),exp)
-lpwr_xtt_gtk -lpwr_xtt -lpwr_xtt_gtk -lpwr_xtt -lpwr_ge_gtk -lpwr_ge -lpwr_rt_gtk -lpwr_rt \
-lpwr_co_gtk -lpwr_co -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
`pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lgdk_imlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lSM -lICE\
-lpwr_msg_dummy \
-ldb -lrpcsvc -lpthread -lm -lrt -lasound
else
link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/rt_xtt_gtk \
......@@ -20,8 +19,7 @@ else
-lpwr_xtt_gtk -lpwr_xtt -lpwr_xtt_gtk -lpwr_xtt -lpwr_ge_gtk -lpwr_ge -lpwr_rt_gtk -lpwr_rt \
-lpwr_co_gtk -lpwr_co -lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow \
`pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lgdk_imlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lSM -lICE\
-lpwr_msg_dummy \
-ldb -lrpcsvc -lpthread -lm -lrt -lasound
endif
endif
xtt/exe/wb_ge/gtk/os_linux/link_rule.mk
View file @ 7febf8b4
......@@ -10,8 +10,7 @@ link = $(ldxx) $(elinkflags) $(domap) -o $(pwr_exe)/wb_ge_gtk \
-lpwr_flow_gtk -lpwr_flow -lpwr_glow_gtk -lpwr_glow -lpwr_rt_gtk -lpwr_rt \
-lpwr_co_gtk -lpwr_co -lpwr_flow_gtk -lpwr_flow \
`pkg-config --libs gtk+-2.0` \
-lpwr_msg_dummy -lantlr -lgdk_imlib -lMrm -lXm -lXpm -lXt -lX11 -lXext -lXp\
-lXmu -lSM -lICE\
-lpwr_msg_dummy -lantlr \
-lrpcsvc -lpthread -lm -ldb_cxx -lz
endif
xtt/lib/flow/gtk/flow_draw_gtk.cpp
View file @ 7febf8b4
/*
* Proview $Id: flow_draw_gtk.cpp,v 1.3 2007-01-11 11:40:30 claes Exp $
* Proview $Id: flow_draw_gtk.cpp,v 1.4 2007-01-11 12:00:05 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -403,12 +403,6 @@ FlowDrawGtk::FlowDrawGtk(
flow_create_cursor( this);
#if defined IMLIB
gdk_imlib_init();
gtk_widget_push_visual( gdk_imlib_get_visual());
gtk_widget_push_colormap( gdk_imlib_get_colormap());
#endif
init_proc( toplevel, basectx, client_data);
}
......
xtt/lib/ge/src/ge_graph_web.cpp
View file @ 7febf8b4
/*
* Proview $Id: ge_graph_web.cpp,v 1.9 2007-01-04 08:18:35 claes Exp $
* Proview $Id: ge_graph_web.cpp,v 1.10 2007-01-11 12:00:05 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -132,7 +132,7 @@ int Graph::generate_web( ldh_tSesContext ldhses)
if ( node_count > 0)
{
node_objid = *nodelist;
XtFree( (char *)nodelist);
free( (char *)nodelist);
}
else
sts = 0;
......@@ -160,63 +160,63 @@ int Graph::generate_web( ldh_tSesContext ldhses)
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( file_name, value_p);
XtFree( value_p);
free( value_p);
// Attribute Title
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "Title",
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( title, value_p);
XtFree( value_p);
free( value_p);
// Attribute Text
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "Text",
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( text, value_p);
XtFree( value_p);
free( value_p);
// Attribute EnableLogin
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "EnableLogin",
&value_p, &size);
if (EVEN(sts)) return sts;
enable_login = *(pwr_tBoolean *)value_p;
XtFree( value_p);
free( value_p);
// Attribute EnableAlarmList
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "EnableAlarmList",
&value_p, &size);
if (EVEN(sts)) return sts;
enable_alarmlist = *(pwr_tBoolean *)value_p;
XtFree( value_p);
free( value_p);
// Attribute EnableEventList
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "EnableEventList",
&value_p, &size);
if (EVEN(sts)) return sts;
enable_eventlist = *(pwr_tBoolean *)value_p;
XtFree( value_p);
free( value_p);
// Attribute EnableNavigator
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "EnableNavigator",
&value_p, &size);
if (EVEN(sts)) return sts;
enable_navigator = *(pwr_tBoolean *)value_p;
XtFree( value_p);
free( value_p);
// Attribute StyleSheet
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "StyleSheet",
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( style_sheet, value_p);
XtFree( value_p);
free( value_p);
// Attribute StartURL
sts = ldh_GetObjectPar( ldhses, webhandler_objid, "RtBody", "StartURL",
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( start_URL, value_p);
XtFree( value_p);
free( value_p);
// Login applet as default start URL
if ( strcmp( start_URL, "") == 0 && enable_login)
......@@ -346,14 +346,14 @@ int Graph::generate_web( ldh_tSesContext ldhses)
&value_p, &size);
if (EVEN(sts)) return sts;
cdh_ToLower( graph_name, value_p);
XtFree( value_p);
free( value_p);
// Attribute WebTarget
sts = ldh_GetObjectPar( ldhses, webgraph_objid, "RtBody", "WebTarget",
&value_p, &size);
if (EVEN(sts)) return sts;
web_target = *(pwr_tEnum *) value_p;
XtFree( value_p);
free( value_p);
if ( (s == strrchr( graph_name, '.')))
*s = 0;
......@@ -363,7 +363,7 @@ int Graph::generate_web( ldh_tSesContext ldhses)
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( graph_text, value_p);
XtFree( value_p);
free( value_p);
switch ( web_target) {
case graph_eWebTarget_ParentWindow :
......@@ -417,21 +417,21 @@ graph_text << "'," << resize << "," << width+20 << "," << height+20
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( link_URL, value_p);
XtFree( value_p);
free( value_p);
// Attribute Text
sts = ldh_GetObjectPar( ldhses, weblink_objid, "RtBody", "Text",
&value_p, &size);
if (EVEN(sts)) return sts;
strcpy( link_text, value_p);
XtFree( value_p);
free( value_p);
// Attribute WebTarget
sts = ldh_GetObjectPar( ldhses, weblink_objid, "RtBody", "WebTarget",
&value_p, &size);
if (EVEN(sts)) return sts;
web_target = *(pwr_tEnum *) value_p;
XtFree( value_p);
free( value_p);
switch ( web_target) {
case graph_eWebTarget_ParentWindow :
......
xtt/lib/xtt/gtk/xtt_clog_gtk.cpp
View file @ 7febf8b4
/*
* Proview $Id: xtt_clog_gtk.cpp,v 1.1 2007-01-04 08:29:32 claes Exp $
* Proview $Id: xtt_clog_gtk.cpp,v 1.2 2007-01-11 12:00:05 claes Exp $
* Copyright (C) 2005 SSAB Oxelsund AB.
*
* This program is free software; you can redistribute it and/or
......@@ -110,6 +110,8 @@ CLogGtk::CLogGtk( void *clog_parent_ctx,
gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(file_close),
gtk_image_new_from_stock( "gtk-close", GTK_ICON_SIZE_MENU));
g_signal_connect(file_close, "activate", G_CALLBACK(activate_exit), this);
gtk_widget_add_accelerator( file_close, "activate", accel_g,
'w', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
GtkMenu *file_menu = (GtkMenu *) g_object_new( GTK_TYPE_MENU, NULL);
gtk_menu_shell_append(GTK_MENU_SHELL(file_menu), file_filter);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7