Eliminated bizarre VC++ internal compiler errors, perhaps related to
enabling C++ RTTI git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -250,7 +250,11 @@ void wxStatusBarBase::FreeStacks()
|
|||||||
void wxStatusBarBase::PushStatusText(const wxString& text, int number)
|
void wxStatusBarBase::PushStatusText(const wxString& text, int number)
|
||||||
{
|
{
|
||||||
wxListString* st = GetOrCreateStatusStack(number);
|
wxListString* st = GetOrCreateStatusStack(number);
|
||||||
st->Insert(new wxString(GetStatusText(number)));
|
// This long-winded way around avoids an internal compiler error
|
||||||
|
// in VC++ 6 with RTTI enabled
|
||||||
|
wxString tmp1(GetStatusText(number));
|
||||||
|
wxString* tmp = new wxString(tmp1);
|
||||||
|
st->Insert(tmp);
|
||||||
SetStatusText(text, number);
|
SetStatusText(text, number);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -250,7 +250,7 @@ void wxStatusBar95::DoMoveWindow(int x, int y, int width, int height)
|
|||||||
// omitted because for normal status bars (positioned along the bottom
|
// omitted because for normal status bars (positioned along the bottom
|
||||||
// edge) the position is already set correctly, but if the user wants to
|
// edge) the position is already set correctly, but if the user wants to
|
||||||
// position them in some exotic location, this is really needed
|
// position them in some exotic location, this is really needed
|
||||||
wxWindow::DoMoveWindow(x, y, width, height);
|
wxWindowMSW::DoMoveWindow(x, y, width, height);
|
||||||
|
|
||||||
// adjust fields widths to the new size
|
// adjust fields widths to the new size
|
||||||
SetFieldsWidth();
|
SetFieldsWidth();
|
||||||
|
Reference in New Issue
Block a user