diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:51 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:17:51 +0200 |
| commit | 237aedc590b58c0e69d7dfcac92b5f767b7c004a (patch) | |
| tree | 83f361a82ba483f2daf83b677e8685cd953812d9 /wxWidgets-Fix | |
| parent | 4.5 (diff) | |
| download | FreeFileSync-237aedc590b58c0e69d7dfcac92b5f767b7c004a.tar.gz FreeFileSync-237aedc590b58c0e69d7dfcac92b5f767b7c004a.tar.bz2 FreeFileSync-237aedc590b58c0e69d7dfcac92b5f767b7c004a.zip | |
4.6
Diffstat (limited to 'wxWidgets-Fix')
| -rw-r--r-- | wxWidgets-Fix/apply-patches.cmd | 5 | ||||
| -rw-r--r-- | wxWidgets-Fix/settings.cpp.patch | 50 |
2 files changed, 55 insertions, 0 deletions
diff --git a/wxWidgets-Fix/apply-patches.cmd b/wxWidgets-Fix/apply-patches.cmd index 80b94874..30f88746 100644 --- a/wxWidgets-Fix/apply-patches.cmd +++ b/wxWidgets-Fix/apply-patches.cmd @@ -2,5 +2,10 @@ ::fix grid-label double-click to auto-size columns patch "%1\src\generic\grid.cpp" grid.cpp.patch +pause patch "%1\include\wx\generic\grid.h" grid.h.patch +pause +::Segoe UI font with Vista +patch "%1\src\msw\settings.cpp" settings.cpp.patch +echo Make sure to add "-luxtheme" to "Standard linker flags" in \wxWidgets\build\msw\config.gcc!!! pause
\ No newline at end of file diff --git a/wxWidgets-Fix/settings.cpp.patch b/wxWidgets-Fix/settings.cpp.patch new file mode 100644 index 00000000..1ba9524a --- /dev/null +++ b/wxWidgets-Fix/settings.cpp.patch @@ -0,0 +1,50 @@ +--- src\msw\settings.cpp.old 2011-03-22 10:36:54.000000000 +0100 ++++ src\msw\settings.cpp 2011-12-14 21:58:59.642200200 +0100 +@@ -40,6 +40,12 @@ + #endif + + #include "wx/fontutil.h" ++//#include <vssym32.h> ++#include <Uxtheme.h> ++ ++#ifdef _MSC_VER ++#pragma comment(lib, "UxTheme.lib") ++#endif + + // ---------------------------------------------------------------------------- + // private classes +@@ -261,6 +267,34 @@ + return font; + } + ++#ifndef TMT_MSGBOXFONT ++#define TMT_MSGBOXFONT 805 //why is this constant missing from Uxtheme.h??? ++#endif ++ ++struct InitFont //(try to) initialize default font, before wxWidgets gets chance to screw up ++{ ++ InitFont() ++ { ++ HTHEME theme = ::OpenThemeData(NULL, //__in HWND hwnd, ++ L"WINDOW"); //__in LPCWSTR pszClassList ++ ++ LOGFONT lfont = {}; ++ if (::GetThemeSysFont(theme, //__in HTHEME hTheme, ++ TMT_MSGBOXFONT, //__in int iFontID, ++ &lfont) == S_OK) // __out LOGFONTW *plf ++ { ++ wxNativeFontInfo native; ++ native.lf = lfont; ++ delete gs_fontDefault; ++ gs_fontDefault = wxFontBase::New(native); ++ } ++ ++ if (theme != NULL) ++ ::CloseThemeData(theme); ++ } ++} dummy; ++ ++ + wxFont wxSystemSettingsNative::GetFont(wxSystemFont index) + { + #ifdef __WXWINCE__ |