0.0.0.7 update

- Added some Ansi and Wide versions of functions
- Removed use of CTEXT macro
- Recompiled all controls and examples against updated ModernUI library

Controls/ModernUI_Animation/ModernUI_Animation.asm

@@ -2,7 +2,7 @@
 ;
 ; ModernUI Control - ModernUI_Animation
 ;
-; Copyright (c) 2019 by fearless
+; Copyright (c) 2023 by fearless
 ;
 ; All Rights Reserved
 ;

Controls/ModernUI_Animation/ModernUI_Animation.h

@@ -0,0 +1,181 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef _MSC_VER     // MSVC compiler
+#define MUI_EXPORT __declspec(dllexport) __stdcall
+#else
+#define MUI_EXPORT
+#endif
+
+
+//------------------------------------------------------------------------------
+// ModernUI_Animation Prototypes
+//------------------------------------------------------------------------------
+void MUI_EXPORT MUIAnimationRegister(); // Use 'ModernUI_Animation' as class in RadASM custom class control
+HWND MUI_EXPORT MUIAnimationCreateHWND hWndParent, DWORD xpos, DWORD ypos, DWORD dwWidth, DWORD dwHeight, DWORD dwResourceID, DWORD dwStyle);
+unsigned int MUI_EXPORT MUIAnimationSetProperty(HWND hModernUI_Animation, DWORD dwProperty, DWORD dwPropertyValue);
+unsigned int MUI_EXPORT MUIAnimationGetProperty(HWND hModernUI_Animation, DWORD dwProperty);
+
+// Add image handle (bitmap, icon or png) as an animation frame image
+bool MUI_EXPORT MUIAnimationAddFrame(HWND hModernUI_Animation, DWORD dwImageType, POINTER *lpMuiAnimationFrameStruct);
+bool MUI_EXPORT MUIAnimationAddFrames(HWND hModernUI_Animation, DWORD dwImageType, POINTER *lpArrayMuiAnimationFrameStructs, DWORD dwCount);
+// Load an image resource id (bitmap, icon or png) as an animation frame image
+bool MUI_EXPORT MUIAnimationLoadFrame(HWND hModernUI_Animation, DWORD dwImageType, POINTER *lpMuiAnimationFrameStruct);
+bool MUI_EXPORT MUIAnimationLoadFrames(HWND hModernUI_Animation, DWORD dwImageType, POINTER *lpArrayMuiAnimationFrameStructs, DWORD dwCount);
+// Create a series of animation frames images from a sprite sheet
+bool MUI_EXPORT MUIAnimationAddSpriteSheet(HWND hModernUI_Animation, DWORD dwImageType, HANDLE hImageSpriteSheet, DWORD dwSpriteCount, POINTER * lpFrameTimes, DWORD dwFrameTimeSize, DWORD dwFrameTimeType);
+bool MUI_EXPORT MUIAnimationLoadSpriteSheet(HWND hModernUI_Animation, DWORD dwImageType, DWORD idResSpriteSheet, DWORD dwSpriteCount, POINTER * lpFrameTimes, DWORD dwFrameTimeSize, DWORD dwFrameTimeType);
+// Insert image handle as an animation frame image
+bool MUI_EXPORT MUIAnimationInsertFrame(HWND hModernUI_Animation, DWORD dwImageType, POINTER *lpMuiAnimationFrameStruct, DWORD dwFrameIndex, BOOL bInsertBefore);
+bool MUI_EXPORT MUIAnimationInsertFrames(HWND hModernUI_Animation, DWORD dwImageType, POINTER *lpArrayMuiAnimationFrameStructs, DWORD dwCount, DWORD dwFrameIndex, BOOL bInsertBefore);
+
+// Frame Operations
+bool MUI_EXPORT MUIAnimationClear(HWND hModernUI_Animation);
+bool MUI_EXPORT MUIAnimationDeleteFrames(HWND hModernUI_Animation);
+bool MUI_EXPORT MUIAnimationDeleteFrame(HWND hModernUI_Animation, DWORD dwFrameIndex);
+bool MUI_EXPORT MUIAnimationMoveFrame(HWND hModernUI_Animation, DWORD dwFrameIndexFrom, DWORD dwFrameIndexTo);
+bool MUI_EXPORT MUIAnimationCopyFrame(HWND hModernUI_Animation, DWORD dwFrameIndexFrom, DWORD dwFrameIndexTo);
+bool MUI_EXPORT MUIAnimationCropFrame(HWND hModernUI_Animation, DWORD dwFrameIndex, LPRECT *lpRect);
+bool MUI_EXPORT MUIAnimationCropFrames(HWND hModernUI_Animation, LPRECT *lpRect);
+
+// Save frames to file
+bool MUI_EXPORT MUIAnimationExportSpriteSheet(HWND hModernUI_Animation, DWORD dwImageType, LPCSTR *lpszSpritesheetFilename, LPCSTR *lpszFrameTimesFilename);
+bool MUI_EXPORT MUIAnimationExportFrame(HWND hModernUI_Animation, DWORD dwImageType, LPCSTR *lpszFrameFilename, DWORD dwFrameIndex);
+bool MUI_EXPORT MUIAnimationExportFrames(HWND hModernUI_Animation, DWORD dwImageType, LPCSTR *lpszFrameFolder, LPCSTR *lpszFilePrefix, BOOL bFileFrameNo);
+
+// Load frames from file
+bool MUI_EXPORT MUIAnimationImportSpriteSheet(HWND hModernUI_Animation, DWORD dwImageType, LPCSTR *lpszSpritesheetFilename, LPCSTR *lpszFrameTimesFilename);
+bool MUI_EXPORT MUIAnimationImportFrame(HWND hModernUI_Animation, DWORD dwImageType, LPCSTR *lpszFrameFilename, DWORD dwFrameIndex);
+
+// Frame Information
+bool MUI_EXPORT MUIAnimationGetFrameInfo(HWND hModernUI_Animation, DWORD dwFrameIndex, POINTER *lpMuiAnimationFrameStruct);
+HANDLE MUI_EXPORT MUIAnimationGetFrameImage(HWND hModernUI_Animation, DWORD dwFrameIndex, POINTER *lpdwFrameType);
+unsigned int MUIAnimationGetFrameTime(HWND hModernUI_Animation, DWORD dwFrameIndex);
+
+bool MUI_EXPORT MUIAnimationSetFrameInfo(HWND hModernUI_Animation, DWORD dwFrameIndex, POINTER *lpMuiAnimationFrameStruct);
+bool MUI_EXPORT MUIAnimationSetFrameImage(HWND hModernUI_Animation, DWORD dwFrameIndex, DWORD dwFrameType, HANDLE hFrameImage);
+bool MUI_EXPORT MUIAnimationSetFrameTime(HWND hModernUI_Animation, DWORD dwFrameIndex, DWORD dwFrameTime);
+
+// Animation control
+void MUI_EXPORT MUIAnimationStart(HWND hModernUI_Animation);
+void MUI_EXPORT MUIAnimationStop(HWND hModernUI_Animation);
+void MUI_EXPORT MUIAnimationPause(HWND hModernUI_Animation);
+void MUI_EXPORT MUIAnimationResume(HWND hModernUI_Animation);
+void MUI_EXPORT MUIAnimationStep(HWND hModernUI_Animation, BOOL bReverse);
+void MUI_EXPORT MUIAnimationSpeed(HWND hModernUI_Animation, FLOAT fSpeedFactor);
+
+void MUI_EXPORT MUIAnimationSetDefaultTime(HWND hModernUI_Animation, DWORD dwDefaultFrameTime);
+
+void MUI_EXPORT MUIAnimationNotifyCallback(HWND hModernUI_Animation, POINTER *lpNMAnimationStruct);
+
+
+//------------------------------------------------------------------------------
+// ModernUI_Animation Messages
+//------------------------------------------------------------------------------
+#define MUIAM_ADDFRAME              WM_USER+1752 // wParam = dwImageType, lParam = lpAnimationFrameStruct
+#define MUIAM_LOADFRAME             WM_USER+1751 // wParam = dwImageType, lParam = idResImage
+#define MUIAM_START                 WM_USER+1750 // wParam & lParam = NULL
+#define MUIAM_STOP                  WM_USER+1749 // wParam & lParam = NULL
+#define MUIAM_STEP                  WM_USER+1748 // wParam = bReverse
+#define MUIAM_SPEED                 WM_USER+1745 // wParam = dwSpeedFactor
+
+
+//------------------------------------------------------------------------------
+// ModernUI_Animation Notifications
+//------------------------------------------------------------------------------
+#define MUIAN_STOP                  0   // Animation is stopped
+#define MUIAN_START                 1   // Animation has started
+#define MUIAN_PAUSE                 2   // Animation is paused 
+#define MUIAN_RESUME                3   // Animation has resumed
+#define MUIAN_STEP                  4   // Animation stepping 
+#define MUIAN_FRAME                 5   // Occurs every frame shown
+
+
+//------------------------------------------
+// ModernUI_Animation Structures
+//------------------------------------------
+IFNDEF MUI_ANIMATION_FRAME          // lpMuiAnimationFrameStruct
+typedef struct MUI_ANIMATION_FRAME
+{
+    DWORD dwFrameType,              // DWORD. Image type: MUIAIT_BMP, MUIAIT_ICO, MUIAIT_PNG
+    DWORD dwFrameImage,             // DWORD/HANDLE. Handle or resource ID of image: Bitmap, Icon or PNG (RT_BITMAP, RT_ICON or RT_RCDATA resource)
+    DWORD dwFrameTime,              // DWORD. Frame time in milliseconds
+    DWORD lParam                    // DWORD. Custom user specified value
+}
+ENDIF
+
+IFNDEF MUI_ANIMATION_FT_FULL        // For array of frame times for every frame in array
+typedef struct MUI_ANIMATION_FT_FULL
+{
+    DWORD dwFrameTime
+}
+ENDIF
+
+IFNDEF MUI_ANIMATION_FT_COMPACT     // For array of frame times for specified frame indexes in each entry
+typedef struct MUI_ANIMATION_FT_COMPACT
+{
+    DWORD dwFrameID,
+    DWORD dwFrameTime
+}
+ENDIF
+
+IFNDEF NM_ANIMATION_FRAME           // ModernUI_Animation Notification Item
+typedef struct NM_ANIMATION_FRAME
+{
+    DWORD dwFrameIndex,             // DWORD. Frame index
+    DWORD dwFrameType,              // DWORD. Image type: MUIAIT_BMP, MUIAIT_ICO, MUIAIT_PNG
+    DWORD dwFrameImage,             // HANDLE. Handle of image: Bitmap, Icon or PNG
+    DWORD dwFrameTime,              // DWORD. Frame time in milliseconds
+    DWORD lParam                    // DWORD. Custom user specified value
+}
+ENDIF
+
+IFNDEF NM_ANIMATION                 // Notification Message Structure for ModernUI_Animation
+typedef struct NM_ANIMATION
+{
+    NMHDR hdr,
+    NM_ANIMATION_FRAME item
+}
+ENDIF
+
+
+//------------------------------------------
+// ModernUI_Animation Styles
+// 
+//------------------------------------------
+#define MUIAS_NOSTRETCH             0x0
+#define MUIAS_NOCENTER              0x1
+#define MUIAS_CENTER                0x2
+#define MUIAS_STRETCH               0x3
+#define MUIAS_LCLICK                0x4
+#define MUIAS_RCLICK                0x8
+#define MUIAS_HAND                  0x10
+#define MUIAS_CONTROL               0x20
+
+//------------------------------------------------------------------------------
+// ModernUI_Animation Properties: Use with MUIAnimationSetProperty / 
+// MUIAnimationGetProperty or MUI_SETPROPERTY / MUI_GETPROPERTY msgs
+//------------------------------------------------------------------------------
+#define AnimationBackColor          0   // RGBCOLOR. Background color of animation
+#define AnimationBorderColor        4   // RGBCOLOR. Border color of animation
+#define AnimationLoop               8   // BOOL. Loop animation back to start. Default is TRUE
+#define AnimationNotifications      12  // BOOL. Allow notifications via WM_NOTIFY. Default is TRUE
+#define AnimationNotifyCallback     16  // DWORD. Address of custom notifications callback function (MUIAnimationNotifyCallback)
+#define AnimationDllInstance        20  // DWORD. Instance of DLL if using control in a DLL
+#define AnimationParam              24  // DWORD. Custom user specified value
+
+// Animation Image Type:
+#define MUIAIT_NONE                 0
+#define MUIAIT_BMP                  1
+#define MUIAIT_ICO                  2
+#define MUIAIT_PNG                  3
+
+// Animation Frame Type:
+#define MUIAFT_FULL                 0
+#define MUIAFT_COMPACT              1
+
+
+#ifdef __cplusplus
+}
+#endif

Controls/ModernUI_Animation/ModernUI_Animation.inc

@@ -2,7 +2,7 @@
 ;
 ; ModernUI Control - ModernUI_Animation
 ;
-; Copyright (c) 2019 by fearless
+; Copyright (c) 2023 by fearless
 ;
 ; All Rights Reserved
 ;

Controls/ModernUI_Animation/ModernUI_Animation.rap

@@ -64,11 +64,11 @@ Group=Assembly,Misc
 [AutoLoad]
 AutoLoad=2,1,3,4,5,6,7
 [Size]
-3=0,0,0,0,2986
-4=0,0,0,0,314
-1=0,0,0,0,90590
-2=0,0,0,0,1196
-6=0,0,0,0,82
+3=0,0,0,0,537
+4=0,0,0,0,109
+1=0,0,0,0,144
+2=0,0,0,0,144
+6=0,0,0,0,111
 5=0,0,0,0,503
 7=0,0,0,0,0
 [VersionControl]
@@ -81,7 +81,7 @@ MilestoneOnTime=2
 MilestoneOnDate=0
 MilestoneOnDateWhen=1
 MilestoneOnDateStatus=0
-MilestoneOnDateDate=23
+MilestoneOnDateDate=18
 MilestoneOnDateTimeYear=2019
 MilestoneOnDateTimeMonth=7
 MilestoneOnDateTimeDate=1
@@ -105,7 +105,7 @@ ProductVer2Range=0
 ProductVer3Range=0
 ProductVer4Range=0
 [PTimer]
-PTimer=71247559
+PTimer=77268283
 [GroupExpand]
 GroupExpand=1,1,0
 [BookMark]
@@ -125,19 +125,20 @@ GroupExpand=1,1,0
 2=
 1=
 [Collapse]
-1=,,,,,16384,,
+1=,,,,,,,
 2=
 6=
 5=
 4=
 3=
 7=
 [Find]
-1="GdipDrawImage"
+1="fld"
 2="finit"
-3="SPINNER_USE_TIMERQUEUE"
-4="@AnimationFrameTimeDefault"
-5="MUIAnimationLoadSpriteSheet"
-6="MUIAIT_NONE,MUIAIT_BMP,MUIAIT_ICO,MUIAIT_PNG"
-7="_MUI_AnimationGetFrameImage"
-8="ANIMATION_FRAME"
+3="GdipDrawImage"
+4="SPINNER_USE_TIMERQUEUE"
+5="@AnimationFrameTimeDefault"
+6="MUIAnimationLoadSpriteSheet"
+7="MUIAIT_NONE,MUIAIT_BMP,MUIAIT_ICO,MUIAIT_PNG"
+8="_MUI_AnimationGetFrameImage"
+9="ANIMATION_FRAME"

Controls/ModernUI_Button/ModernUI_Button.asm

@@ -2,11 +2,7 @@
 ;
 ; ModernUI Control - ModernUI_Button
 ;
-; Copyright (c) 2018 by fearless
-;
-; All Rights Reserved
-;
-; http://www.LetTheLight.in
+; Copyright (c) 2023 by fearless
 ;
 ; http://github.com/mrfearless/ModernUI
 ;

Controls/ModernUI_Button/ModernUI_Button.inc

@@ -2,11 +2,7 @@
 ;
 ; ModernUI Control - ModernUI_Button
 ;
-; Copyright (c) 2018 by fearless
-;
-; All Rights Reserved
-;
-; http://www.LetTheLight.in
+; Copyright (c) 2023 by fearless
 ;
 ; http://github.com/mrfearless/ModernUI
 ;

Controls/ModernUI_Button/ModernUI_Button.rap

@@ -76,7 +76,7 @@ MilestoneOnTime=2
 MilestoneOnDate=0
 MilestoneOnDateWhen=1
 MilestoneOnDateStatus=0
-MilestoneOnDateDate=15
+MilestoneOnDateDate=18
 MilestoneOnDateTimeYear=2016
 MilestoneOnDateTimeMonth=5
 MilestoneOnDateTimeDate=30
@@ -100,18 +100,18 @@ ProductVer2Range=0
 ProductVer3Range=0
 ProductVer4Range=0
 [PTimer]
-PTimer=419071088
+PTimer=456695932
 [Collapse]
-1=4726848,,1006649598,,581632,131072,,131072,16787456,8456,,1063424
+1=20971520,,939524215,,17358848,,33554432,131072,16787456,270592,34816,14336
 2=
 3=
 4=
 5=
 6=
 7=
 [Size]
-1=0,0,0,0,112437
-2=0,0,0,0,36986
+1=0,0,0,0,154
+2=0,0,0,0,154
 3=0,0,0,0,1323
 4=0,0,0,0,3372
 5=0,0,0,0,8385
@@ -133,13 +133,13 @@ GroupExpand=1,1,0
 [BreakPoint]
 0=
 [Find]
-1="@ButtonBrush"
-2="@ButtonDPI"
-3="PUBLIC "
-4="PRIVATE "
-5="MUI_BUTTON_DEFAULT_THEME"
-6="TextExtent"
-7=";"
-8="@"
-9="EQU "
-10="EQU"
+1="WS_CLIP"
+2="MUIBM_NOTIFY"
+3="COLOR"
+4="@ButtonBrush"
+5="@ButtonDPI"
+6="PUBLIC "
+7="PRIVATE "
+8="MUI_BUTTON_DEFAULT_THEME"
+9="TextExtent"
+10=";"

Controls/ModernUI_CaptionBar/ModernUI_CaptionBar.asm

@@ -2,11 +2,7 @@
 ;
 ; ModernUI Control - ModernUI_CaptionBar
 ;
-; Copyright (c) 2018 by fearless
-;
-; All Rights Reserved
-;
-; http://www.LetTheLight.in
+; Copyright (c) 2023 by fearless
 ;
 ; http://github.com/mrfearless/ModernUI
 ;

Controls/ModernUI_CaptionBar/ModernUI_CaptionBar.inc

@@ -2,11 +2,7 @@
 ;
 ; ModernUI Control - ModernUI_CaptionBar
 ;
-; Copyright (c) 2018 by fearless
-;
-; All Rights Reserved
-;
-; http://www.LetTheLight.in
+; Copyright (c) 2023 by fearless
 ;
 ; http://github.com/mrfearless/ModernUI
 ;