X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24aab8e81a8627802e4111d9c99a50ece8d0026e..021efd65100322b3c152cc1017cfb961664d30a4:/src/msw/display.cpp?ds=sidebyside diff --git a/src/msw/display.cpp b/src/msw/display.cpp index 3a0844c3ce..d64dc163fb 100644 --- a/src/msw/display.cpp +++ b/src/msw/display.cpp @@ -27,19 +27,20 @@ #if wxUSE_DISPLAY +#include "wx/display.h" + #ifndef WX_PRECOMP #include "wx/dynarray.h" #include "wx/app.h" #include "wx/frame.h" #endif -#include "wx/msw/missing.h" - #include "wx/dynload.h" #include "wx/sysopt.h" -#include "wx/display.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 // by default because ddraw.h is now always available and also it's not really @@ -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[] = wxT("coredll.dll"); +#else +static const wxChar displayDllName[] = wxT("user32.dll"); +#endif + // ---------------------------------------------------------------------------- // typedefs for dynamically loaded Windows functions // ---------------------------------------------------------------------------- @@ -175,7 +183,7 @@ WX_DEFINE_ARRAY_PTR(wxDisplayInfo *, wxDisplayInfoArray); class wxDisplayImplWin32Base : public wxDisplayImpl { public: - wxDisplayImplWin32Base(size_t n, wxDisplayInfo& info) + wxDisplayImplWin32Base(unsigned n, wxDisplayInfo& info) : wxDisplayImpl(n), m_info(info) { @@ -220,9 +228,9 @@ public: bool IsOk() const { return !m_displays.empty(); } - virtual size_t GetCount() { return m_displays.size(); } + 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 @@ -248,7 +256,7 @@ protected: wxDisplayInfoArray m_displays; - DECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base) + wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryWin32Base); }; // ---------------------------------------------------------------------------- @@ -258,7 +266,7 @@ protected: class wxDisplayImplMultimon : public wxDisplayImplWin32Base { public: - wxDisplayImplMultimon(size_t n, wxDisplayInfo& info) + wxDisplayImplMultimon(unsigned n, wxDisplayInfo& info) : wxDisplayImplWin32Base(n, info) { } @@ -267,7 +275,7 @@ public: virtual bool ChangeMode(const wxVideoMode& mode); private: - DECLARE_NO_COPY_CLASS(wxDisplayImplMultimon) + wxDECLARE_NO_COPY_CLASS(wxDisplayImplMultimon); }; class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base @@ -275,7 +283,7 @@ class wxDisplayFactoryMultimon : public wxDisplayFactoryWin32Base public: wxDisplayFactoryMultimon(); - virtual wxDisplayImpl *CreateDisplay(size_t n); + virtual wxDisplayImpl *CreateDisplay(unsigned n); private: // EnumDisplayMonitors() callback @@ -319,13 +327,13 @@ struct wxDisplayInfoDirectDraw : wxDisplayInfo const GUID m_guid; - DECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw) + wxDECLARE_NO_COPY_CLASS(wxDisplayInfoDirectDraw); }; class wxDisplayImplDirectDraw : public wxDisplayImplWin32Base { public: - wxDisplayImplDirectDraw(size_t n, wxDisplayInfo& info, IDirectDraw2 *pDD2) + wxDisplayImplDirectDraw(unsigned n, wxDisplayInfo& info, IDirectDraw2 *pDD2) : wxDisplayImplWin32Base(n, info), m_pDD2(pDD2) { @@ -343,7 +351,7 @@ public: private: IDirectDraw2 *m_pDD2; - DECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw) + wxDECLARE_NO_COPY_CLASS(wxDisplayImplDirectDraw); }; class wxDisplayFactoryDirectDraw : public wxDisplayFactoryWin32Base @@ -352,7 +360,7 @@ public: wxDisplayFactoryDirectDraw(); virtual ~wxDisplayFactoryDirectDraw(); - virtual wxDisplayImpl *CreateDisplay(size_t n); + virtual wxDisplayImpl *CreateDisplay(unsigned n); private: // callback used with DirectDrawEnumerateEx() @@ -372,7 +380,7 @@ private: // dynamically resolved DirectDrawCreate() DirectDrawCreate_t m_pfnDirectDrawCreate; - DECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw) + wxDECLARE_NO_COPY_CLASS(wxDisplayFactoryDirectDraw); }; #endif // wxUSE_DIRECTDRAW @@ -393,7 +401,7 @@ private: // system option #if wxUSE_DIRECTDRAW - if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) ) + if ( wxSystemOptions::GetOptionInt(wxT("msw.display.directdraw")) ) { wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw; if ( factoryDD->IsOk() ) @@ -425,7 +433,7 @@ void wxDisplayInfo::Initialize() WinStruct monInfo; if ( !gs_GetMonitorInfo(m_hmon, (LPMONITORINFO)&monInfo) ) { - wxLogLastError(_T("GetMonitorInfo")); + wxLogLastError(wxT("GetMonitorInfo")); m_flags = 0; return; } @@ -459,7 +467,7 @@ wxRect wxDisplayImplWin32Base::GetClientArea() const wxString wxDisplayImplWin32Base::GetName() const { - if ( m_info.m_devName.IsEmpty() ) + if ( m_info.m_devName.empty() ) m_info.Initialize(); return m_info.m_devName; @@ -481,14 +489,16 @@ 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); dm.dmDriverExtra = 0; if ( !::EnumDisplaySettings(deviceName, ENUM_CURRENT_SETTINGS, &dm) ) { - wxLogLastError(_T("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)")); + wxLogLastError(wxT("EnumDisplaySettings(ENUM_CURRENT_SETTINGS)")); } else { @@ -510,29 +520,17 @@ wxDisplayFactoryWin32Base::wxDisplayFactoryWin32Base() { ms_supportsMultimon = 0; - wxDynamicLibrary dllUser32(_T("user32.dll")); + wxDynamicLibrary dllDisplay(displayDllName, wxDL_VERBATIM | wxDL_QUIET); - wxLogNull noLog; - - gs_MonitorFromPoint = (MonitorFromPoint_t) - dllUser32.GetSymbol(wxT("MonitorFromPoint")); - if ( !gs_MonitorFromPoint ) - return; - - 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; } @@ -648,9 +642,9 @@ void wxDisplayFactoryMultimon::AddDisplay(HMONITOR hMonitor, LPRECT lprcMonitor) // wxDisplayFactoryMultimon inherited pure virtuals implementation // ---------------------------------------------------------------------------- -wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(size_t n) +wxDisplayImpl *wxDisplayFactoryMultimon::CreateDisplay(unsigned n) { - wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") ); + wxCHECK_MSG( n < m_displays.size(), NULL, wxT("invalid display index") ); return new wxDisplayImplMultimon(n, *(m_displays[n])); } @@ -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, - _T("at least the width and height must be specified") ); + wxCHECK_MSG( mode.GetWidth() && mode.GetHeight(), false, + wxT("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; @@ -791,7 +786,7 @@ bool wxDisplayImplMultimon::ChangeMode(const wxVideoMode& mode) break; default: - wxFAIL_MSG( _T("unexpected ChangeDisplaySettingsEx() return value") ); + wxFAIL_MSG( wxT("unexpected ChangeDisplaySettingsEx() return value") ); } return false; @@ -813,34 +808,26 @@ 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(wxT("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")); + wxLogLastError(wxT("DirectDrawEnumerateEx")); } } @@ -865,7 +852,7 @@ wxDisplayFactoryDirectDraw::DDEnumExCallback(GUID *pGuid, if ( pGuid ) { wxDisplayFactoryDirectDraw * self = - wx_static_cast(wxDisplayFactoryDirectDraw *, lpContext); + static_cast(lpContext); self->AddDisplay(*pGuid, hmon, driverName); } //else: we're called for the primary monitor, skip it @@ -889,12 +876,12 @@ void wxDisplayFactoryDirectDraw::AddDisplay(const GUID& guid, // wxDisplayFactoryDirectDraw inherited pure virtuals implementation // ---------------------------------------------------------------------------- -wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(size_t n) +wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(unsigned n) { - wxCHECK_MSG( n < m_displays.size(), NULL, _T("invalid display index") ); + wxCHECK_MSG( n < m_displays.size(), NULL, wxT("invalid display index") ); wxDisplayInfoDirectDraw * - info = wx_static_cast(wxDisplayInfoDirectDraw *, m_displays[n]); + info = static_cast(m_displays[n]); if ( !info->m_pDD2 ) { @@ -905,7 +892,7 @@ wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(size_t n) if ( FAILED(hr) || !pDD ) { // what to do?? - wxLogApiError(_T("DirectDrawCreate"), hr); + wxLogApiError(wxT("DirectDrawCreate"), hr); return NULL; } @@ -915,7 +902,7 @@ wxDisplayImpl *wxDisplayFactoryDirectDraw::CreateDisplay(size_t n) if ( FAILED(hr) || !info->m_pDD2 ) { - wxLogApiError(_T("IDirectDraw::QueryInterface(IDD2)"), hr); + wxLogApiError(wxT("IDirectDraw::QueryInterface(IDD2)"), hr); return NULL; } @@ -957,7 +944,7 @@ private: wxArrayVideoModes& m_modes; const wxVideoMode& m_modeMatch; - DECLARE_NO_COPY_CLASS(wxDDVideoModesAdder) + wxDECLARE_NO_COPY_CLASS(wxDDVideoModesAdder); }; HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc, @@ -968,7 +955,7 @@ HRESULT WINAPI wxDDEnumModesCallback(LPDDSURFACEDESC lpDDSurfaceDesc, if ( (lpDDSurfaceDesc->dwFlags & FLAGS_REQUIRED) == FLAGS_REQUIRED ) { wxDDVideoModesAdder * const vmodes = - wx_static_cast(wxDDVideoModesAdder *, lpContext); + static_cast(lpContext); vmodes->Add(wxVideoMode(lpDDSurfaceDesc->dwWidth, lpDDSurfaceDesc->dwHeight, @@ -996,7 +983,7 @@ wxDisplayImplDirectDraw::GetModes(const wxVideoMode& modeMatch) const if ( FAILED(hr) ) { - wxLogApiError(_T("IDirectDraw::EnumDisplayModes"), hr); + wxLogApiError(wxT("IDirectDraw::EnumDisplayModes"), hr); } return modes; @@ -1009,7 +996,7 @@ wxDisplayImplDirectDraw::GetModes(const wxVideoMode& modeMatch) const bool wxDisplayImplDirectDraw::ChangeMode(const wxVideoMode& mode) { wxWindow *winTop = wxTheApp->GetTopWindow(); - wxCHECK_MSG( winTop, false, _T("top level window required for DirectX") ); + wxCHECK_MSG( winTop, false, wxT("top level window required for DirectX") ); HRESULT hr = m_pDD2->SetCooperativeLevel ( @@ -1018,7 +1005,7 @@ bool wxDisplayImplDirectDraw::ChangeMode(const wxVideoMode& mode) ); if ( FAILED(hr) ) { - wxLogApiError(_T("IDirectDraw2::SetCooperativeLevel"), hr); + wxLogApiError(wxT("IDirectDraw2::SetCooperativeLevel"), hr); return false; } @@ -1026,7 +1013,7 @@ bool wxDisplayImplDirectDraw::ChangeMode(const wxVideoMode& mode) hr = m_pDD2->SetDisplayMode(mode.w, mode.h, mode.bpp, mode.refresh, 0); if ( FAILED(hr) ) { - wxLogApiError(_T("IDirectDraw2::SetDisplayMode"), hr); + wxLogApiError(wxT("IDirectDraw2::SetDisplayMode"), hr); return false; }