return false;
}
- // wxASSERT_MSG( m_cursor.Ok(),
+ // wxASSERT_MSG( m_cursor.IsOk(),
// wxT("cursor must be valid after call to the base version"));
const wxCursor* cursor2 = NULL;
- if (m_cursor.Ok())
+ if (m_cursor.IsOk())
cursor2 = & m_cursor;
else
cursor2 = wxSTANDARD_CURSOR;
{
int height;
- if (m_font.Ok())
+ if (m_font.IsOk())
wxGetTextExtent (GetXDisplay(), m_font, 1.0,
"x", NULL, &height, NULL, NULL);
else
{
int width;
- if (m_font.Ok())
+ if (m_font.IsOk())
wxGetTextExtent (GetXDisplay(), m_font, 1.0,
"x", &width, NULL, NULL, NULL);
else
if (externalLeading)
*externalLeading = 0;
- if (fontToUse->Ok())
+ if (fontToUse->IsOk())
wxGetTextExtent (GetXDisplay(), *fontToUse, 1.0,
string, x, y, NULL, descent);
else
}
}
-void wxWindow::OnInternalIdle()
-{
- // This calls the UI-update mechanism (querying windows for
- // menu/toolbar/control state information)
- if (wxUpdateUIEvent::CanUpdate(this) && IsShownOnScreen())
- UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-
// ----------------------------------------------------------------------------
// accelerators
// ----------------------------------------------------------------------------
bool wxWindow::ProcessAccelerator(wxKeyEvent& event)
{
#if wxUSE_ACCEL
- if (!m_acceleratorTable.Ok())
+ if (!m_acceleratorTable.IsOk())
return false;
int count = m_acceleratorTable.GetCount();
wxMenuItem* item = frame->GetMenuBar()->FindItem(entry->GetCommand());
if (item)
{
- wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, entry->GetCommand());
+ wxCommandEvent commandEvent(wxEVT_MENU, entry->GetCommand());
commandEvent.SetEventObject(frame);
// If ProcessEvent returns true (it was handled), then
// For now, only buttons.
if ( wxDynamicCast(child, wxButton) )
{
- wxCommandEvent commandEvent (wxEVT_COMMAND_BUTTON_CLICKED, child->GetId());
+ wxCommandEvent commandEvent (wxEVT_BUTTON, child->GetId());
commandEvent.SetEventObject(child);
return child->HandleWindowEvent(commandEvent);
}
// to its original size! We therefore have to set the size
// back again. TODO: a better way in Motif?
Widget w = (Widget) GetLabelWidget(); // Usually the main widget
- if (w && m_font.Ok())
+ if (w && m_font.IsOk())
{
int width, height, width1, height1;
GetSize(& width, & height);