Commit a2686d9b authored by Claes Sjofors's avatar Claes Sjofors

XttGraph and XttMultview options HideDecorations and Dialog added

parent 15f16cdd
......@@ -111,6 +111,26 @@ SObject pwrb:Type
Attr Value = 64
EndBody
EndObject
!/**
! Decorations.
!*/
Object HideDecorations $Bit
Body SysBody
Attr PgmName = "HideDecorations"
Attr Text = "HideDecorations"
Attr Value = 128
EndBody
EndObject
!/**
! Dialog window.
!*/
Object Dialog $Bit
Body SysBody
Attr PgmName = "Dialog"
Attr Text = "Dialog"
Attr Value = 256
EndBody
EndObject
EndObject
EndSObject
......
......@@ -121,6 +121,26 @@ SObject pwrb:Type
Attr Value = 64
EndBody
EndObject
!/**
! Decorations.
!*/
Object HideDecorations $Bit
Body SysBody
Attr PgmName = "HideDecorations"
Attr Text = "HideDecorations"
Attr Value = 128
EndBody
EndObject
!/**
! Dialog window.
!*/
Object Dialog $Bit
Body SysBody
Attr PgmName = "Dialog"
Attr Text = "Dialog"
Attr Value = 256
EndBody
EndObject
EndObject
EndSObject
......
......@@ -332,6 +332,15 @@ XttGeGtk::XttGeGtk( GtkWidget *xg_parent_wid, void *xg_parent_ctx, const char *x
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
&geometry, GDK_HINT_ASPECT);
if ( options & ge_mOptions_HideDecorations)
gtk_window_set_decorated( GTK_WINDOW(toplevel), FALSE);
if ( options & ge_mOptions_Dialog) {
gtk_window_set_type_hint( GTK_WINDOW(toplevel), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_widget_set_size_request( GTK_WIDGET(toplevel), window_width, window_height);
gtk_window_set_resizable( GTK_WINDOW(toplevel), FALSE);
}
g_signal_connect( toplevel, "delete_event", G_CALLBACK(delete_event), this);
g_signal_connect( toplevel, "destroy", G_CALLBACK(destroy_event), this);
g_signal_connect( toplevel, "focus-in-event", G_CALLBACK(action_inputfocus), this);
......
......@@ -227,6 +227,15 @@ XttMultiViewGtk::XttMultiViewGtk( GtkWidget *mv_parent_wid, void *mv_parent_ctx,
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
&geometry, GDK_HINT_ASPECT);
if ( mv.Options & pwr_mMultiViewOptionsMask_HideDecorations)
gtk_window_set_decorated( GTK_WINDOW(toplevel), FALSE);
if ( mv.Options & pwr_mMultiViewOptionsMask_Dialog) {
gtk_window_set_type_hint( GTK_WINDOW(toplevel), GDK_WINDOW_TYPE_HINT_DIALOG);
gtk_widget_set_size_request( GTK_WIDGET(toplevel), window_width, window_height);
gtk_window_set_resizable( GTK_WINDOW(toplevel), FALSE);
}
g_signal_connect( toplevel, "delete_event", G_CALLBACK(delete_event), this);
g_signal_connect( toplevel, "destroy", G_CALLBACK(destroy_event), this);
g_signal_connect( toplevel, "focus-in-event", G_CALLBACK(action_inputfocus), this);
......
......@@ -217,7 +217,9 @@ typedef enum {
ge_mOptions_Invisible = 1 << 4,
ge_mOptions_Embedded = 1 << 5,
ge_mOptions_IsMain = 1 << 6,
ge_mOptions_HideCloseButton = 1 << 7
ge_mOptions_HideCloseButton = 1 << 7,
ge_mOptions_HideDecorations = 1 << 8,
ge_mOptions_Dialog = 1 << 9
} ge_mOptions;
class XNav;
......
......@@ -273,7 +273,7 @@ dcli_tCmdTable xnav_command_table[] = {
"/NAVIGATOR", "/CENTER", "/OBJECT", "/NEW",
"/INSTANCE", "/COLLECT", "/FOCUS", "/INPUTEMPTY", "/MAIN",
"/ENTRY", "/TITLE", "/ACCESS", "/CLASSGRAPH", "/PARENT", "/PWINDOW",
"/PINSTANCE", "/BYPASS",
"/PINSTANCE", "/BYPASS",
"/CLOSEBUTTON", "/TARGET", "/TRIGGER", "/TYPE", "/FTYPE",
"/FULLSCREEN", "/MAXIMIZE", "/FULLMAXIMIZE", "/ICONIFY", "/HIDE",
"/XPOSITION", "/YPOSITION", ""}
......@@ -8579,6 +8579,10 @@ int XNav::exec_xttgraph( pwr_tObjid xttgraph, char *instance,
options |= ge_mOptions_FullMaximize;
if ( xttgraph_o.Options & pwr_mXttGraphOptionsMask_Iconify)
options |= ge_mOptions_Iconify;
if ( xttgraph_o.Options & pwr_mXttGraphOptionsMask_HideDecorations)
options |= ge_mOptions_HideDecorations;
if ( xttgraph_o.Options & pwr_mXttGraphOptionsMask_Dialog)
options |= ge_mOptions_Dialog;
open_graph( xttgraph_o.Title, action, scrollbars,
menu, navigator, xttgraph_o.Width,
......
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