Changeset 11 for trunk/settings.h

Timestamp:

Feb 21, 2018, 1:01:16 AM (7 years ago)

Author:

Gregg Young

Message:

This changes the bitmap save from an internal bitmap or the use of MMOS2 to using GBM. The save code was adapted from GBMv2 by Heiko Nitzsche and Andy Keys. Also fixed the failure of the file dialog to update the file extension name on the first save after a format changes. Non English resources haven't been updated yet. Several more build error warning fixes.

File:

• trunk/settings.h (modified) (4 diffs)

trunk/settings.h

@@ -35 +35 @@
 
 enum { SAVESTYLE_CLIPBOARD, SAVESTYLE_FILE, };
+#if 0
 enum {
     BMF_12, BMF_16, BMF_20, BMF_OS13, BMF_OS20, BMF_TIF, BMF_TIFU,
@@ -40 +41 @@
     BMF_INVALID
 };
+#else
+enum {
+    BMF_JPG, BMF_PNG, BMF_OS20, BMF_TIF, BMF_TGA, BMF_PCX, BMF_GIF,
+    BMF_PBM, BMF_JP2, BMF_JBG, BMF_RAW, BMF_DIB,
+    BMF_INVALID
+};
+#endif
 enum { FSS_PROMPT, FSS_NUMFILES, FSS_FORCEFILE, };
 
@@ -180 +188 @@
 // ** inline funcs ******************************************************** /*FOLD00*/
 
-inline VOID Settings :: SetWindowData (SWP *pswp, BOOL f = TRUE)
+inline VOID Settings :: SetWindowData (SWP *pswp, BOOL f)
 {
     // FIXME puke, yukk, choke! get this flag thing away! do it better!
@@ -196 +204 @@
 }
 
-inline thth_MMIO *Settings :: GetMMIO( VOID ) { return mmio; }
+thth_MMIO *Settings :: GetMMIO( VOID ) { return mmio; }
 
 // ************************************************************************