From 2f3f6cdb9ecb7844ff9df64b930881725a2ca033 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Fri, 21 Aug 2015 21:13:19 +0200 Subject: Renaming SetWindowSize to SetWidgetSize as it is generic for all GtkWidgets --- Linux_C_12/cCrossCallWindows_121.c | 6 +++--- Linux_C_12/intrface_121.h | 2 +- clCrossCall_12.dcl | 2 +- clCrossCall_12.icl | 2 +- oswindow.icl | 22 +++++++++++----------- windowCrossCall_12.dcl | 2 +- windowCrossCall_12.icl | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Linux_C_12/cCrossCallWindows_121.c b/Linux_C_12/cCrossCallWindows_121.c index 39cab67..ada2e0b 100644 --- a/Linux_C_12/cCrossCallWindows_121.c +++ b/Linux_C_12/cCrossCallWindows_121.c @@ -996,13 +996,13 @@ void EvalCcRqGETWINDOWSIZE (CrossCallInfo *pcci) /* hwnd; width,height result. * } /* Set the size of windows/controls. */ -void EvalCcRqSETWINDOWSIZE (CrossCallInfo *pcci) /* hwnd, w,h, update; no result. */ +void EvalCcRqSETWIDGETSIZE (CrossCallInfo *pcci) /* hwnd, w,h, update; no result. */ { GtkWidget *element; gint width, height; gboolean update,inclScrollbars; - printf("EvalCcRqSETWINDOWSIZE\n"); + printf("EvalCcRqSETWIDGETSIZE\n"); element = GTK_WIDGET(pcci->p1); width = pcci->p2; height = pcci->p3; @@ -2411,7 +2411,7 @@ OS InstallCrossCallWindows (OS ios) AddCrossCallEntry (newTable, CcRqSETSELECTWINDOW, EvalCcRqSETSELECTWINDOW); AddCrossCallEntry (newTable, CcRqSETWINDOWPOS, EvalCcRqSETWINDOWPOS); AddCrossCallEntry (newTable, CcRqGETWINDOWSIZE, EvalCcRqGETWINDOWSIZE); - AddCrossCallEntry (newTable, CcRqSETWINDOWSIZE, EvalCcRqSETWINDOWSIZE); + AddCrossCallEntry (newTable, CcRqSETWIDGETSIZE, EvalCcRqSETWIDGETSIZE); AddCrossCallEntry (newTable, CcRqACTIVATECONTROL, EvalCcRqACTIVATECONTROL); AddCrossCallEntry (newTable, CcRqACTIVATEWINDOW, EvalCcRqACTIVATEWINDOW); AddCrossCallEntry (newTable, CcRqCHANGEWINDOWCURSOR, EvalCcRqCHANGEWINDOWCURSOR); diff --git a/Linux_C_12/intrface_121.h b/Linux_C_12/intrface_121.h index 5b30d28..10bdd85 100644 --- a/Linux_C_12/intrface_121.h +++ b/Linux_C_12/intrface_121.h @@ -129,7 +129,7 @@ #define CcRqGETWINDOWSIZE 1435 #define CcRqRESTACKWINDOW 1434 #define CcRqSHOWWINDOW 1433 -#define CcRqSETWINDOWSIZE 1432 +#define CcRqSETWIDGETSIZE 1432 #define CcRqSETSELECTWINDOW 1431 #define CcRqSETWINDOWPOS 1430 #define CcRqSETEDITSELECTION 1428 diff --git a/clCrossCall_12.dcl b/clCrossCall_12.dcl index 3140714..7c833bb 100644 --- a/clCrossCall_12.dcl +++ b/clCrossCall_12.dcl @@ -144,7 +144,7 @@ CcRqADDCONTROLTIP :== 1436 /* PA: added to add controls to tooltip areas. */ CcRqGETWINDOWSIZE :== 1435 /* PA: added to retrieve bounding size of windows. */ CcRqRESTACKWINDOW :== 1434 /* PA: added to restack windows. */ CcRqSHOWWINDOW :== 1433 /* PA: added to (hide/show) windows. */ -CcRqSETWINDOWSIZE :== 1432 /* PA: added to resize windows/controls. */ +CcRqSETWIDGETSIZE :== 1432 /* PA: added to resize windows/controls. */ CcRqSETSELECTWINDOW :== 1431 /* PA: added to (en/dis)able windows. */ CcRqSETWINDOWPOS :== 1430 /* PA: added to move windows/controls. */ diff --git a/clCrossCall_12.icl b/clCrossCall_12.icl index 6539748..3d71ead 100644 --- a/clCrossCall_12.icl +++ b/clCrossCall_12.icl @@ -292,7 +292,7 @@ CcRqADDCONTROLTIP :== 1436 /* PA: added to add controls to tooltip areas. */ CcRqGETWINDOWSIZE :== 1435 /* PA: added to retrieve bounding size of windows. */ CcRqRESTACKWINDOW :== 1434 /* PA: added to restack windows. */ CcRqSHOWWINDOW :== 1433 /* PA: added to (hide/show) windows. */ -CcRqSETWINDOWSIZE :== 1432 /* PA: added to resize windows/controls. */ +CcRqSETWIDGETSIZE :== 1432 /* PA: added to resize windows/controls. */ CcRqSETSELECTWINDOW :== 1431 /* PA: added to (en/dis)able windows. */ CcRqSETWINDOWPOS :== 1430 /* PA: added to move windows/controls. */ diff --git a/oswindow.icl b/oswindow.icl index d1027d1..11b88e2 100644 --- a/oswindow.icl +++ b/oswindow.icl @@ -1208,7 +1208,7 @@ osSetWindowViewFrameSize wPtr size tb osSetWindowSize :: !OSWindowPtr !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetWindowSize wPtr size update tb - = winSetWindowSize wPtr size update tb + = winSetWidgetSize wPtr size update tb osSetWindowTitle :: !OSWindowPtr !String !*OSToolbox -> *OSToolbox osSetWindowTitle wPtr title tb @@ -1261,7 +1261,7 @@ osSetCompoundPos _ (parent_x,parent_y) compoundPtr (x,y) _ update tb osSetCompoundSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetCompoundSize _ _ compoundPtr _ size update tb - = winSetWindowSize compoundPtr size update tb + = winSetWidgetSize compoundPtr size update tb // PA: dummy function, required only for Mac osUpdateCompoundScroll :: !OSWindowPtr !OSWindowPtr !OSRect !*OSToolbox -> *OSToolbox @@ -1295,7 +1295,7 @@ osSetSliderControlPos _ (parent_x,parent_y) sliderPtr (x,y) _ update tb osSetSliderControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetSliderControlSize _ _ sliderPtr _ size update tb - = winSetWindowSize sliderPtr size update tb + = winSetWidgetSize sliderPtr size update tb // On radio controls: @@ -1318,7 +1318,7 @@ osSetRadioControlPos _ (parent_x,parent_y) radioPtr (x,y) _ update tb osSetRadioControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetRadioControlSize _ _ radioPtr _ size update tb - = winSetWindowSize radioPtr size update tb + = winSetWidgetSize radioPtr size update tb // On check controls: @@ -1341,7 +1341,7 @@ osSetCheckControlPos _ (parent_x,parent_y) checkPtr (x,y) _ update tb osSetCheckControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetCheckControlSize _ _ checkPtr _ size update tb - = winSetWindowSize checkPtr size update tb + = winSetWidgetSize checkPtr size update tb // On pop up controls: @@ -1364,7 +1364,7 @@ osSetPopUpControlPos _ (parent_x,parent_y) popupPtr (x,y) _ update tb osSetPopUpControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetPopUpControlSize _ _ popupPtr _ size update tb - = winSetWindowSize popupPtr size update tb + = winSetWidgetSize popupPtr size update tb osGetPopUpControlText :: !OSWindowPtr !OSWindowPtr !*OSToolbox -> (!String,!*OSToolbox) osGetPopUpControlText _ ePtr tb @@ -1403,7 +1403,7 @@ osSetEditControlPos _ (parent_x,parent_y) editPtr (x,y) _ update tb osSetEditControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetEditControlSize _ _ editPtr _ size update tb - = winSetWindowSize editPtr size update tb + = winSetWidgetSize editPtr size update tb // Dummy implementation; used on Mac only (windowevent.icl): osIdleEditControl :: !OSWindowPtr !OSRect !OSWindowPtr !*OSToolbox -> *OSToolbox @@ -1430,7 +1430,7 @@ osSetTextControlPos _ (parent_x,parent_y) textPtr (x,y) _ update tb osSetTextControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetTextControlSize _ _ textPtr _ size update tb - = winSetWindowSize textPtr size update tb + = winSetWidgetSize textPtr size update tb // On button controls: @@ -1453,7 +1453,7 @@ osSetButtonControlPos _ (parent_x,parent_y) buttonPtr (x,y) _ update tb osSetButtonControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetButtonControlSize _ _ buttonPtr _ size update tb - = winSetWindowSize buttonPtr size update tb + = winSetWidgetSize buttonPtr size update tb // On custom button controls: @@ -1472,7 +1472,7 @@ osSetCustomButtonControlPos _ (parent_x,parent_y) cPtr (x,y) _ update tb osSetCustomButtonControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetCustomButtonControlSize _ _ cPtr _ size update tb - = winSetWindowSize cPtr size update tb + = winSetWidgetSize cPtr size update tb osCustomButtonControlHasOrigin :== True @@ -1493,7 +1493,7 @@ osSetCustomControlPos _ (parent_x,parent_y) customPtr (x,y) _ update tb osSetCustomControlSize :: !OSWindowPtr !(!Int,!Int) !OSWindowPtr !(!Int,!Int) !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox osSetCustomControlSize _ _ customPtr _ size update tb - = winSetWindowSize customPtr size update tb + = winSetWidgetSize customPtr size update tb osCustomControlHasOrigin :== True diff --git a/windowCrossCall_12.dcl b/windowCrossCall_12.dcl index c7c885d..6354cbb 100644 --- a/windowCrossCall_12.dcl +++ b/windowCrossCall_12.dcl @@ -97,7 +97,7 @@ winFakePaint :: !HWND !*OSToolbox -> *OSToolbox winGetClientSize :: !HWND !*OSToolbox -> (!(!Int,!Int), !*OSToolbox) winGetWindowSize :: !HWND !*OSToolbox -> (!(!Int,!Int), !*OSToolbox) winSetClientSize :: !HWND !(!Int,!Int) !*OSToolbox -> *OSToolbox -winSetWindowSize :: !HWND !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox +winSetWidgetSize :: !HWND !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox winGetWindowPos :: !HWND !*OSToolbox -> (!(!Int,!Int), !*OSToolbox) winSetWindowPos :: !HWND !(!Int,!Int) !Bool !Bool !*OSToolbox -> *OSToolbox winSetScrollRange :: !HWND !Int !Int !Int !Bool !*OSToolbox -> *OSToolbox diff --git a/windowCrossCall_12.icl b/windowCrossCall_12.icl index 0b725d7..0e05c65 100644 --- a/windowCrossCall_12.icl +++ b/windowCrossCall_12.icl @@ -177,9 +177,9 @@ winSetClientSize :: !HWND !(!Int,!Int) !*OSToolbox -> *OSToolbox winSetClientSize hwnd (w,h) tb = snd (issueCleanRequest2 (errorCallback2 "winSetClientSize") (Rq3Cci CcRqSETCLIENTSIZE hwnd w h) tb) -winSetWindowSize :: !HWND !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox -winSetWindowSize hwnd (w,h) update tb - = snd (issueCleanRequest2 (errorCallback2 "winSetWindowSize") (Rq4Cci CcRqSETWINDOWSIZE hwnd w h (toInt update)) tb) +winSetWidgetSize :: !HWND !(!Int,!Int) !Bool !*OSToolbox -> *OSToolbox +winSetWidgetSize hwnd (w,h) update tb + = snd (issueCleanRequest2 (errorCallback2 "winSetWidgetSize") (Rq4Cci CcRqSETWIDGETSIZE hwnd w h (toInt update)) tb) winGetWindowPos :: !HWND !*OSToolbox -> (!(!Int,!Int),!*OSToolbox) winGetWindowPos hwnd tb -- cgit v1.2.3