Updated list of subprojects.

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index c888e6c41d114c66af83623f28a7c41cf4e58b16..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,


@@ -355,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;


@@ -377,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


@@ -385,6 +387,7 @@ void wxFrame::PositionToolBar()
 #endif
         }
     }
 #endif
         }
     }

+#endif

 }
 
 void wxFrame::PositionBars()
 }
 
 void wxFrame::PositionBars()


@@ -398,4 +401,3 @@ void wxFrame::PositionBars()
 }
 
 #endif
 }
 
 #endif

-