1 files changed, 22 insertions, 22 deletions

diff --git a/app/wlib/gtklib/window.c b/app/wlib/gtklib/window.c
index 1468c89..16a21a5 100644
--- a/app/wlib/gtklib/window.c
+++ b/app/wlib/gtklib/window.c
@@ -124,8 +124,8 @@ static void getWinSize(wWin_p win, const char * nameStr)
 
     GdkRectangle monitor_dimensions = getMonitorDimensions(GTK_WIDGET(win->gtkwin));
 
-    wPos_t maxDisplayWidth = monitor_dimensions.width-10;
-    wPos_t maxDisplayHeight = monitor_dimensions.height-50;
+    wWinPix_t maxDisplayWidth = monitor_dimensions.width-10;
+    wWinPix_t maxDisplayHeight = monitor_dimensions.height-50;
 
 
 
@@ -170,8 +170,8 @@ static void saveSize(wWin_p win)
             gtk_widget_get_visible(GTK_WIDGET(win->gtkwin))) {
         char pos_s[20];
 
-        sprintf(pos_s, "%d %d", win->w,
-                win->h-(BORDERSIZE + ((win->option&F_MENUBAR)?MENUH:0)));
+        sprintf(pos_s, "%ld %ld", win->w,
+                (win->h-(BORDERSIZE + ((win->option&F_MENUBAR)?MENUH:0))));
         wPrefSetString(SECTIONWINDOWSIZE, win->nameStr, pos_s);
     }
 }
@@ -260,11 +260,11 @@ static void savePos(wWin_p win)
 
 void wWinGetSize(
     wWin_p win,		/* Window */
-    wPos_t * width,		/* Returned window width */
-    wPos_t * height)	/* Returned window height */
+    wWinPix_t * width,		/* Returned window width */
+    wWinPix_t * height)	/* Returned window height */
 {
     GtkRequisition requisition;
-    wPos_t w, h;
+    wWinPix_t w, h;
     gtk_widget_size_request(win->gtkwin, &requisition);
     w = win->w;
     h = win->h;
@@ -293,8 +293,8 @@ void wWinGetSize(
 
 void wWinSetSize(
     wWin_p win,		/* Window */
-    wPos_t width,		/* Window width */
-    wPos_t height)		/* Window height */
+    wWinPix_t width,		/* Window width */
+    wWinPix_t height)		/* Window height */
 {
     win->busy = TRUE;
     win->w = width;
@@ -561,10 +561,10 @@ const char * wWinGetTitle(
 
 void wWinClear(
     wWin_p win,
-    wPos_t x,
-    wPos_t y,
-    wPos_t width,
-    wPos_t height)
+    wWinPix_t x,
+    wWinPix_t y,
+    wWinPix_t width,
+    wWinPix_t height)
 {
 }
 
@@ -858,7 +858,7 @@ static gint window_char_event(
     }
 }
 
-void wSetGeometry(wWin_p win, int min_width, int max_width, int min_height, int max_height, int base_width, int base_height, double aspect_ratio ) {
+void wSetGeometry(wWin_p win, wWinPix_t min_width, wWinPix_t max_width, wWinPix_t min_height, wWinPix_t max_height, wWinPix_t base_width, wWinPix_t base_height, double aspect_ratio ) {
 	GdkGeometry hints;
 	GdkWindowHints hintMask = GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE;
     hints.min_width = min_width;
@@ -913,8 +913,8 @@ void wSetGeometry(wWin_p win, int min_width, int max_width, int min_height, int
 static wWin_p wWinCommonCreate(
     wWin_p parent,
     int winType,
-    wPos_t x,
-    wPos_t y,
+    wWinPix_t x,
+    wWinPix_t y,
     const char * labelStr,
     const char * nameStr,
     long option,
@@ -999,7 +999,7 @@ static wWin_p wWinCommonCreate(
             gtk_widget_set_size_request(w->menubar, w->w-20, MENUH);
         }
     }
-    int scr_w, scr_h;
+    wWinPix_t scr_w, scr_h;
 	wGetDisplaySize(&scr_w, &scr_h);
 	if (scr_w < MIN_WIN_WIDTH) scr_w = MIN_WIN_WIDTH+10;
 	if (scr_h < MIN_WIN_HEIGHT) scr_h = MIN_WIN_HEIGHT;
@@ -1092,8 +1092,8 @@ static wWin_p wWinCommonCreate(
 
 wWin_p wWinMainCreate(
     const char * name,		/* Application name */
-    wPos_t x,				/* Initial window width */
-    wPos_t y,				/* Initial window height */
+    wWinPix_t x,				/* Initial window width */
+    wWinPix_t y,				/* Initial window height */
     const char * helpStr,	/* Help topic string */
     const char * labelStr,	/* Window title */
     const char * nameStr,	/* Window name */
@@ -1142,8 +1142,8 @@ wWin_p wWinMainCreate(
 
 wWin_p wWinPopupCreate(
     wWin_p parent,
-    wPos_t x,
-    wPos_t y,
+    wWinPix_t x,
+    wWinPix_t y,
     const char * helpStr,
     const char * labelStr,
     const char * nameStr,
@@ -1189,7 +1189,7 @@ void wExit(
         }
     }
 
-    wPrefFlush();
+    wPrefFlush("");
 
     if (gtkMainW && gtkMainW->winProc != NULL) {
         gtkMainW->winProc(gtkMainW, wQuit_e, NULL, gtkMainW->data);