1. wxGetFullHostName() does return the full host name now under MSW
2. wxGetEmailAddress() doesn't always return empty string... 3. status bar created under MSW is of type wxStatusBar, hence wxWin RTTI works for it 4. carsh in IPC sample fixed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -360,31 +360,29 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number,
|
||||
wxStatusBar *statusBar = NULL;
|
||||
|
||||
#if wxUSE_NATIVE_STATUSBAR
|
||||
if ( UsesNativeStatusBar() )
|
||||
if ( !UsesNativeStatusBar() )
|
||||
{
|
||||
statusBar = (wxStatusBar *)new wxStatusBar95(this, id, style);
|
||||
|
||||
statusBar->SetFieldsCount(number);
|
||||
statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style, name);
|
||||
|
||||
// Set the height according to the font and the border size
|
||||
wxClientDC dc(statusBar);
|
||||
dc.SetFont(statusBar->GetFont());
|
||||
|
||||
wxCoord y;
|
||||
dc.GetTextExtent(_T("X"), NULL, &y );
|
||||
|
||||
int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
|
||||
|
||||
statusBar->SetSize(-1, -1, -1, height);
|
||||
|
||||
statusBar->SetFieldsCount(number);
|
||||
statusBar = new wxStatusBar(this, id, style, name);
|
||||
}
|
||||
|
||||
// Set the height according to the font and the border size
|
||||
wxClientDC dc(statusBar);
|
||||
dc.SetFont(statusBar->GetFont());
|
||||
|
||||
wxCoord y;
|
||||
dc.GetTextExtent(_T("X"), NULL, &y );
|
||||
|
||||
int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY());
|
||||
|
||||
statusBar->SetSize(-1, -1, -1, height);
|
||||
|
||||
statusBar->SetFieldsCount(number);
|
||||
|
||||
return statusBar;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user