respect styles during creation as well

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 5e1cc74cd934a2444e0d0e3448af4a726e8921cb..25820c27684f14693a59038cb910ed32521b5aec 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -30,7 +30,6 @@
 extern wxWindowList wxModelessWindows;
 extern wxList wxPendingDelete;
 
-#if !USE_SHARED_LIBRARY
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
  // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
@@ -40,9 +39,8 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 END_EVENT_TABLE()
 
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
-#endif
 
-#define WX_MAC_STATUSBAR_HEIGHT 18 
+#define WX_MAC_STATUSBAR_HEIGHT 18
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
@@ -50,15 +48,15 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 void wxFrame::Init()
 {
     m_frameMenuBar = NULL;
-    
+
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL ;
 #endif
     m_frameStatusBar = NULL;
     m_winLastFocused = NULL ;
-    
-    m_iconized = FALSE;
-    
+
+    m_iconized = false;
+
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
@@ -72,37 +70,64 @@ bool wxFrame::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
-    
+
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
-        return FALSE;
-    
+        return false;
+
     wxModelessWindows.Append(this);
-    
-    return TRUE;
+
+    return true;
 }
 
 wxFrame::~wxFrame()
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
     DeleteAllBars();
 }
 
+// get the origin of the client area in the client coordinates
+wxPoint wxFrame::GetClientAreaOrigin() const
+{
+    wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
+    
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )
+    {
+        int w, h;
+        toolbar->GetSize(&w, &h);
+        
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            pt.x += w;
+        }
+        else
+        {
+#if !wxMAC_USE_NATIVE_TOOLBAR
+            pt.y += h;
+#endif
+        }
+    }
+#endif // wxUSE_TOOLBAR
+    
+    return pt;
+}
 
 bool wxFrame::Enable(bool enable)
 {
     if ( !wxWindow::Enable(enable) )
-        return FALSE;
+        return false;
 
     if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
     {
-         int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+         int iMaxMenu = m_frameMenuBar->GetMenuCount();
         for ( int i = 0 ; i < iMaxMenu ; ++ i )
         {
             m_frameMenuBar->EnableTop( i , enable ) ;
         }
     }
 
-    return TRUE;
+    return true;
 }
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
@@ -123,7 +148,7 @@ void wxFrame::PositionStatusBar()
     {
         int w, h;
         GetClientSize(&w, &h);
-        
+
         // 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, WX_MAC_STATUSBAR_HEIGHT);
@@ -224,14 +249,14 @@ void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {
     wxTopLevelWindow::DoGetClientSize( x , y ) ;
-    
+
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
     {
-        if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT;
+        *y -= WX_MAC_STATUSBAR_HEIGHT;
     }
 #endif // wxUSE_STATUSBAR
-    
+
 #if wxUSE_TOOLBAR
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
@@ -245,13 +270,16 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
         }
         else
         {
+#if wxMAC_USE_NATIVE_TOOLBAR
+            // todo verify whether HIToolBox is giving correct sizes here for the tlw
             if ( y )  *y -= h;
+#endif
         }
     }
 #endif // wxUSE_TOOLBAR
 }
 
-bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const 
+bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
 {
 #if wxUSE_STATUSBAR
     if ( child == GetStatusBar() )
@@ -270,14 +298,14 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 {
     int currentclientwidth , currentclientheight ;
     int currentwidth , currentheight ;
-    
+
     GetClientSize( &currentclientwidth , &currentclientheight ) ;
     if ( clientwidth == -1 )
         clientwidth = currentclientwidth ;
     if ( clientheight == -1 )
         clientheight = currentclientheight ;
     GetSize( &currentwidth , &currentheight ) ;
-    
+
     // find the current client size
 
   // Find the difference between the entire window (title bar and all)
@@ -290,6 +318,23 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 
 
 #if wxUSE_TOOLBAR
+void wxFrame::SetToolBar(wxToolBar *toolbar)
+{
+    if ( m_frameToolBar == toolbar )
+        return ;
+    
+#if wxMAC_USE_NATIVE_TOOLBAR
+    if ( m_frameToolBar )
+        m_frameToolBar->MacInstallNativeToolbar(false) ;
+#endif
+    
+    m_frameToolBar = toolbar ;
+#if wxMAC_USE_NATIVE_TOOLBAR
+    if ( toolbar )
+        toolbar->MacInstallNativeToolbar( true ) ;
+#endif
+}
+
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
@@ -317,7 +362,7 @@ void wxFrame::PositionToolBar()
     {
         int tx, ty, tw, th;
         tx = ty = 0 ;
-        
+
         GetToolBar()->GetSize(& tw, & th);
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
@@ -328,8 +373,10 @@ void wxFrame::PositionToolBar()
         }
         else
         {
+#if !wxMAC_USE_NATIVE_TOOLBAR
             // Use the 'real' position
             GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS );
+#endif
         }
     }
 }