// For some reason, wxWindows can activate another task altogether
// when a frame is destroyed after a modal dialog has been invoked.
// Try to bring the parent to the top.
+ // MT:Only do this if this frame is currently the active window, else weird
+ // things start to happen
+ if ( wxGetActiveWindow() == this )
if (GetParent() && GetParent()->GetHWND())
::BringWindowToTop((HWND) GetParent()->GetHWND());
}
rect.bottom -= pt.y;
rect.right -= pt.x;
- *x = rect.right;
- *y = rect.bottom;
+ if ( x )
+ *x = rect.right;
+ if ( y )
+ *y = rect.bottom;
}
// Set the client size (i.e. leave the calculation of borders etc.
*y = point.y;
}
-void wxFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
- int currentX, currentY;
- int x1 = x;
- int y1 = y;
- int w1 = width;
- int h1 = height;
-
- GetPosition(¤tX, ¤tY);
- if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- x1 = currentX;
- if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
- y1 = currentY;
-
- int ww,hh ;
- GetSize(&ww,&hh) ;
- if (width == -1) w1 = ww ;
- if (height==-1) h1 = hh ;
-
- MoveWindow(GetHwnd(), x1, y1, w1, h1, (BOOL)TRUE);
-
- wxSizeEvent event(wxSize(width, height), m_windowId);
- event.SetEventObject( this );
- GetEventHandler()->ProcessEvent(event);
-}
-
bool wxFrame::Show(bool show)
{
int cshow;
{
// VZ: calling CreateStatusBar twice is an error - why anyone would do it?
wxCHECK_MSG( m_frameStatusBar == NULL, FALSE,
- _T("recreating status bar in wxFrame") );
+ wxT("recreating status bar in wxFrame") );
m_frameStatusBar = OnCreateStatusBar(number, style, id,
name);
void wxFrame::SetStatusText(const wxString& text, int number)
{
- wxCHECK_RET( m_frameStatusBar != NULL, _T("no statusbar to set text for") );
+ wxCHECK_RET( m_frameStatusBar != NULL, wxT("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, _T("no statusbar to set widths for") );
+ wxCHECK_RET( m_frameStatusBar != NULL, wxT("no statusbar to set widths for") );
m_frameStatusBar->SetStatusWidths(n, widths_field);
PositionStatusBar();
}
#endif // wxUSE_STATUSBAR
+void wxFrame::DetachMenuBar()
+{
+ if (m_frameMenuBar)
+ {
+ m_frameMenuBar->Detach();
+ m_frameMenuBar = NULL;
+ }
+}
+
void wxFrame::SetMenuBar(wxMenuBar *menu_bar)
{
if (!menu_bar)
{
- m_frameMenuBar = NULL;
+ DetachMenuBar();
return;
}
- wxCHECK_RET( !menu_bar->GetFrame(), _T("this menubar is already attached") );
+ wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") );
if (m_frameMenuBar)
delete m_frameMenuBar;
{
if (GetStatusBar())
{
+ wxString help;
int menuId = event.GetMenuId();
if ( menuId != -1 )
{
wxMenuBar *menuBar = GetMenuBar();
if (menuBar && menuBar->FindItem(menuId))
{
- // set status text even if the string is empty - this will at
- // least remove the string from the item which was previously
- // selected
- SetStatusText(menuBar->GetHelpString(menuId));
+ help = menuBar->GetHelpString(menuId);
}
}
+
+ // set status text even if the string is empty - this will at
+ // least remove the string from the item which was previously
+ // selected
+ SetStatusText(help);
}
}
return FALSE;
wxMenuItem *item = bar->FindItemForId(id);
- if ( !item )
- return FALSE;
- if ( item->IsCheckable() )
+ if ( item && item->IsCheckable() )
{
bar->Check(id, !bar->IsChecked(id)) ;
}
return pt;
}
-void wxFrame::ScreenToClient(int *x, int *y) const
+void wxFrame::DoScreenToClient(int *x, int *y) const
{
- wxWindow::ScreenToClient(x, y);
+ wxWindow::DoScreenToClient(x, y);
// We may be faking the client origin.
// So a window that's really at (0, 30) may appear
*y -= pt.y;
}
-void wxFrame::ClientToScreen(int *x, int *y) const
+void wxFrame::DoClientToScreen(int *x, int *y) const
{
// We may be faking the client origin.
// So a window that's really at (0, 30) may appear
*x += pt1.x;
*y += pt1.y;
- wxWindow::ClientToScreen(x, y);
+ wxWindow::DoClientToScreen(x, y);
}
#if wxUSE_TOOLBAR
wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
{
wxCHECK_MSG( m_frameToolBar == NULL, FALSE,
- _T("recreating toolbar in wxFrame") );
+ wxT("recreating toolbar in wxFrame") );
wxToolBar* toolBar = OnCreateToolBar(style, id, name);
if (toolBar)
return FALSE;
const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable();
- return acceleratorTable.Ok() &&
- ::TranslateAccelerator(GetHwnd(),
- GetTableHaccel(acceleratorTable),
- (MSG *)pMsg);
+ return acceleratorTable.Translate(this, pMsg);
}
// ---------------------------------------------------------------------------
{
if ( m_iconized )
{
- HICON hIcon = m_icon.Ok() ? GetIconHicon(m_icon)
+ HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
: (HICON)m_defaultIcon;
// Hold a pointer to the dc so long as the OnPaint() message
}
else
{
- wxPaintEvent event(m_windowId);
- event.m_eventObject = this;
-
- return GetEventHandler()->ProcessEvent(event);
+ return wxWindow::HandlePaint();
}
}
else
return FALSE;
}
-bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu)
+bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
{
int item;
- if ( nFlags == 0xFFFF && hMenu == 0 )
+ if ( flags == 0xFFFF && hMenu == 0 )
{
- // FIXME: what does this do? does it ever happen?
+ // menu was removed from screen
item = -1;
}
- else if ((nFlags != MF_SEPARATOR) && (nItem != 0) && (nItem != 65535))
+ else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) )
{
item = nItem;
}
else
{
+ // don't give hints for separators (doesn't make sense) nor for the
+ // items opening popup menus (they don't have them anyhow)
return FALSE;
}
case WM_QUERYDRAGICON:
{
- HICON hIcon = m_icon.Ok() ? GetIconHicon(m_icon)
+ HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon)
: (HICON)(m_defaultIcon);
rc = (long)hIcon;
processed = rc != 0;
return rc;
}
+
projects / wxWidgets.git / blobdiff