workaround for IupFontDlg in Windows 8

kmx · Nov 12, 2012 · 1bf3f0a · 1bf3f0a
1 parent 733bf49
commit 1bf3f0a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/src/win/iupwin_fontdlg.c b/src/win/iupwin_fontdlg.c
@@ -98,9 +98,14 @@ static int winFontDlgPopup(Ihandle* ih, int x, int y)
 
   choosefont.hwndOwner = parent;
   choosefont.lpLogFont = &logfont;
-  choosefont.Flags = CF_SCREENFONTS | CF_EFFECTS | CF_INITTOLOGFONTSTRUCT | CF_ENABLEHOOK;
+  choosefont.Flags = CF_SCREENFONTS | CF_EFFECTS | CF_INITTOLOGFONTSTRUCT;
   choosefont.lCustData = (LPARAM)ih;
-  choosefont.lpfnHook = (LPCFHOOKPROC)winFontDlgHookProc;
+
+  if (!iupwinIs8OrNew() || iupAttribGetBoolean(ih, "WIN8_FONT_HOOK"))
+  {
+    choosefont.lpfnHook = (LPCFHOOKPROC)winFontDlgHookProc;
+    choosefont.Flags |= CF_ENABLEHOOK;
+  }
 
   if (IupGetCallback(ih, "HELP_CB"))
     choosefont.Flags |= CF_SHOWHELP;

diff --git a/src/win/iupwin_info.c b/src/win/iupwin_info.c
@@ -43,6 +43,19 @@ int iupwinIs7OrNew(void)
   return 0;
 }
 
+int iupwinIs8OrNew(void)
+{
+  OSVERSIONINFO osvi;
+  osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+  GetVersionEx(&osvi);
+
+  if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT && 
+     (osvi.dwMajorVersion > 6 || (osvi.dwMajorVersion == 6 && osvi.dwMinorVersion >= 2)))
+    return 1;
+
+  return 0;
+}
+
 int iupwinGetSystemMajorVersion(void)
 {
   OSVERSIONINFO osvi;

diff --git a/src/win/iupwin_info.h b/src/win/iupwin_info.h
@@ -18,6 +18,7 @@ char* iupwinGetSystemLanguage(void);
 int   iupwinIsAppThemed(void);
 int   iupwinIsVistaOrNew(void);
 int   iupwinIs7OrNew(void);
+int   iupwinIs8OrNew(void);
 
 /* color */
 void iupwinGetSysColor(char* color, int wincolor);