New upstream version 5.3.1Beta2upstream/5.3.1Beta2

1 files changed, 13 insertions, 7 deletions

diff --git a/app/wlib/include/wlib.h b/app/wlib/include/wlib.h
index 88b2806..2bc0396 100644
--- a/app/wlib/include/wlib.h
+++ b/app/wlib/include/wlib.h
@@ -91,8 +91,15 @@ wControl_p wBitmapCreate(wWin_p parent, wWinPix_t x, wWinPix_t y, long options,
                          const struct wIcon_t * iconP);
 wIcon_p wIconCreateBitMap(wWinPix_t w, wWinPix_t h, const char *bits,
                           wDrawColor color);
-wIcon_p wIconCreatePixMap(char *pm[]);
-void wIconSetColor(wIcon_p ip, wDrawColor color);
+#ifndef WINDOWS
+// png's are a string pointer:
+typedef const unsigned char * wIconBitMap_t;
+#else
+// xpm's are an array of string pointers:
+typedef const unsigned char ** wIconBitMap_t;
+#endif
+wIcon_p wIconCreatePixMap(	const wIconBitMap_t  );
+void wIconSetColor(		wIcon_p, wDrawColor );
 
 /*------------------------------------------------------------------------------
  *
@@ -168,9 +175,9 @@ void wInitAppName(char *appName);
 const char * wGetAppLibDir(			void );
 const char * wGetAppWorkDir(			void );
 const char * wGetUserHomeDir( void );
-wBool_t wCheckExecutable(		void );
 
-void wBeep(			void );
+void wSetAudio(bool setting);
+void wBeep( void );
 wBool_t wNotice(		const char *, const char *, const char * );
 int wNotice3(			const char *, const char *, const char *, const char * );
 void wHelp(			const char * );
@@ -228,8 +235,6 @@ void wGetDisplaySize(		wWinPix_t*, wWinPix_t* );
 
 wIcon_p wIconCreateBitMap(	wWinPix_t, wWinPix_t, const char * bits,
                                 wDrawColor );
-wIcon_p wIconCreatePixMap(	char *[] );
-void wIconSetColor(		wIcon_p, wDrawColor );
 void wIconDraw( wDraw_p d, wIcon_p bm, wWinPix_t x, wWinPix_t y );
 
 void wConvertToCharSet(		char *, int );
@@ -280,7 +285,8 @@ wWin_p wWinPopupCreate(		wWin_p, wWinPix_t, wWinPix_t, const char *,
 wWin_p wMain(			int, char *[] );
 void wWinSetBigIcon(		wWin_p, wIcon_p );
 void wWinSetSmallIcon(		wWin_p, wIcon_p );
-void wWinShow(			wWin_p, wBool_t );
+#define DONTGRABFOCUS 0x100
+void wWinShow(			wWin_p, unsigned show );
 wBool_t wWinIsVisible(		wWin_p );
 wBool_t wWinIsMaximized( wWin_p win);
 void wWinGetSize (		wWin_p, wWinPix_t *, wWinPix_t * );