Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fixes for !wxUSE_TOOLBAR

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-03-14 23:55:16 +00:00
parent 7ded318bef
commit 6a317e6188
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/univ/framuniv.cpp
View File

@@ -98,8 +98,11 @@ void wxFrame::PositionMenuBar()
wxCoord heightMbar = m_frameMenuBar->GetSize().y; wxCoord heightMbar = m_frameMenuBar->GetSize().y;
wxCoord heightTbar = 0; wxCoord heightTbar = 0;
#if wxUSE_TOOLBAR
if ( m_frameToolBar ) if ( m_frameToolBar )
heightTbar = m_frameToolBar->GetSize().y; heightTbar = m_frameToolBar->GetSize().y;
#endif // wxUSE_TOOLBAR
m_frameMenuBar->SetSize(0, m_frameMenuBar->SetSize(0,
#ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as #ifdef __WXPM__ // FIXME -- remove this, make wxOS2/Univ behave as

4
src/univ/toolbar.cpp
View File

@@ -29,6 +29,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_TOOLBAR
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/utils.h" #include "wx/utils.h"
#include "wx/app.h" #include "wx/app.h"
@@ -705,3 +707,5 @@ bool wxStdToolbarInputHandler::HandleActivation(wxInputConsumer *consumer,
return TRUE; return TRUE;
} }
#endif // wxUSE_TOOLBAR