dwindows: os2/dw.c comparison

comparison os2/dw.c @ 2853:c250764b2f32

OS/2: Add return values to dw_window_set_bitmap(_from_data).

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 15 Nov 2022 01:07:55 +0000
parents	ee1cfa7d645e
children	761b7a12b079

comparison

equal deleted inserted replaced

-:5018df4f952e
+:c250764b2f32
 DosFreeMem(BitmapFileBegin);
 return 1;
 }
 /* Internal function to change the button bitmap */
-void _dw_window_set_bitmap(HWND handle, HBITMAP hbm, HDC hdc, HPS hps, unsigned long width, unsigned long height, int depth, HPOINTER icon)
+int _dw_window_set_bitmap(HWND handle, HBITMAP hbm, HDC hdc, HPS hps, unsigned long width, unsigned long height, int depth, HPOINTER icon)
 {
 char tmpbuf[100] = {0};
 WinQueryClassName(handle, 99, (PCH)tmpbuf);
 dw_window_set_data(handle, "_dw_bitmapbutton", DW_POINTER(1));
 /* Make sure we invalidate the button so it redraws */
 WinQueryWindowRect(handle, &rect);
 WinInvalidateRect(handle, &rect, TRUE);
 }
+else
+return DW_ERROR_UNKNOWN;
 /* If we changed the bitmap... */
 {
 Item *item = _dw_box_item(handle);
 _dw_control_size(handle, item->origwidth == DW_SIZE_AUTO ? &item->width : NULL, item->origheight == DW_SIZE_AUTO ? &item->height : NULL);
 /* Queue a redraw on the top-level window */
 _dw_redraw(_dw_toplevel_window(handle), TRUE);
 }
 }
+return DW_ERROR_NONE;
 }
 /*
 * Sets the bitmap used for a given static window.
 * Parameters:
 *       id: An ID to be used to specify the icon,
 *           (pass 0 if you use the filename param)
 *       filename: a path to a file (Bitmap on OS/2 or
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
-*/
+* Returns:
-void API dw_window_set_bitmap(HWND handle, unsigned long id, const char *filename)
+*        DW_ERROR_NONE on success.
+*        DW_ERROR_UNKNOWN if the parameters were invalid.
+*        DW_ERROR_GENERAL if the bitmap was unable to be loaded.
+*/
+int API dw_window_set_bitmap(HWND handle, unsigned long id, const char *filename)
 {
 HBITMAP hbm = 0;
 HPS     hps = 0;
 HDC     hdc = 0;
 HPOINTER icon = 0;
 /* Destroy any old bitmap data */
 _dw_free_bitmap(handle);
 /* If id is non-zero use the resource */
-if ( id )
+if(id)
 {
-hps = WinGetPS( handle );
+hps = WinGetPS(handle);
-hbm = GpiLoadBitmap( hps, NULLHANDLE, id, 0, 0 );
+hbm = GpiLoadBitmap(hps, NULLHANDLE, id, 0, 0);
 WinReleasePS(hps);
 }
-else if ( filename )
+else if(filename)
 {
 char *file = alloca(strlen(filename) + 6);
 if(!file)
-return;
+return DW_ERROR_GENERAL;
 strcpy(file, filename);
 /* check if we can read from this file (it exists and read permission) */
 if(access(file, 04) != 0)
 }
 }
 }
 else
 {
-int len = strlen( file );
+int len = strlen(file);
 if(len > 4)
 {
 if(stricmp(file + len - 4, ".ico") == 0)
 icon = WinLoadFileIcon((PSZ)file, FALSE);
 else
 _dw_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth, DW_CLR_DEFAULT);
 }
 }
 if(!hdc && !icon)
-return;
+return DW_ERROR_GENERAL;
 dw_window_set_data(handle, "_dw_hps", (void *)hps);
 dw_window_set_data(handle, "_dw_hdc", (void *)hdc);
 dw_window_set_data(handle, "_dw_width", (void *)width);
 dw_window_set_data(handle, "_dw_height", (void *)height);
 }
 else
-return;
+return DW_ERROR_UNKNOWN;
 dw_window_set_data(handle, "_dw_bitmap", (void *)hbm);
-_dw_window_set_bitmap(handle, hbm, hdc, hps, width, height, depth, icon);
+return _dw_window_set_bitmap(handle, hbm, hdc, hps, width, height, depth, icon);
 }
 /*
 * Sets the bitmap used for a given static window.
 * Parameters:
 *       id: An ID to be used to specify the icon,
 *           (pass 0 if you use the filename param)
 *       filename: a path to a file (Bitmap on OS/2 or
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
-*/
+* Returns:
-void API dw_window_set_bitmap_from_data(HWND handle, unsigned long id, const char *data, int len)
+*        DW_ERROR_NONE on success.
+*        DW_ERROR_UNKNOWN if the parameters were invalid.
+*        DW_ERROR_GENERAL if the bitmap was unable to be loaded.
+*/
+int API dw_window_set_bitmap_from_data(HWND handle, unsigned long id, const char *data, int len)
 {
 HBITMAP hbm;
 HPS     hps;
 HDC hdc;
 unsigned long width, height;
 int depth;
 /* Destroy any old bitmap data */
 _dw_free_bitmap(handle);
-if ( data )
+if(data)
 {
-file = tmpnam( NULL );
+file = tmpnam(NULL);
-if ( file != NULL )
+if(file != NULL)
 {
-fp = fopen( file, "wb" );
+fp = fopen(file, "wb");
-if ( fp != NULL )
+if(fp != NULL)
 {
-fwrite( data, 1, len, fp );
+fwrite(data, 1, len, fp);
-fclose( fp );
+fclose(fp);
 if(!_dw_load_bitmap_file(file, handle, &hbm, &hdc, &hps, &width, &height, &depth, DW_CLR_DEFAULT))
 {
 /* can't use ICO ? */
-unlink( file );
+unlink(file);
-return;
+return DW_ERROR_GENERAL;
 }
 }
 else
 {
-unlink( file );
+unlink(file);
-return;
+return DW_ERROR_GENERAL;
 }
-unlink( file );
+unlink(file);
 }
 dw_window_set_data(handle, "_dw_hps", (void *)hps);
 dw_window_set_data(handle, "_dw_hdc", (void *)hdc);
 dw_window_set_data(handle, "_dw_width", (void *)width);
 dw_window_set_data(handle, "_dw_height", (void *)height);
 }
 /* If id is non-zero use the resource */
-else if ( id )
+else if(id)
 {
-hps = WinGetPS( handle );
+hps = WinGetPS(handle);
 hbm = GpiLoadBitmap( hps, NULLHANDLE, id, 0, 0 );
 WinReleasePS(hps);
 }
 else
-return;
+return DW_ERROR_UNKNOWN;
 dw_window_set_data(handle, "_dw_bitmap", (void *)hbm);
-_dw_window_set_bitmap(handle, hbm, hdc, hps, width, height, depth, 0);
+return _dw_window_set_bitmap(handle, hbm, hdc, hps, width, height, depth, 0);
 }
 /*
 * Sets the text used for a given window.
 * Parameters:

Mercurial > dwindows

comparison os2/dw.c @ 2853:c250764b2f32