Changeset 136 for branches/v2.9_Lars/classes

Timestamp:

Dec 9, 2023, 5:11:21 PM (23 months ago)

Author:

erdmann

Message:

merging from trunk

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• classes/c/c_mm/mmfolder.c (modified) (1 diff)
• classes/mm-progs/videoplayer/makefile (modified) (1 diff)
• classes/mm-progs/volume/makefile (modified) (1 diff)

branches/v2.9_Lars/classes/c/c_mm/mmfolder.c

@@ -585 +585 @@
                   else if(_somIsA(wpObject, cwBitmapClass)) {
                     hbm=MMBitmap_cwmmQuerySmallBitmapHandle( (MMBitmap*) wpObject, ulIconSize);
-                    pBmpInfoHeader2=(PBITMAPINFOHEADER2)_wpQueryBitmapInfoHeader((MMBitmap*)wpObject);
+                    pBmpInfoHeader2=(PBITMAPINFOHEADER2)_cwmmQueryBitmapInfoHeader((MMBitmap*)wpObject);
                   }
                   if(hbm)

branches/v2.9_Lars/classes/mm-progs/videoplayer/makefile

@@ -41 +41 @@
         -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

branches/v2.9_Lars/classes/mm-progs/volume/makefile

@@ -29 +29 @@
         -rm *.ini
         -rm $(LIBDIR)/*.obj
+        -rm *.def
 
 cleaner: