X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45f272841cd2faca5fd3ad2560cbf06eb81465bc..8d1147f94291adcfa4d028d7122b3d39e5b553e1:/src/common/framecmn.cpp diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp index 1b8448f0ad..2e47154b2d 100644 --- a/src/common/framecmn.cpp +++ b/src/common/framecmn.cpp @@ -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; } @@ -228,7 +218,7 @@ bool wxFrameBase::ProcessCommand(int id) void wxFrameBase::UpdateWindowUI(long flags) { wxWindowBase::UpdateWindowUI(flags); - + #if wxUSE_TOOLBAR if (GetToolBar()) GetToolBar()->UpdateWindowUI(flags); @@ -296,7 +286,7 @@ void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event)) void wxFrameBase::OnInternalIdle() { wxTopLevelWindow::OnInternalIdle(); - + #if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES if (wxUpdateUIEvent::CanUpdate(this)) DoMenuUpdates(); @@ -436,6 +426,9 @@ void wxFrameBase::DoGiveHelp(const wxString& text, bool show) } statbar->SetStatusText(help, m_statusBarPane); +#else + wxUnusedVar(text); + wxUnusedVar(show); #endif // wxUSE_STATUSBAR }