ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merged seperate winCheckMenuBarInfo into updateWindowSize

This commit is contained in:
spacy51 2008-01-06 14:13:39 +00:00
parent b36f189f7b
commit 2b6376b244
1 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/win32/VBA.cpp
View File

@ -1777,48 +1777,6 @@ void VBA::updateVideoSize(UINT id)
updateWindowSize(value);
}
typedef BOOL (WINAPI *GETMENUBARINFO)(HWND, LONG, LONG, PMENUBARINFO);
static void winCheckMenuBarInfo(int& winSizeX, int& winSizeY)
{
HINSTANCE hinstDll;
DWORD dwVersion = 0;
#ifdef _AFXDLL
hinstDll = AfxLoadLibrary("user32.dll");
#else
hinstDll = LoadLibrary( _T("user32.dll") );
#endif
if(hinstDll) {
GETMENUBARINFO func = (GETMENUBARINFO)GetProcAddress(hinstDll, "GetMenuBarInfo");
if(func) {
MENUBARINFO info;
info.cbSize = sizeof(MENUBARINFO);
func(AfxGetMainWnd()->GetSafeHwnd(), OBJID_MENU, 0, &info);
int menuHeight = GetSystemMetrics(SM_CYMENU);
if((info.rcBar.bottom - info.rcBar.top) > menuHeight) {
winSizeY += (info.rcBar.bottom - info.rcBar.top) - menuHeight + 1;
theApp.m_pMainWnd->SetWindowPos(
0, //HWND_TOPMOST,
theApp.windowPositionX,
theApp.windowPositionY,
winSizeX,
winSizeY,
SWP_NOMOVE | SWP_SHOWWINDOW);
}
}
#ifdef _AFXDLL
AfxFreeLibrary( hinstDll );
#else
FreeLibrary( hinstDll );
#endif
}
}
void VBA::updateWindowSize(int value)
{
@ -1980,7 +1938,21 @@ void VBA::updateWindowSize(int value)
winSizeY,
SWP_NOMOVE | SWP_SHOWWINDOW);
winCheckMenuBarInfo(winSizeX, winSizeY);
// content of old seperate 'winCheckMenuBarInfo' function:
MENUBARINFO info;
info.cbSize = sizeof(MENUBARINFO);
theApp.m_pMainWnd->GetMenuBarInfo(OBJID_MENU, 0, &info);
int menuHeight = GetSystemMetrics(SM_CYMENU); // includes white line
if((info.rcBar.bottom - info.rcBar.top) > menuHeight) {
winSizeY += (info.rcBar.bottom - info.rcBar.top) - menuHeight + 1;
m_pMainWnd->SetWindowPos(
0, //HWND_TOPMOST,
theApp.windowPositionX,
theApp.windowPositionY,
winSizeX,
winSizeY,
SWP_NOMOVE | SWP_SHOWWINDOW);
}
}
}
@ -1995,6 +1967,7 @@ void VBA::updateWindowSize(int value)
m_pMainWnd->RedrawWindow(NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_ALLCHILDREN);
}
bool VBA::initDisplay()
{
return updateRenderMethod(false);