Fixup Blit so it can be used with a source that is a wxBufferedDC,

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index dbc406c76886dfd7f2fd7d1f24665d6c525b4fb7..d414c78a6b70e6d94f0f201e1706a211318f6b86 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        frame.cpp
+// Name:        src/mac/carbon/frame.cpp

 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:


@@ -12,19 +12,21 @@
 #include "wx/wxprec.h"
 
 #include "wx/frame.h"
 #include "wx/wxprec.h"
 
 #include "wx/frame.h"

-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-#include "wx/menuitem.h"
-#include "wx/menu.h"
-#include "wx/dcclient.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
+#endif // WX_PRECOMP

 
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;
 
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;

-extern wxList wxPendingDelete;

 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)


@@ -44,20 +46,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 void wxFrame::Init()
 {
 
 void wxFrame::Init()
 {

-    m_frameMenuBar = NULL;
-    m_frameStatusBar = NULL;

     m_winLastFocused = NULL;
     m_winLastFocused = NULL;

-
-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL;
-#endif
-
-#if wxUSE_TOOLTIPS
-    // NB: is this used anywhere?
-    m_hwndToolTip = NULL;
-#endif
-
-    m_iconized = false;

 }
 
 bool wxFrame::Create(wxWindow *parent,
 }
 
 bool wxFrame::Create(wxWindow *parent,


@@ -107,7 +96,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
         }
     }
 #endif
         }
     }
 #endif

-    
+

     return pt;
 }
 
     return pt;
 }
 


@@ -134,7 +123,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     wxStatusBar *statusBar;
 
     statusBar = new wxStatusBar(this, id, style, name);
     wxStatusBar *statusBar;
 
     statusBar = new wxStatusBar(this, id, style, name);

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

     statusBar->SetFieldsCount(number);
 
     return statusBar;
     statusBar->SetFieldsCount(number);
 
     return statusBar;


@@ -204,21 +193,25 @@ void wxFrame::OnActivate(wxActivateEvent& event)
             ? m_winLastFocused->GetParent()
             : NULL;
 
             ? m_winLastFocused->GetParent()
             : NULL;
 

-        if ( !parent )
+        if (parent == NULL)

             parent = this;
 
         wxSetFocusToChild(parent, &m_winLastFocused);
 
         if (m_frameMenuBar != NULL)
         {
             parent = this;
 
         wxSetFocusToChild(parent, &m_winLastFocused);
 
         if (m_frameMenuBar != NULL)
         {

-            m_frameMenuBar->MacInstallMenuBar() ;
+            m_frameMenuBar->MacInstallMenuBar();

         }
         }

-        else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        else

         {
         {

-            // Trying toplevel frame membar
-            if (((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar())
-                ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
-         }
+            wxFrame *tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame );
+            if (tlf != NULL)
+            {
+                // Trying top-level frame membar
+                if (tlf->GetMenuBar())
+                    tlf->GetMenuBar()->MacInstallMenuBar();
+            }
+        }

     }
 }
 
     }
 }
 


@@ -232,24 +225,23 @@ void wxFrame::DetachMenuBar()
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {

-    wxToplLevelWindowMac* tlw = wxFindWinFromMacWindow(FrontNonFloatingWindow()) ;
+    wxFrame* tlf = wxDynamicCast( wxFindWinFromMacWindow( FrontNonFloatingWindow() ) , wxFrame );
+    bool makeCurrent = false;

 
 

-    bool makeCurrent = false ;
-    

     // if this is already the current menubar or we are the frontmost window
     // if this is already the current menubar or we are the frontmost window

-    if ( m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() || tlw == this )
-        makeCurrent = true ;
-    // or we have a situation where this is a App Level Menubar like MDI
-    else if ( tlw != NULL && tlw->GetMenuBar() == NULL && ((wxFrame*)wxTheApp->GetTopWindow()) == this )
-        makeCurrent = true ;
-    
-    wxFrameBase::AttachMenuBar(menuBar);
+    if ( (tlf == this) || (m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar()) )
+        makeCurrent = true;
+    // or there is an app-level menubar like MDI
+    else if ( tlf && (tlf->GetMenuBar() == NULL) && (((wxFrame*)wxTheApp->GetTopWindow()) == this) )
+        makeCurrent = true;
+
+    wxFrameBase::AttachMenuBar( menuBar );

 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
         if (makeCurrent)
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
         if (makeCurrent)

-            m_frameMenuBar->MacInstallMenuBar() ;
+            m_frameMenuBar->MacInstallMenuBar();

     }
 }
 
     }
 }
 


@@ -325,7 +317,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if ( m_frameToolBar == toolbar )
         return ;
 {
     if ( m_frameToolBar == toolbar )
         return ;

-    
+

 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;


@@ -352,15 +344,19 @@ void wxFrame::PositionToolBar()
     int cw, ch;
 
     GetSize( &cw , &ch ) ;
     int cw, ch;
 
     GetSize( &cw , &ch ) ;

+            
+    int statusX = 0 ;
+    int statusY = 0 ;

 
 

+#if wxUSE_STATUSBAR

     if (GetStatusBar() && GetStatusBar()->IsShown())
     {
     if (GetStatusBar() && GetStatusBar()->IsShown())
     {

-        int statusX, statusY;
-

         GetStatusBar()->GetClientSize(&statusX, &statusY);
         ch -= statusY;
     }
         GetStatusBar()->GetClientSize(&statusX, &statusY);
         ch -= statusY;
     }

+#endif

 
 

+#if wxUSE_TOOLBAR

     if (GetToolBar())
     {
         int tx, ty, tw, th;
     if (GetToolBar())
     {
         int tx, ty, tw, th;


@@ -374,6 +370,15 @@ void wxFrame::PositionToolBar()
             // have the original client size.
             GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );
         }
             // have the original client size.
             GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );
         }

+        else if (GetToolBar()->GetWindowStyleFlag() & wxTB_BOTTOM)
+        {
+            //FIXME: this positions the tool bar almost correctly, but still it doesn't work right yet,
+            //as 1) the space for the 'old' top toolbar is still taken up, and 2) the toolbar
+            //doesn't extend it's width to the width of the frame.
+            tx = 0;
+            ty = ch - (th + statusY);
+            GetToolBar()->SetSize(tx, ty, cw, th, wxSIZE_NO_ADJUSTMENTS );
+        }

         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR
         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR


@@ -382,6 +387,17 @@ void wxFrame::PositionToolBar()
 #endif
         }
     }
 #endif
         }
     }

+#endif

 }
 }

+
+void wxFrame::PositionBars()
+{
+#if wxUSE_STATUSBAR
+    PositionStatusBar();

 #endif
 #endif

+#if wxUSE_TOOLBAR
+    PositionToolBar();
+#endif
+}

 
 

+#endif