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

* Clean up the includes and use wxprec.h

Browse Source 
* Wrap toolbar related code in wxUSE_TOOLBAR
* m_frameToolBar was used where m_frameStatusBar should have been.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2003-08-28 16:37:18 +00:00
parent 1d2412f77b
commit 26785f01d0
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cocoa/frame.mm
View File

@@ -9,13 +9,17 @@
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#include "wx/frame.h" #include "wx/wxprec.h"
#include "wx/menu.h" #ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/app.h"
#include "wx/frame.h"
#include "wx/menu.h"
#include "wx/toolbar.h"
#include "wx/statusbr.h"
#endif // WX_PRECOMP
#include "wx/menuitem.h" #include "wx/menuitem.h"
#include "wx/app.h"
#include "wx/log.h"
#include "wx/statusbr.h"
#include "wx/toolbar.h"
#include "wx/cocoa/autorelease.h" #include "wx/cocoa/autorelease.h"
@@ -95,8 +99,10 @@ void wxFrame::CocoaSetWxWindowSize(int width, int height)
{ {
if(m_frameStatusBar) if(m_frameStatusBar)
height += m_frameStatusBar->GetSize().y; height += m_frameStatusBar->GetSize().y;
#if wxUSE_TOOLBAR
if(m_frameToolBar) if(m_frameToolBar)
height += m_frameToolBar->GetSize().y; height += m_frameToolBar->GetSize().y;
#endif //wxUSE_TOOLBAR
wxTopLevelWindow::CocoaSetWxWindowSize(width,height); wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
} }
@@ -121,6 +127,7 @@ void wxFrame::UpdateFrameNSView()
} }
NSRect frameRect = [m_frameNSView frame]; NSRect frameRect = [m_frameNSView frame];
float tbarheight = 0.0; float tbarheight = 0.0;
#if wxUSE_TOOLBAR
if(m_frameToolBar) if(m_frameToolBar)
{ {
NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview(); NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();
@@ -135,6 +142,7 @@ void wxFrame::UpdateFrameNSView()
[tbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMinYMargin]; [tbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMinYMargin];
tbarheight = tbarRect.size.height; tbarheight = tbarRect.size.height;
} }
#endif //wxUSE_TOOLBAR
float sbarheight = 0.0; float sbarheight = 0.0;
if(m_frameStatusBar) if(m_frameStatusBar)
{ {
@@ -170,7 +178,7 @@ void wxFrame::SetStatusBar(wxStatusBar *statusbar)
[m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview]; [m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview];
[m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin]; [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
if(m_frameStatusBar->GetParent()) if(m_frameStatusBar->GetParent())
m_frameStatusBar->GetParent()->CocoaAddChild(m_frameToolBar); m_frameStatusBar->GetParent()->CocoaAddChild(m_frameStatusBar);
} }
m_frameStatusBar = statusbar; m_frameStatusBar = statusbar;
if(m_frameStatusBar) if(m_frameStatusBar)
@@ -194,6 +202,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
return m_frameStatusBar; return m_frameStatusBar;
} }
#if wxUSE_TOOLBAR
void wxFrame::SetToolBar(wxToolBar *toolbar) void wxFrame::SetToolBar(wxToolBar *toolbar)
{ {
if(m_frameToolBar) if(m_frameToolBar)
@@ -223,6 +232,7 @@ wxToolBar* wxFrame::CreateToolBar(long style,
UpdateFrameNSView(); UpdateFrameNSView();
return m_frameToolBar; return m_frameToolBar;
} }
#endif // wxUSE_TOOLBAR
void wxFrame::PositionStatusBar() void wxFrame::PositionStatusBar()
{ {