Removed code duplication introduced during wxUniv merge in 1.132

[wxWidgets.git] / src / mac / frame.cpp

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 990ba1a5141cd7315d8768782e9dfbe3dd903d4b..b56f24712bdeedad834b5613ae5e68793b9aa169 100644 (file)
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
 // Purpose:     wxFrame
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
 // Purpose:     wxFrame

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

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

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -40,12 +40,6 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 #endif
 

-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
-#endif
-

 #define WX_MAC_STATUSBAR_HEIGHT 15 
 // ----------------------------------------------------------------------------
 // creation/destruction
 #define WX_MAC_STATUSBAR_HEIGHT 15 
 // ----------------------------------------------------------------------------
 // creation/destruction


@@ -53,16 +47,16 @@ bool wxFrame::m_useNativeStatusBar = FALSE;
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

-  m_frameMenuBar = NULL;
-
+    m_frameMenuBar = NULL;
+    

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-  m_frameToolBar = NULL ;
+    m_frameToolBar = NULL ;

 #endif
 #endif

-  m_frameStatusBar = NULL;
-  m_winLastFocused = NULL ;
-
+    m_frameStatusBar = NULL;
+    m_winLastFocused = NULL ;
+    

     m_iconized = FALSE;
     m_iconized = FALSE;

-
+    

 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif


@@ -70,7 +64,7 @@ void wxFrame::Init()
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
 
 wxPoint wxFrame::GetClientAreaOrigin() const
 {

-       // on mac we are at position -1,-1 with the control
+    // on mac we are at position -1,-1 with the control

     wxPoint pt(0, 0);
 
 #if wxUSE_TOOLBAR
     wxPoint pt(0, 0);
 
 #if wxUSE_TOOLBAR


@@ -101,26 +95,25 @@ bool wxFrame::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
-
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
+    

     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;

+    
+    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;

 
 

-  MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-  
-       m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
-
-  wxModelessWindows.Append(this);
+    m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;

 
 

-  return TRUE;
+    wxModelessWindows.Append(this);
+    
+    return TRUE;

 }
 
 wxFrame::~wxFrame()
 {
 }
 
 wxFrame::~wxFrame()
 {

-  m_isBeingDeleted = TRUE;
-
-  DeleteAllBars();
-
+    m_isBeingDeleted = TRUE;
+    DeleteAllBars();

 }
 
 
 }
 
 


@@ -129,13 +122,14 @@ bool wxFrame::Enable(bool enable)
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 

-       if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
-       {
-               for ( int i = 0 ; i < m_frameMenuBar->GetMenuCount() ; ++ i )
-               {
-                       m_frameMenuBar->EnableTop( i , enable ) ;
-               }
-       }
+    if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
+    {
+         int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+        for ( int i = 0 ; i < iMaxMenu ; ++ i )
+        {
+            m_frameMenuBar->EnableTop( i , enable ) ;
+        }
+    }

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -147,24 +141,24 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 
     statusBar = new wxStatusBar(this, id,
         style, name);
 
     statusBar = new wxStatusBar(this, id,
         style, name);

-       statusBar->SetSize( 100 , 15 ) ;
+    statusBar->SetSize( 100 , 15 ) ;

     statusBar->SetFieldsCount(number);
     return statusBar;
 }
 
 void wxFrame::PositionStatusBar()
 {
     statusBar->SetFieldsCount(number);
     return statusBar;
 }
 
 void wxFrame::PositionStatusBar()
 {

-  if (m_frameStatusBar )
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    int sw, sh;
-    m_frameStatusBar->GetSize(&sw, &sh);
-
-    // Since we wish the status bar to be directly under the client area,
-    // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
-    m_frameStatusBar->SetSize(0, h, w, sh);
-   }
+    if (m_frameStatusBar )
+    {
+        int w, h;
+        GetClientSize(&w, &h);
+        int sw, sh;
+        m_frameStatusBar->GetSize(&sw, &sh);
+        
+        // Since we wish the status bar to be directly under the client area,
+        // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
+        m_frameStatusBar->SetSize(0, h, w, sh);
+    }

 }
 
 // Responds to colour changes, and passes event on to children.
 }
 
 // Responds to colour changes, and passes event on to children.


@@ -213,8 +207,8 @@ void wxFrame::OnActivate(wxActivateEvent& event)
 
         event.Skip();
     }
 
         event.Skip();
     }

-       else
-       {
+    else
+    {

         // restore focus to the child which was last focused
         wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
                                             : NULL;
         // restore focus to the child which was last focused
         wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
                                             : NULL;


@@ -223,51 +217,77 @@ void wxFrame::OnActivate(wxActivateEvent& event)
             parent = this;
         }
 
             parent = this;
         }
 

-       wxSetFocusToChild(parent, &m_winLastFocused);
+        wxSetFocusToChild(parent, &m_winLastFocused);

 
 

-           if ( m_frameMenuBar != NULL )
-           {
-               m_frameMenuBar->MacInstallMenuBar() ;
-           }
-       }
+        if ( m_frameMenuBar != NULL )
+        {
+            m_frameMenuBar->MacInstallMenuBar() ;
+        }
+        else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        {
+            // Trying toplevel frame menbar
+            if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() )
+                ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
+         }
+    }

 }
 
 }
 

-void wxFrame::DoGetClientSize(int *x, int *y) const
+void wxFrame::DetachMenuBar()
+{
+    if ( m_frameMenuBar )
+    {
+        m_frameMenuBar->UnsetInvokingWindow();
+    }
+
+    wxFrameBase::DetachMenuBar();
+}
+
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )

 {
 {

-       wxWindow::DoGetClientSize( x , y ) ;
+    wxFrameBase::AttachMenuBar(menuBar);

 
 

+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->SetInvokingWindow( this );
+    }
+}
+
+void wxFrame::DoGetClientSize(int *x, int *y) const
+{
+    wxWindow::DoGetClientSize( x , y ) ;
+    

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-  if ( GetStatusBar() && y )
-  {
-    int statusX, statusY;
-    GetStatusBar()->GetClientSize(&statusX, &statusY);
-    *y -= statusY;
-  }
+    if ( GetStatusBar() && y )
+    {
+        int statusX, statusY;
+        GetStatusBar()->GetClientSize(&statusX, &statusY);
+        *y -= statusY;
+    }

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

-
-  wxPoint pt(GetClientAreaOrigin());
-  if ( y )
-    *y -= pt.y;
-  if ( x ) 
-    *x -= pt.x;
+    
+    wxPoint pt(GetClientAreaOrigin());
+    if ( y )
+        *y -= pt.y;
+    if ( x ) 
+        *x -= pt.x;

 }
 
 void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 {
 }
 
 void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 {

-       int currentclientwidth , currentclientheight ;
-       int currentwidth , currentheight ;
-       
-       GetClientSize( &currentclientwidth , &currentclientheight ) ;
-       GetSize( &currentwidth , &currentheight ) ;
-       
-       // find the current client size
+    int currentclientwidth , currentclientheight ;
+    int currentwidth , currentheight ;
+    
+    GetClientSize( &currentclientwidth , &currentclientheight ) ;
+    GetSize( &currentwidth , &currentheight ) ;
+    
+    // find the current client size

 
   // Find the difference between the entire window (title bar and all)
   // and the client area; add this to the new client size to move the
   // window
 
 
   // Find the difference between the entire window (title bar and all)
   // and the client area; add this to the new client size to move the
   // window
 

-       DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
-               currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
+    DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+        currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;

 }
 
 
 }
 
 


@@ -286,8 +306,8 @@ void wxFrame::PositionToolBar()
 {
     int cw, ch;
 
 {
     int cw, ch;
 

-       cw = m_width ;
-       ch = m_height ;
+    cw = m_width ;
+    ch = m_height ;

 
     if ( GetStatusBar() )
     {
 
     if ( GetStatusBar() )
     {