// Author: Julian Smart, Vadim Zeitlin
// Created: 01/02/97
// Id: $Id$
-// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Copyright: (c) 1998 Robert Roebling and Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/statusbr.h"
#endif
-// FIXME - temporary hack in absence of wxTLW in all ports!
-#ifndef wxTopLevelWindowNative
- #define wxTopLevelWindow wxTopLevelWindowBase
-#endif
-
// ----------------------------------------------------------------------------
// event table
// ----------------------------------------------------------------------------
#if wxUSE_STATUSBAR
m_frameStatusBar = NULL;
#endif // wxUSE_STATUSBAR
+
+ m_statusBarPane = 0;
+}
+
+wxFrameBase::~wxFrameBase()
+{
+ // this destructor is required for Darwin
}
wxFrame *wxFrameBase::New(wxWindow *parent,
{
wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
-#if wxUSE_TOOLBAR
- if ( GetToolBar() && GetToolBar()->IsShown() )
+#if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
+ wxToolBar *toolbar = GetToolBar();
+ if ( toolbar && toolbar->IsShown() )
{
int w, h;
- GetToolBar()->GetSize(& w, & h);
+ toolbar->GetSize(&w, &h);
- if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
+ if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
{
pt.x += w;
}
commandEvent.SetEventObject(this);
wxMenuItem *item = bar->FindItem(id);
- if ( item && item->IsCheckable() )
+ if (item)
{
- item->Toggle();
+ if (!item->IsEnabled())
+ return TRUE;
+
+ if (item->IsCheckable())
+ {
+ item->Toggle();
- // use the new value
- commandEvent.SetInt(item->IsChecked());
+ // use the new value
+ commandEvent.SetInt(item->IsChecked());
+ }
}
- return GetEventHandler()->ProcessEvent(commandEvent);
+ GetEventHandler()->ProcessEvent(commandEvent);
+ return TRUE;
#else // !wxUSE_MENUS
return FALSE;
#endif // wxUSE_MENUS/!wxUSE_MENUS
PositionStatusBar();
}
-bool wxFrameBase::ShowMenuHelp(wxStatusBar *statbar, int menuId)
+void wxFrameBase::PushStatusText(const wxString& text, int number)
{
-#if wxUSE_MENUS
- if ( !statbar )
- return FALSE;
+ wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+ m_frameStatusBar->PushStatusText(text, number);
+}
+void wxFrameBase::PopStatusText(int number)
+{
+ wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set text for") );
+
+ m_frameStatusBar->PopStatusText(number);
+}
+
+bool wxFrameBase::ShowMenuHelp(wxStatusBar *WXUNUSED(statbar), int menuId)
+{
+#if wxUSE_MENUS
// if no help string found, we will clear the status bar text
wxString helpString;
+ bool show = menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */;
- if ( menuId != wxID_SEPARATOR && menuId != -2 /* wxID_TITLE */ )
+ if ( show )
{
wxMenuBar *menuBar = GetMenuBar();
if ( menuBar )
}
}
- // set status text even if the string is empty - this will at least
- // remove the string from the item which was previously selected
- statbar->SetStatusText(helpString);
+ DoGiveHelp(helpString, show);
return !helpString.IsEmpty();
#else // !wxUSE_MENUS
#endif // wxUSE_STATUSBAR
+void wxFrameBase::DoGiveHelp(const wxString& text, bool show)
+{
+#if wxUSE_STATUSBAR
+ if ( m_statusBarPane < 0 ) return;
+ wxStatusBar* statbar = GetStatusBar();
+ if ( !statbar ) return;
+
+ wxString help = show ? text : wxString();
+ statbar->SetStatusText( help, m_statusBarPane );
+#endif // wxUSE_STATUSBAR
+}
+
+
// ----------------------------------------------------------------------------
// toolbar stuff
// ----------------------------------------------------------------------------
}
if (item->GetSubMenu())
- DoMenuUpdates(item->GetSubMenu(), (wxWindow*) NULL);
+ DoMenuUpdates(item->GetSubMenu(), focusWin);
}
node = node->GetNext();
}
{
if ( menubar )
{
- m_frameMenuBar = menubar;
menubar->Attach((wxFrame *)this);
+ m_frameMenuBar = menubar;
}
}