X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7212d15556e87f73ff5ea8c3211a0e8e8811426b..4081eb6fe2de5eed5716459d09c8f4bed8eda92d:/src/msw/display.cpp diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 3e87a50557..4ae8806c8e 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -39,6 +39,7 @@ #include "wx/sysopt.h" #include "wx/display_impl.h" +#include "wx/msw/wrapwin.h" #include "wx/msw/missing.h" // define this to use DirectDraw for display mode switching: this is disabled @@ -85,6 +86,13 @@ { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } }; #endif // wxUSE_DIRECTDRAW +// display functions are found in different DLLs under WinCE and normal Win32 +#ifdef __WXWINCE__ +static const wxChar displayDllName[] = _T("coredll.dll"); +#else +static const wxChar displayDllName[] = _T("user32.dll"); +#endif + // ---------------------------------------------------------------------------- // typedefs for dynamically loaded Windows functions // ---------------------------------------------------------------------------- @@ -222,7 +230,7 @@ public: virtual unsigned GetCount() { return unsigned(m_displays.size()); } virtual int GetFromPoint(const wxPoint& pt); - virtual int GetFromWindow(wxWindow *window); + virtual int GetFromWindow(const wxWindow *window); protected: // ctor checks if the current system supports multimon API and dynamically @@ -481,7 +489,9 @@ wxVideoMode wxDisplayImplWin32Base::GetCurrentMode() const // according to MSDN. The version of GetName() we implement for Win95 // returns an empty string. const wxString name = GetName(); - const wxChar * const deviceName = name.empty() ? NULL : name.c_str(); + const wxChar * const deviceName = name.empty() + ? (const wxChar*)NULL + : (const wxChar*)name.c_str(); DEVMODE dm; dm.dmSize = sizeof(dm); @@ -510,29 +520,17 @@ wxDisplayFactoryWin32Base::wxDisplayFactoryWin32Base() { ms_supportsMultimon = 0; - wxDynamicLibrary dllUser32(_T("user32.dll")); - - wxLogNull noLog; - - gs_MonitorFromPoint = (MonitorFromPoint_t) - dllUser32.GetSymbol(wxT("MonitorFromPoint")); - if ( !gs_MonitorFromPoint ) - return; + wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET); - gs_MonitorFromWindow = (MonitorFromWindow_t) - dllUser32.GetSymbol(wxT("MonitorFromWindow")); - if ( !gs_MonitorFromWindow ) - return; - - gs_GetMonitorInfo = (GetMonitorInfo_t) - dllUser32.GetSymbolAorW(wxT("GetMonitorInfo")); - if ( !gs_GetMonitorInfo ) + if ( (wxDL_INIT_FUNC(gs_, MonitorFromPoint, dllDisplay)) == NULL || + (wxDL_INIT_FUNC(gs_, MonitorFromWindow, dllDisplay)) == NULL || + (wxDL_INIT_FUNC_AW(gs_, GetMonitorInfo, dllDisplay)) == NULL ) return; ms_supportsMultimon = 1; - // we can safely let dllUser32 go out of scope, the DLL itself will - // still remain loaded as all Win32 programs use it + // we can safely let dllDisplay go out of scope, the DLL itself will + // still remain loaded as all programs link to it statically anyhow } } @@ -572,7 +570,7 @@ int wxDisplayFactoryWin32Base::GetFromPoint(const wxPoint& pt) MONITOR_DEFAULTTONULL)); } -int wxDisplayFactoryWin32Base::GetFromWindow(wxWindow *window) +int wxDisplayFactoryWin32Base::GetFromWindow(const wxWindow *window) { return FindDisplayFromHMONITOR(gs_MonitorFromWindow(GetHwndOf(window), MONITOR_DEFAULTTONULL)); @@ -595,12 +593,8 @@ wxDisplayFactoryMultimon::wxDisplayFactoryMultimon() // implementation EnumDisplayMonitors_t pfnEnumDisplayMonitors; { - wxLogNull noLog; - - wxDynamicLibrary dllUser32(_T("user32.dll")); - pfnEnumDisplayMonitors = (EnumDisplayMonitors_t) - dllUser32.GetSymbol(wxT("EnumDisplayMonitors")); - if ( !pfnEnumDisplayMonitors ) + wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET); + if ( (wxDL_INIT_FUNC(pfn, EnumDisplayMonitors, dllDisplay)) == NULL ) return; } @@ -668,7 +662,9 @@ wxDisplayImplMultimon::GetModes(const wxVideoMode& modeMatch) const // according to MSDN. The version of GetName() we implement for Win95 // returns an empty string. const wxString name = GetName(); - const wxChar * const deviceName = name.empty() ? NULL : name.c_str(); + const wxChar * const deviceName = name.empty() + ? (const wxChar*)NULL + : (const wxChar*)name.c_str(); DEVMODE dm; dm.dmSize = sizeof(dm); @@ -703,26 +699,26 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode) } else // change to the given mode { - wxCHECK_MSG( mode.w && mode.h, false, + wxCHECK_MSG( mode.GetWidth() && mode.GetHeight(), false, _T("at least the width and height must be specified") ); wxZeroMemory(dm); dm.dmSize = sizeof(dm); dm.dmDriverExtra = 0; dm.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; - dm.dmPelsWidth = mode.w; - dm.dmPelsHeight = mode.h; + dm.dmPelsWidth = mode.GetWidth(); + dm.dmPelsHeight = mode.GetHeight(); - if ( mode.bpp ) + if ( mode.GetDepth() ) { dm.dmFields |= DM_BITSPERPEL; - dm.dmBitsPerPel = mode.bpp; + dm.dmBitsPerPel = mode.GetDepth(); } - if ( mode.refresh ) + if ( mode.GetRefresh() ) { dm.dmFields |= DM_DISPLAYFREQUENCY; - dm.dmDisplayFrequency = mode.refresh; + dm.dmDisplayFrequency = mode.GetRefresh(); } pDevMode = &dm; @@ -742,13 +738,12 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode) static ChangeDisplaySettingsEx_t pfnChangeDisplaySettingsEx = NULL; if ( !pfnChangeDisplaySettingsEx ) { - wxDynamicLibrary dllUser32(_T("user32.dll")); - if ( dllUser32.IsLoaded() ) + wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET); + if ( dllDisplay.IsLoaded() ) { - pfnChangeDisplaySettingsEx = (ChangeDisplaySettingsEx_t) - dllUser32.GetSymbolAorW(_T("ChangeDisplaySettingsEx")); + wxDL_INIT_FUNC_AW(pfn, ChangeDisplaySettingsEx, dllDisplay); } - //else: huh, no user32.dll?? + //else: huh, no this DLL must always be present, what's going on?? #ifndef __WXWINCE__ if ( !pfnChangeDisplaySettingsEx ) @@ -763,11 +758,11 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode) // do change the mode switch ( pfnChangeDisplaySettingsEx ( - GetName(), // display name - pDevMode, // dev mode or NULL to reset - NULL, // reserved + GetName().wx_str(), // display name + pDevMode, // dev mode or NULL to reset + NULL, // reserved flags, - NULL // pointer to video parameters (not used) + NULL // pointer to video parameters (not used) ) ) { case DISP_CHANGE_SUCCESSFUL: @@ -781,7 +776,7 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode) if (frameTop && frameTop->IsFullScreen()) { wxVideoMode current = GetCurrentMode(); - frameTop->SetClientSize(current.w, current.h); + frameTop->SetClientSize(current.GetWidth(), current.GetHeight()); } } return true; @@ -813,32 +808,24 @@ wxDisplayFactoryDirectDraw::wxDisplayFactoryDirectDraw() if ( !ms_supportsMultimon ) return; -#if wxUSE_LOG - // suppress the errors if ddraw.dll is not found, we're prepared to handle - // this - wxLogNull noLog; -#endif - - m_dllDDraw.Load(_T("ddraw.dll")); + m_dllDDraw.Load(_T("ddraw.dll"), wxDL_VERBATIM | wxDL_QUIET); if ( !m_dllDDraw.IsLoaded() ) return; - DirectDrawEnumerateEx_t pDDEnumEx = (DirectDrawEnumerateEx_t) - m_dllDDraw.GetSymbolAorW(_T("DirectDrawEnumerateEx")); - if ( !pDDEnumEx ) + DirectDrawEnumerateEx_t + wxDL_INIT_FUNC_AW(pfn, DirectDrawEnumerateEx, m_dllDDraw); + if ( !pfnDirectDrawEnumerateEx ) return; // we can't continue without DirectDrawCreate() later, so resolve it right // now and fail the initialization if it's not available - m_pfnDirectDrawCreate = (DirectDrawCreate_t) - m_dllDDraw.GetSymbol(_T("DirectDrawCreate")); - if ( !m_pfnDirectDrawCreate ) + if ( !wxDL_INIT_FUNC(m_pfn, DirectDrawCreate, m_dllDDraw) ) return; - if ( (*pDDEnumEx)(DDEnumExCallback, - this, - DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK ) + if ( (*pfnDirectDrawEnumerateEx)(DDEnumExCallback, + this, + DDENUM_ATTACHEDSECONDARYDEVICES) != DD_OK ) { wxLogLastError(_T("DirectDrawEnumerateEx")); }