fixing wrong version commit

[wxWidgets.git] / src / cocoa / frame.mm

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index 7c21de34f4a022bdda3ac979c663b8f8a22ef3a2..dd494c88dff6e4556a7d5712a236071e4127b14c 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -1,19 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cocoa/frame.mm
+// Name:        src/cocoa/frame.mm

 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Purpose:     wxFrame
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"

+
+#include "wx/frame.h"
+

 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/app.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"
     #include "wx/menu.h"
     #include "wx/toolbar.h"
     #include "wx/statusbr.h"


@@ -168,7 +170,7 @@ void wxFrame::CocoaReplaceView(WX_NSView oldView, WX_NSView newView)
 void wxFrame::UpdateFrameNSView()
 {
     if(!m_frameNSView)
 void wxFrame::UpdateFrameNSView()
 {
     if(!m_frameNSView)

-    {
+    {  // NOTE: We only need a plain NSView here since we don't associate it with ourselves.

         m_frameNSView = [[NSView alloc] initWithFrame:[[m_cocoaNSWindow contentView] frame]];
         [m_cocoaNSWindow setContentView: m_frameNSView];
         [m_frameNSView addSubview:m_cocoaNSView];
         m_frameNSView = [[NSView alloc] initWithFrame:[[m_cocoaNSWindow contentView] frame]];
         [m_cocoaNSWindow setContentView: m_frameNSView];
         [m_frameNSView addSubview:m_cocoaNSView];


@@ -179,6 +181,8 @@ void wxFrame::UpdateFrameNSView()
     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();
     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();

+        // If the toolbar doesn't have a superview then set it to our
+        // content view.

         if(![tbarNSView superview])
             [m_frameNSView addSubview: tbarNSView];
         // Do this after addSubView so that SetSize can work
         if(![tbarNSView superview])
             [m_frameNSView addSubview: tbarNSView];
         // Do this after addSubView so that SetSize can work


@@ -278,18 +282,10 @@ wxToolBar* wxFrame::CreateToolBar(long style,
                                       const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;
                                       const wxString& name)
 {
     wxAutoNSAutoreleasePool pool;

-    wxFrameBase::CreateToolBar(style,winid,name);
-    if(m_frameToolBar)
-    {
-        m_frameToolBar->CocoaRemoveFromParent();
-        m_frameToolBar->SetOwningFrame(this);
-    }
-    UpdateFrameNSView();
-    return m_frameToolBar;
+    return wxFrameBase::CreateToolBar(style,winid,name);

 }
 #endif // wxUSE_TOOLBAR
 
 void wxFrame::PositionStatusBar()
 {
 }
 }
 #endif // wxUSE_TOOLBAR
 
 void wxFrame::PositionStatusBar()
 {
 }

-