mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-09 04:30:09 +00:00
Code Activity

changes for Wine compatibility

Browse source
This commit is contained in:
jules 2007-07-25 09:08:04 +00:00
parent d02834dea6
commit 8d63747965
3 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
build/win32/platform_specific_code/juce_win32_Fonts.cpp
View file

@ -239,13 +239,25 @@ const StringArray Font::findAllTypefaceNames() throw()
return results;
}
extern bool juce_IsRunningInWine() throw();
void Font::getDefaultFontNames (String& defaultSans,
String& defaultSerif,
String& defaultFixed) throw()
{
defaultSans = "Verdana";
defaultSerif = "Times";
defaultFixed = "Lucida Console";
if (juce_IsRunningInWine())
{
// If we're running in Wine, then use fonts that might be available on Linux..
defaultSans = "Bitstream Vera Sans";
defaultSerif = "Bitstream Vera Serif";
defaultFixed = "Bitstream Vera Sans Mono";
}
else
{
defaultSans = "Verdana";
defaultSerif = "Times";
defaultFixed = "Lucida Console";
}
}
//==============================================================================

11
build/win32/platform_specific_code/juce_win32_PlatformUtils.cpp
View file

@ -300,6 +300,17 @@ void PlatformUtilities::deleteRegistryKey (const String& regKeyPath)
}
}
bool juce_IsRunningInWine() throw()
{
HKEY key;
if (RegOpenKeyEx (HKEY_CURRENT_USER, _T("Software\\Wine"), 0, KEY_READ, &key) == ERROR_SUCCESS)
{
RegCloseKey (key);
return true;
}
return false;
}
//==============================================================================
static void* currentModuleHandle = 0;

8
build/win32/platform_specific_code/juce_win32_Windowing.cpp
View file

@ -93,6 +93,7 @@ BEGIN_JUCE_NAMESPACE
extern void juce_repeatLastProcessPriority() throw(); // in juce_win32_Threads.cpp
extern void juce_CheckCurrentlyFocusedTopLevelWindow() throw(); // in juce_TopLevelWindow.cpp
extern bool juce_IsRunningInWine() throw();
const int juce_windowIsSemiTransparentFlag = (1 << 31); // also in component.cpp
@ -121,8 +122,11 @@ bool Desktop::canUseSemiTransparentWindows() throw()
{
if (updateLayeredWindow == 0)
{
HMODULE user32Mod = GetModuleHandle (_T("user32.dll"));
updateLayeredWindow = (UpdateLayeredWinFunc) GetProcAddress (user32Mod, "UpdateLayeredWindow");
if (! juce_IsRunningInWine())
{
HMODULE user32Mod = GetModuleHandle (_T("user32.dll"));
updateLayeredWindow = (UpdateLayeredWinFunc) GetProcAddress (user32Mod, "UpdateLayeredWindow");
}
}
return updateLayeredWindow != 0;