WinCE Standard SDK improvements including adding close button
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -155,8 +155,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
|
||||
{
|
||||
wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
|
||||
|
||||
#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__) && \
|
||||
(!defined(__WXWINCE__) || (_WIN32_WCE >= 400 && !defined(WIN32_PLATFORM_PSPC) && !defined(WIN32_PLATFORM_WFSP)))
|
||||
#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
|
||||
wxToolBar *toolbar = GetToolBar();
|
||||
if ( toolbar && toolbar->IsShown() )
|
||||
{
|
||||
@@ -174,15 +173,6 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
|
||||
}
|
||||
#endif // wxUSE_TOOLBAR
|
||||
|
||||
#if defined(__WXWINCE__) && defined(WCE_PLATFORM_STANDARDSDK)
|
||||
if (GetMenuBar() && GetMenuBar()->GetCommandBar())
|
||||
{
|
||||
RECT rect;
|
||||
::GetWindowRect((HWND) GetMenuBar()->GetCommandBar(), &rect);
|
||||
pt.y += (rect.bottom - rect.top);
|
||||
}
|
||||
#endif
|
||||
|
||||
return pt;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user