From 5e89ea04e5c6f228ebeb77991258568805b48557 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Mon, 15 Mar 2010 22:57:31 +0000 Subject: [PATCH] 2010-03-15 23:57 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/contrib/hbwin/wapi_winuser.c + added new PRG function: WAPI_LoadImage( [], , [], [], [], [] ) -> * harbour/contrib/hbwin/Makefile + harbour/contrib/hbwin/win_shell.c + added new PRG function: WIN_ShellNotifyIcon( [], [], [], [], [], [] ) -> * harbour/contrib/hbwin/hbwin.ch + added new constants for WAPI_LoadImage() and WIN_ShellNotifyIcon() --- harbour/ChangeLog | 15 ++++++ harbour/contrib/hbwin/Makefile | 1 + harbour/contrib/hbwin/hbwin.ch | 9 ++++ harbour/contrib/hbwin/wapi_winuser.c | 18 +++++++ harbour/contrib/hbwin/win_shell.c | 77 ++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 harbour/contrib/hbwin/win_shell.c diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c82c369279..f0de78981f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,21 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-03-15 23:57 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/contrib/hbwin/wapi_winuser.c + + added new PRG function: + WAPI_LoadImage( [], , [], + [], [], [] ) -> + + * harbour/contrib/hbwin/Makefile + + harbour/contrib/hbwin/win_shell.c + + added new PRG function: + WIN_ShellNotifyIcon( [], [], [], [], + [], [] ) -> + + * harbour/contrib/hbwin/hbwin.ch + + added new constants for WAPI_LoadImage() and WIN_ShellNotifyIcon() + 2010-03-15 21:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * external/Makefile diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile index 91a280d472..0a7642a5fc 100644 --- a/harbour/contrib/hbwin/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -40,6 +40,7 @@ C_SOURCES := \ win_prn2.c \ win_prn3.c \ win_regc.c \ + win_shell.c \ PRG_SOURCES := \ legacy.prg \ diff --git a/harbour/contrib/hbwin/hbwin.ch b/harbour/contrib/hbwin/hbwin.ch index 462baafa8c..19acbe7218 100644 --- a/harbour/contrib/hbwin/hbwin.ch +++ b/harbour/contrib/hbwin/hbwin.ch @@ -487,6 +487,15 @@ #define WIN_OFN_SHARENOWARN 0x00000001 #define WIN_OFN_SHAREWARN 0x00000000 +/* WAPI_LOADIMAGE() */ +#define WIN_IMAGE_BITMAP 0 +#define WIN_IMAGE_ICON 1 +#define WIN_IMAGE_CURSOR 2 +#define WIN_IMAGE_ENHMETAFILE 3 + +/* window messages WM_* */ +#define WIN_WM_USER 1024 + /* ------------------------------- */ /* Deprecated constants and macros */ /* ------------------------------- */ diff --git a/harbour/contrib/hbwin/wapi_winuser.c b/harbour/contrib/hbwin/wapi_winuser.c index f6bd3329cb..6e41515c6a 100644 --- a/harbour/contrib/hbwin/wapi_winuser.c +++ b/harbour/contrib/hbwin/wapi_winuser.c @@ -403,3 +403,21 @@ HB_FUNC( WAPI_SETACTIVEWINDOW ) hbwapi_SetLastError( GetLastError() ); hb_retptr( hResult ); } +/*----------------------------------------------------------------------*/ +/* WAPI_LoadImage( [], , [], + [], [], [] ) -> */ +HB_FUNC( WAPI_LOADIMAGE ) +{ + void * hString = NULL; + HANDLE hImage; + + hImage = LoadImage( wapi_par_HINSTANCE( 1 ), + HB_ISNUM( 2 ) ? MAKEINTRESOURCE( wapi_par_INT( 2 ) ) : + HB_PARSTR( 2, &hString, NULL ), + HB_ISNUM( 3 ) ? wapi_par_UINT( 3 ) : IMAGE_BITMAP, + wapi_par_INT( 4 ), // desired width + wapi_par_INT( 5 ), // desired height + wapi_par_UINT( 6 ) ); // load flags + hb_strfree( hString ); + wapi_ret_HANDLE( hImage ); +} diff --git a/harbour/contrib/hbwin/win_shell.c b/harbour/contrib/hbwin/win_shell.c new file mode 100644 index 0000000000..fbc97f5f3f --- /dev/null +++ b/harbour/contrib/hbwin/win_shell.c @@ -0,0 +1,77 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * Windows API functions (shellapi.h - shell32.dll) + * + * Copyright 2010 Przemyslaw Czerpak + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ + +#include "hbwapi.h" + +/* WIN_ShellNotifyIcon( [], [], [], [], + [], [] ) -> */ +HB_FUNC( WIN_SHELLNOTIFYICON ) +{ + NOTIFYICONDATA tnid; + + memset( &tnid, 0, sizeof( tnid ) ); + tnid.cbSize = sizeof( tnid ); + tnid.hWnd = wapi_par_HWND( 1 ); + tnid.uID = wapi_par_UINT( 2 ); + tnid.uCallbackMessage = wapi_par_UINT( 3 ); + if( tnid.uCallbackMessage ) + tnid.uFlags = NIF_MESSAGE; + tnid.hIcon = wapi_par_HICON( 4 ); + if( tnid.hIcon ) + tnid.uFlags |= NIF_ICON; + if( HB_ITEMCOPYSTR( hb_param( 5, HB_IT_ANY ), + tnid.szTip, HB_SIZEOFARRAY( tnid.szTip ) ) > 0 ) + tnid.uFlags |= NIF_TIP; + + wapi_ret_L( Shell_NotifyIcon( HB_ISLOG( 6 ) ? + ( hb_parl( 6 ) ? NIM_ADD : NIM_DELETE ) : NIM_MODIFY, &tnid ) ); +}