Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

moved EnumFontFamExProc up for gcc

  • Loading branch information...
commit a7e26946787084849dc259fe081ce521ad0a11a4 1 parent 5402c05
@kvakvs authored
Showing with 14 additions and 13 deletions.
  1. +13 −12 src/fonted/fontlist.cpp
  2. +1 −1  src/zlib-1.2.5/CMakeLists.txt
View
25 src/fonted/fontlist.cpp
@@ -21,6 +21,19 @@ CFontList::~CFontList()
ClearList();
}
+
+int CALLBACK EnumFontFamExProc(
+ ENUMLOGFONTEX *lpelfe, // logical-font data
+ NEWTEXTMETRICEX *lpntme, // physical-font data
+ unsigned int FontType, // type of font
+ LPARAM lParam // application-defined data
+)
+{
+ ((CFontList *)lParam)->FindSortAdd(lpelfe->elfLogFont.lfFaceName);
+ return 1;
+}
+
+
void CFontList::BuildList()
{
HDC hdc = CreateCompatibleDC(0);
@@ -98,15 +111,3 @@ void CFontList::FindSortAdd(char *family)
}
nFonts++;
}
-
-int CALLBACK EnumFontFamExProc(
- ENUMLOGFONTEX *lpelfe, // logical-font data
- NEWTEXTMETRICEX *lpntme, // physical-font data
- unsigned int FontType, // type of font
- LPARAM lParam // application-defined data
-)
-{
- ((CFontList *)lParam)->FindSortAdd(lpelfe->elfLogFont.lfFaceName);
- return 1;
-}
-
View
2  src/zlib-1.2.5/CMakeLists.txt
@@ -118,7 +118,7 @@ set(ZLIB_SRCS
trees.c
uncompr.c
zutil.c
- win32/zlib1.rc
+ #win32/zlib1.rc
)
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION
Please sign in to comment.
Something went wrong with that request. Please try again.