// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "framebase.h"
#endif
// event table
// ----------------------------------------------------------------------------
+#if wxUSE_MENUS && wxUSE_STATUSBAR
+
BEGIN_EVENT_TABLE(wxFrameBase, wxTopLevelWindow)
-#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
EVT_MENU_OPEN(wxFrameBase::OnMenuOpen)
-#endif
+ EVT_MENU_CLOSE(wxFrameBase::OnMenuClose)
+
EVT_MENU_HIGHLIGHT_ALL(wxFrameBase::OnMenuHighlight)
END_EVENT_TABLE()
+#endif // wxUSE_MENUS && wxUSE_STATUSBAR
+
// ============================================================================
// implementation
// ============================================================================
{
#if wxUSE_MENUS
if ( win == GetMenuBar() )
- return TRUE;
+ return true;
#endif // wxUSE_MENUS
#if wxUSE_STATUSBAR
if ( win == GetStatusBar() )
- return TRUE;
+ return true;
#endif // wxUSE_STATUSBAR
#if wxUSE_TOOLBAR
if ( win == GetToolBar() )
- return TRUE;
+ return true;
#endif // wxUSE_TOOLBAR
- return FALSE;
+ return false;
}
// ----------------------------------------------------------------------------
return pt;
}
+
+void wxFrameBase::SendSizeEvent()
+{
+ wxSizeEvent event( GetSize(), GetId() );
+ event.SetEventObject( this );
+ GetEventHandler()->AddPendingEvent( event );
+}
+
+
// ----------------------------------------------------------------------------
// misc
// ----------------------------------------------------------------------------
#if wxUSE_MENUS
wxMenuBar *bar = GetMenuBar();
if ( !bar )
- return FALSE;
+ return false;
wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
commandEvent.SetEventObject(this);
if (item)
{
if (!item->IsEnabled())
- return TRUE;
+ return true;
+
+ if ((item->GetKind() == wxITEM_RADIO) && item->IsChecked() )
+ return true;
if (item->IsCheckable())
{
}
GetEventHandler()->ProcessEvent(commandEvent);
- return TRUE;
+ return true;
#else // !wxUSE_MENUS
- return FALSE;
+ return false;
#endif // wxUSE_MENUS/!wxUSE_MENUS
}
void wxFrameBase::UpdateWindowUI(long flags)
{
wxWindowBase::UpdateWindowUI(flags);
-
+
#if wxUSE_TOOLBAR
if (GetToolBar())
GetToolBar()->UpdateWindowUI(flags);
else
DoMenuUpdates();
}
-#endif
+#endif // wxUSE_MENUS
}
// ----------------------------------------------------------------------------
-// event handlers
+// event handlers for status bar updates from menus
// ----------------------------------------------------------------------------
+#if wxUSE_MENUS && wxUSE_STATUSBAR
+
void wxFrameBase::OnMenuHighlight(wxMenuEvent& event)
{
#if wxUSE_STATUSBAR
#endif // wxUSE_STATUSBAR
}
+#if !wxUSE_IDLEMENUUPDATES
+void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
+#else
+void wxFrameBase::OnMenuOpen(wxMenuEvent& WXUNUSED(event))
+#endif
+{
+#if !wxUSE_IDLEMENUUPDATES
+ DoMenuUpdates(event.GetMenu());
+#endif // !wxUSE_IDLEMENUUPDATES
+}
+
+void wxFrameBase::OnMenuClose(wxMenuEvent& WXUNUSED(event))
+{
+ // do we have real status text to restore?
+ if ( !m_oldStatusText.empty() )
+ {
+ if ( m_statusBarPane >= 0 )
+ {
+ wxStatusBar *statbar = GetStatusBar();
+ if ( statbar )
+ statbar->SetStatusText(m_oldStatusText, m_statusBarPane);
+ }
+
+ m_oldStatusText.clear();
+ }
+}
+
+#endif // wxUSE_MENUS && wxUSE_STATUSBAR
+
// Implement internal behaviour (menu updating on some platforms)
void wxFrameBase::OnInternalIdle()
{
+ wxTopLevelWindow::OnInternalIdle();
+
#if wxUSE_MENUS && wxUSE_IDLEMENUUPDATES
if (wxUpdateUIEvent::CanUpdate(this))
DoMenuUpdates();
#endif
}
-void wxFrameBase::OnMenuOpen(wxMenuEvent& event)
-{
-#if wxUSE_MENUS && !wxUSE_IDLEMENUUPDATES
- DoMenuUpdates(event.GetMenu());
-#endif
-}
-
// ----------------------------------------------------------------------------
// status bar stuff
// ----------------------------------------------------------------------------
wxCHECK_MSG( !m_frameStatusBar, (wxStatusBar *)NULL,
wxT("recreating status bar in wxFrame") );
- m_frameStatusBar = OnCreateStatusBar( number, style, id, name );
- if ( m_frameStatusBar )
- PositionStatusBar();
+ SetStatusBar(OnCreateStatusBar(number, style, id, name));
return m_frameStatusBar;
}
DoGiveHelp(helpString, show);
- return !helpString.IsEmpty();
+ return !helpString.empty();
#else // !wxUSE_MENUS
- return FALSE;
+ return false;
#endif // wxUSE_MENUS/!wxUSE_MENUS
}
+void wxFrameBase::SetStatusBar(wxStatusBar *statBar)
+{
+ bool hadBar = m_frameStatusBar != NULL;
+ m_frameStatusBar = statBar;
+
+ if ( (m_frameStatusBar != NULL) != hadBar )
+ {
+ PositionStatusBar();
+
+ DoLayout();
+ }
+}
+
#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;
+ if ( m_statusBarPane < 0 )
+ {
+ // status bar messages disabled
+ return;
+ }
+
+ wxStatusBar *statbar = GetStatusBar();
+ if ( !statbar )
+ return;
+
+ wxString help;
+ if ( show )
+ help = text;
+
+ // remember the old status bar text if this is the first time we're called
+ // since the menu has been opened as we're going to overwrite it in our
+ // DoGiveHelp() and we want to restore it when the menu is closed
+ //
+ // note that it would be logical to do this in OnMenuOpen() but under MSW
+ // we get an EVT_MENU_HIGHLIGHT before EVT_MENU_OPEN, strangely enough, and
+ // so this doesn't work and instead we use the ugly trick with using
+ // special m_oldStatusText value as "menu opened" (but it is arguably
+ // better than adding yet another member variable to wxFrame on all
+ // platforms)
+ if ( m_oldStatusText.empty() )
+ {
+ m_oldStatusText = statbar->GetStatusText(m_statusBarPane);
+ if ( m_oldStatusText.empty() )
+ {
+ // use special value to prevent us from doing this the next time
+ m_oldStatusText += _T('\0');
+ }
+ }
- wxString help = show ? text : wxString();
- statbar->SetStatusText( help, m_statusBarPane );
+ statbar->SetStatusText(help, m_statusBarPane);
+#else
+ wxUnusedVar(text);
+ wxUnusedVar(show);
#endif // wxUSE_STATUSBAR
}
style = wxBORDER_NONE | wxTB_HORIZONTAL | wxTB_FLAT;
}
- m_frameToolBar = OnCreateToolBar(style, id, name);
+ SetToolBar(OnCreateToolBar(style, id, name));
return m_frameToolBar;
}
wxWindowID id,
const wxString& name)
{
+#if defined(__WXWINCE__) && defined(__POCKETPC__)
+ return new wxToolMenuBar(this, id,
+ wxDefaultPosition, wxDefaultSize,
+ style, name);
+#else
return new wxToolBar(this, id,
wxDefaultPosition, wxDefaultSize,
style, name);
+#endif
+}
+
+void wxFrameBase::SetToolBar(wxToolBar *toolbar)
+{
+ bool hadBar = m_frameToolBar != NULL;
+ m_frameToolBar = toolbar;
+
+ if ( (m_frameToolBar != NULL) != hadBar )
+ {
+ PositionToolBar();
+
+ DoLayout();
+ }
}
#endif // wxUSE_TOOLBAR
DetachMenuBar();
- AttachMenuBar(menubar);
+ this->AttachMenuBar(menubar);
}
#endif // wxUSE_MENUS
+
+#if WXWIN_COMPATIBILITY_2_2
+
+bool wxFrameBase::Command(int winid)
+{
+ return ProcessCommand(winid);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_2
projects / wxWidgets.git / blobdiff