1. added wxStatusBarUniv
2. several bug fixes to wxSpinButton/wxSpinCtrl git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -231,17 +231,6 @@ wxStatusBar *wxFrameMSW::OnCreateStatusBar(int 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;
|
||||
|
||||
@@ -45,7 +45,6 @@
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStatusBar95, wxWindow);
|
||||
IMPLEMENT_DYNAMIC_CLASS(wxStatusBar, wxStatusBar95)
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// macros
|
||||
@@ -127,7 +126,6 @@ bool wxStatusBar95::Create(wxWindow *parent,
|
||||
|
||||
wxStatusBar95::~wxStatusBar95()
|
||||
{
|
||||
delete [] m_statusWidths;
|
||||
}
|
||||
|
||||
void wxStatusBar95::CopyFieldsWidth(const int widths[])
|
||||
|
||||
@@ -2562,7 +2562,10 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
|
||||
break;
|
||||
#endif // __WIN32__
|
||||
|
||||
#ifdef __WXUNIVERSAL__
|
||||
// unfortunately this doesn't really work as then window which
|
||||
// doesn't accept focus doesn't get any mouse events neither which
|
||||
// means it can't get any input at all
|
||||
#if 0 //def __WXUNIVERSAL__
|
||||
case WM_NCHITTEST:
|
||||
// we shouldn't allow the windows which don't want to get focus to
|
||||
// get it
|
||||
|
||||
Reference in New Issue
Block a user