Warning fix.

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index cded59c604887d003c26c948ada38447adf10940..ac1391d4de21a1d35396a719306b8bbc7a0ea142 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -23,39 +23,43 @@
 #include "wx/settings.h"
 #include "wx/app.h"
 
 #include "wx/settings.h"
 #include "wx/app.h"
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 

-extern wxList wxModelessWindows;
+extern wxWindowList wxModelessWindows;

 extern wxList wxPendingDelete;
 
 extern wxList wxPendingDelete;
 

-BEGIN_EVENT_TABLE(wxFrame, wxWindow)
-  EVT_SIZE(wxFrame::OnSize)
+#if !USE_SHARED_LIBRARY
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)

   EVT_ACTIVATE(wxFrame::OnActivate)
   EVT_ACTIVATE(wxFrame::OnActivate)

-  EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
+ // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)

   EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
   EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)

-  EVT_IDLE(wxFrame::OnIdle)
-  EVT_CLOSE(wxFrame::OnCloseWindow)
+//  EVT_IDLE(wxFrame::OnIdle)
+//  EVT_CLOSE(wxFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
-
-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrame::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrame::m_useNativeStatusBar = FALSE;
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 #endif
 
 #endif
 

-wxFrame::wxFrame()
+#define WX_MAC_STATUSBAR_HEIGHT 18 
+// ----------------------------------------------------------------------------
+// creation/destruction
+// ----------------------------------------------------------------------------
+
+void wxFrame::Init()

 {
 {

+    m_frameMenuBar = NULL;
+    

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-  m_frameToolBar = NULL ;
+    m_frameToolBar = NULL ;
+#endif
+    m_frameStatusBar = NULL;
+    m_winLastFocused = NULL ;
+    
+    m_iconized = FALSE;
+    
+#if wxUSE_TOOLTIPS
+    m_hwndToolTip = 0;

 #endif
 #endif

-
-       // in order to be able to give size events on show
-  m_frameMenuBar = NULL;
-  m_frameStatusBar = NULL;
-  m_iconized = FALSE;
-  m_isShown = FALSE;

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


@@ -66,141 +70,37 @@ bool wxFrame::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  if (!parent)
-    wxTopLevelWindows.Append(this);
-
-  SetName(name);
-  m_windowStyle = style;
-  m_frameMenuBar = NULL;
-  m_isShown = FALSE;
-
-#if wxUSE_TOOLBAR
-  m_frameToolBar = NULL ;
-#endif
-  m_frameStatusBar = NULL;
-
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
-
-  if (parent) parent->AddChild(this);
-
-  wxModelessWindows.Append(this);
-
-  // create frame.
-
-       Rect theBoundsRect;
-
-  m_x = (int)pos.x;
-  m_y = (int)pos.y;
-  if ( m_y < 50 )
-       m_y = 50 ;
-  if ( m_x < 20 )
-       m_x = 20 ;
-       
-  m_width = size.x;
-       if (m_width == -1) 
-               m_width = 20;
-  m_height = size.y;
-       if (m_height == -1) 
-               m_height = 20;
-
-       m_macWindowData = new MacWindowData() ;
-
-       ::SetRect(&theBoundsRect, m_x, m_y, m_x + m_width, m_y + m_height);
-
-       WindowClass wclass = kDocumentWindowClass ;
-       WindowAttributes attr = kWindowNoAttributes ;
-       
-       if ( ( m_windowStyle & wxMINIMIZE_BOX ) || ( m_windowStyle & wxMAXIMIZE_BOX ) )
-       {
-               attr |= kWindowFullZoomAttribute ;
-               attr |= kWindowResizableAttribute ;
-       }
-       if ( m_windowStyle & wxSTAY_ON_TOP )
-       {
-               wclass = kFloatingWindowClass ;
-               
-//                     if ( m_windowStyle & wxCAPTION )
-//                             attr |= kHasPaletteTitlebarMask ;
-       }
-       else
-       {
-       }
-       if ( m_windowStyle & wxSYSTEM_MENU )
-       {
-               attr |= kWindowCloseBoxAttribute ;
-       }
-       UMACreateNewWindow( wclass , attr , &theBoundsRect , &m_macWindowData->m_macWindow ) ;
-       wxAssociateWinWithMacWindow( m_macWindowData->m_macWindow , this ) ;
-       wxString label ;
-       if( wxApp::s_macDefaultEncodingIsPC )
-               label = wxMacMakeMacStringFromPC( title ) ;
-       else
-               label = title ;
-       UMASetWTitleC( m_macWindowData->m_macWindow , label ) ;
-       UMACreateRootControl( m_macWindowData->m_macWindow , &m_macWindowData->m_macRootControl ) ;
-       m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
-       m_macWindowData->m_macFocus = NULL ;
-  return TRUE;
+    
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;
+    
+    wxModelessWindows.Append(this);
+    
+    return TRUE;

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

-  wxTopLevelWindows.DeleteObject(this);
-
-  if (m_frameStatusBar)
-    delete m_frameStatusBar;
-  if (m_frameMenuBar)
-    delete m_frameMenuBar;
-
-/* Check if it's the last top-level window */
-
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       wxTheApp->ExitMainLoop() ;
-    }
-  }
-
-  wxModelessWindows.DeleteObject(this);
-}
-
-
-void wxFrame::Iconize(bool iconize)
-{
-    // TODO
+    m_isBeingDeleted = TRUE;
+    DeleteAllBars();

 }
 
 }
 

-// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
-{
-    // TODO
-}

 
 

-bool wxFrame::IsIconized() const
+bool wxFrame::Enable(bool enable)

 {
 {

-    // TODO
-    return FALSE;
-}
+    if ( !wxWindow::Enable(enable) )
+        return FALSE;

 
 

-// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
-{
-    // TODO
-    return FALSE;
-}
+    if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
+    {
+         int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+        for ( int i = 0 ; i < iMaxMenu ; ++ i )
+        {
+            m_frameMenuBar->EnableTop( i , enable ) ;
+        }
+    }

 
 

-void wxFrame::SetIcon(const wxIcon& icon)
-{
-  m_icon = icon;
-  // TODO
+    return TRUE;

 }
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 }
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,


@@ -208,122 +108,30 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
 {
     wxStatusBar *statusBar = NULL;
 
 {
     wxStatusBar *statusBar = NULL;
 

-    statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 17),
+    statusBar = new wxStatusBar(this, id,

         style, name);
         style, name);

-
-    // Set the height according to the font and the border size
-    // we shouldn't do this on the mac, because we have to fit the grow box
-    /*
-    wxClientDC dc(statusBar);
-    dc.SetFont(statusBar->GetFont());
-
-    long x, y;
-    dc.GetTextExtent("X", &x, &y);
-
-    int height = (int)( (y  * 1.1) + 2* statusBar->GetBorderY());
-
-    statusBar->SetSize(-1, -1, 100, height);
-
-               */
-
+    statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ;

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

-wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id,
-    const wxString& name)
-{
-  // Calling CreateStatusBar twice is an error.
-  wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, 
-               "recreating status bar in wxFrame" );
-
-  m_frameStatusBar = OnCreateStatusBar(number, style, id,
-    name);
-  if ( m_frameStatusBar )
-  {
-    PositionStatusBar();
-    return m_frameStatusBar;
-  }
-  else
-    return NULL;
-}
-
-void wxFrame::SetStatusText(const wxString& text, int number)
-{
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" );
-
-  m_frameStatusBar->SetStatusText(text, number);
-}
-
-void wxFrame::SetStatusWidths(int n, const int widths_field[])
-{
-  wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" );
-
-  m_frameStatusBar->SetStatusWidths(n, widths_field);
-  PositionStatusBar();
-}
-

 void wxFrame::PositionStatusBar()
 {
 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);
-   }
-}
-
-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
-{
-    if (!menuBar)
+    if (m_frameStatusBar && m_frameStatusBar->IsShown() )

     {
     {

-        m_frameMenuBar = NULL;
-        return;
-    }
-  
-    m_frameMenuBar = menuBar;
-               // TODO : we move this into the app code
-    m_frameMenuBar->MacInstallMenuBar() ;
-}
-
-void wxFrame::Fit()
-{
-  // Work out max. size
-  wxNode *node = GetChildren().First();
-  int max_width = 0;
-  int max_height = 0;
-  while (node)
-  {
-    // Find a child that's a subwindow, but not a dialog box.
-    wxWindow *win = (wxWindow *)node->Data();
-
-    if (!win->IsKindOf(CLASSINFO(wxFrame)) &&
-         !win->IsKindOf(CLASSINFO(wxDialog)))
-    {
-      int width, height;
-      int x, y;
-      win->GetSize(&width, &height);
-      win->GetPosition(&x, &y);
-
-      if ((x + width) > max_width)
-        max_width = x + width;
-      if ((y + height) > max_height)
-        max_height = y + height;
+        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);

     }
     }

-    node = node->Next();
-  }
-  SetClientSize(max_width, max_height);

 }
 
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

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

     Refresh();
 
     if ( m_frameStatusBar )
     Refresh();
 
     if ( m_frameStatusBar )


@@ -337,280 +145,151 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
     wxWindow::OnSysColourChanged(event);
 }
 

-// Default resizing behaviour - if only ONE subwindow,
-// resize to client rectangle size
-void wxFrame::OnIdle(wxIdleEvent& WXUNUSED(event) )
-{
-    DoMenuUpdates();
-}
-

 
 

-// update all menus
-void wxFrame::DoMenuUpdates()
+// Default activation behaviour - set the focus for the first child
+// subwindow found.
+void wxFrame::OnActivate(wxActivateEvent& event)

 {
 {

-    wxMenuBar* bar = GetMenuBar();
-
-    if ( bar != NULL )
+    if ( !event.GetActive() )

     {
     {

-        int nCount = bar->GetMenuCount();
-        for (int n = 0; n < nCount; n++)
-            DoMenuUpdates(bar->GetMenu(n), (wxWindow*) NULL);
-    }
-}
+       // remember the last focused child if it is our child
+        m_winLastFocused = FindFocus();

 
 

-// update a menu and all submenus recursively
-void wxFrame::DoMenuUpdates(wxMenu* menu, wxWindow* WXUNUSED(focusWin))
-{
-    wxEvtHandler* evtHandler = GetEventHandler();
-    wxMenuItemList::Node* node = menu->GetMenuItems().GetFirst();
-    while (node)
-    {
-        wxMenuItem* item = node->GetData();
-        if ( !item->IsSeparator() )
+        // so we NULL it out if it's a child from some other frame
+        wxWindow *win = m_winLastFocused;
+        while ( win )

         {
         {

-            wxWindowID id = item->GetId();
-            wxUpdateUIEvent event(id);
-            event.SetEventObject( this );
-
-            if (evtHandler->ProcessEvent(event))
+            if ( win->IsTopLevel() )

             {
             {

-                if (event.GetSetText())
-                    menu->SetLabel(id, event.GetText());
-                if (event.GetSetChecked())
-                    menu->Check(id, event.GetChecked());
-                if (event.GetSetEnabled())
-                    menu->Enable(id, event.GetEnabled());
+                if ( win != this )
+                {
+                    m_winLastFocused = NULL;
+                }
+
+                break;

             }
 
             }
 

-            if (item->GetSubMenu())
-                DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
+            win = win->GetParent();

         }
         }

-        node = node->GetNext();
-    }
-}

 
 

-void wxFrame::OnSize(wxSizeEvent& event)
-{
-  // if we're using constraints - do use them
-  #if wxUSE_CONSTRAINTS
-    if ( GetAutoLayout() ) {
-      Layout();
-      return;
+        event.Skip();

     }
     }

-  #endif
-
-  // do we have _exactly_ one child?
-  wxWindow *child = NULL;
-  for ( wxNode *node = GetChildren().First(); node; node = node->Next() )
-  {
-    wxWindow *win = (wxWindow *)node->Data();
-    if ( !win->IsKindOf(CLASSINFO(wxFrame))  &&
-         !win->IsKindOf(CLASSINFO(wxDialog)) && 
-         (win != GetStatusBar()) 
-#if wxUSE_TOOLBAR
-         &&
-         (win != GetToolBar()) 
-#endif
-         )
+    else

     {
     {

-      if ( child )
-        return;     // it's our second subwindow - nothing to do
-      child = win;
-    }
-  }
-
-  if ( child ) {
-    // we have exactly one child - set it's size to fill the whole frame
-    int clientW, clientH;
-    GetClientSize(&clientW, &clientH);
+        // restore focus to the child which was last focused
+        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                            : NULL;
+        if ( !parent )
+        {
+            parent = this;
+        }

 
 

-    int x = 0;
-    int y = 0;
+        wxSetFocusToChild(parent, &m_winLastFocused);

 
 

-    child->SetSize(x, y, clientW, clientH);
-  }
+        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();
+         }
+    }

 }
 
 }
 

-// Default activation behaviour - set the focus for the first child
-// subwindow found.
-void wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrame::DetachMenuBar()

 {
 {

-  for(wxNode *node = GetChildren().First(); node; node = node->Next())
-  {
-    // Find a child that's a subwindow, but not a dialog box.
-    wxWindow *child = (wxWindow *)node->Data();
-    if (!child->IsKindOf(CLASSINFO(wxFrame)) &&
-         !child->IsKindOf(CLASSINFO(wxDialog)))
+    if ( m_frameMenuBar )

     {
     {

-      child->SetFocus();
-      return;
+        m_frameMenuBar->UnsetInvokingWindow();

     }
     }

-  }
-}

 
 

-// The default implementation for the close window event.
-void wxFrame::OnCloseWindow(wxCloseEvent& event)
-{
-    this->Destroy();
+    wxFrameBase::DetachMenuBar();

 }
 
 }
 

-// Destroy the window (delayed, if a managed window)
-bool wxFrame::Destroy()
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )

 {
 {

-  if (!wxPendingDelete.Member(this))
-    wxPendingDelete.Append(this);
-  return TRUE;
-}
+    wxFrameBase::AttachMenuBar(menuBar);

 
 

-// Default menu selection behaviour - display a help string
-void wxFrame::OnMenuHighlight(wxMenuEvent& event)
-{
-  if (GetStatusBar())
-  {
-    if (event.GetMenuId() == -1)
-      SetStatusText("");
-    else
+    if (m_frameMenuBar)

     {
     {

-      wxMenuBar *menuBar = GetMenuBar();
-      if (menuBar)
-      {
-        wxString helpString(menuBar->GetHelpString(event.GetMenuId()));
-        if (helpString != "")
-          SetStatusText(helpString);
-      }
+        m_frameMenuBar->SetInvokingWindow( this );

     }
     }

-  }
-}
-
-wxMenuBar *wxFrame::GetMenuBar() const
-{
-  return m_frameMenuBar;
-}
-
-
-// Call this to simulate a menu command
-void wxFrame::Command(int id)
-{
-  ProcessCommand(id);

 }
 
 }
 

-void wxFrame::ProcessCommand(int id)
-{
-  wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
-  commandEvent.SetInt( id );
-  commandEvent.SetEventObject( this );
-
-  wxMenuBar *bar = GetMenuBar() ;
-  if (!bar)
-    return;
-
-/* TODO: check the menu item if required
-  wxMenuItem *item = bar->FindItemForId(id) ;
-  if (item && item->IsCheckable())
-  {
-    bar->Check(id,!bar->Checked(id)) ;
-  }
-*/
-
-  GetEventHandler()->ProcessEvent(commandEvent);
-}
-
-// Checks if there is a toolbar, and returns the first free client position
-wxPoint wxFrame::GetClientAreaOrigin() const
+void wxFrame::DoGetClientSize(int *x, int *y) const

 {
 {

-    wxPoint pt(0, 0);
+    wxTopLevelWindow::DoGetClientSize( x , y ) ;
+    
+#if wxUSE_STATUSBAR
+    if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
+    {
+        if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT;
+    }
+#endif // wxUSE_STATUSBAR
+    

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-    if (GetToolBar())
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )

     {
         int w, h;
     {
         int w, h;

-        GetToolBar()->GetSize(& w, & h);
+        toolbar->GetSize(&w, &h);

 
 

-        if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )

         {
         {

-            pt.x += w;
+            if ( x )  *x -= w;

         }
         else
         {
         }
         else
         {

-            pt.y += h;
+            if ( y )  *y -= h;

         }
     }
         }
     }

-#endif
-    return pt;
-}
-
-void wxFrame::DoGetClientSize(int *x, int *y) const
-{
-       wxWindow::DoGetClientSize( x , y ) ;
-
-  if ( GetStatusBar() )
-  {
-    int statusX, statusY;
-    GetStatusBar()->GetClientSize(&statusX, &statusY);
-    *y -= statusY;
-  }
-
-  wxPoint pt(GetClientAreaOrigin());
-  *y -= pt.y;
-  *x -= pt.x;
+#endif // wxUSE_TOOLBAR

 }
 
 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 ) ;
+    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)
   // 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 ) ;

 }
 
 
 #if wxUSE_TOOLBAR
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
 }
 
 
 #if wxUSE_TOOLBAR
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {

-    wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
-               "recreating toolbar in wxFrame" );
-
-    wxToolBar* toolBar = OnCreateToolBar(style, id, name);
-    if (toolBar)
+    if ( wxFrameBase::CreateToolBar(style, id, name) )

     {
     {

-        SetToolBar(toolBar);

         PositionToolBar();
         PositionToolBar();

-        return toolBar;

     }
     }

-    else
-    {
-        return NULL;
-    }
-}

 
 

-wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name)
-{
-    return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name);
+    return m_frameToolBar;

 }
 
 void wxFrame::PositionToolBar()
 {
     int cw, ch;
 
 }
 
 void wxFrame::PositionToolBar()
 {
     int cw, ch;
 

-    // TODO: we actually need to use the low-level client size, before
-    // the toolbar/status bar were added.
-    // So DEFINITELY replace the line below with something appropriate.
+    GetSize( &cw , &ch ) ;

 
 

-   //  GetClientSize(& cw, &ch);
-
-               cw = m_width ;
-               ch = m_height ;
-
-    if ( GetStatusBar() )
+    if ( GetStatusBar() && GetStatusBar()->IsShown())

     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);
     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);


@@ -619,20 +298,21 @@ void wxFrame::PositionToolBar()
 
     if (GetToolBar())
     {
 
     if (GetToolBar())
     {

-        int tw, th;
+        int tx, ty, tw, th;
+        tx = ty = 0 ;
+        

         GetToolBar()->GetSize(& tw, & th);
         GetToolBar()->GetSize(& tw, & th);

-

         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
             // means, pretend we don't have toolbar/status bar, so we
             // have the original client size.
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
             // means, pretend we don't have toolbar/status bar, so we
             // have the original client size.

-            GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS);
+            GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );

         }
         else
         {
             // Use the 'real' position
         }
         else
         {
             // Use the 'real' position

-            GetToolBar()->SetSize(0, 0, cw, th, wxSIZE_NO_ADJUSTMENTS);
+            GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS );

         }
     }
 }
         }
     }
 }