Fixed status bar probs,
Compilation fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -211,7 +211,6 @@
|
|||||||
\input sashevt.tex
|
\input sashevt.tex
|
||||||
\input sashlayw.tex
|
\input sashlayw.tex
|
||||||
\input sashwin.tex
|
\input sashwin.tex
|
||||||
\input sbsizer.tex
|
|
||||||
\input screendc.tex
|
\input screendc.tex
|
||||||
\input scrolbar.tex
|
\input scrolbar.tex
|
||||||
\input scrlwevt.tex
|
\input scrlwevt.tex
|
||||||
@@ -230,6 +229,7 @@
|
|||||||
\input splitter.tex
|
\input splitter.tex
|
||||||
\input statbmp.tex
|
\input statbmp.tex
|
||||||
\input statbox.tex
|
\input statbox.tex
|
||||||
|
\input sbsizer.tex
|
||||||
\input statline.tex
|
\input statline.tex
|
||||||
\input stattext.tex
|
\input stattext.tex
|
||||||
\input statusbr.tex
|
\input statusbr.tex
|
||||||
|
@@ -72,6 +72,8 @@ public:
|
|||||||
virtual void SetMenuBar( wxMenuBar *menuBar );
|
virtual void SetMenuBar( wxMenuBar *menuBar );
|
||||||
|
|
||||||
#if wxUSE_STATUSBAR
|
#if wxUSE_STATUSBAR
|
||||||
|
virtual void PositionStatusBar();
|
||||||
|
|
||||||
virtual wxStatusBar* CreateStatusBar(int number = 1,
|
virtual wxStatusBar* CreateStatusBar(int number = 1,
|
||||||
long style = wxST_SIZEGRIP,
|
long style = wxST_SIZEGRIP,
|
||||||
wxWindowID id = 0,
|
wxWindowID id = 0,
|
||||||
|
@@ -72,6 +72,8 @@ public:
|
|||||||
virtual void SetMenuBar( wxMenuBar *menuBar );
|
virtual void SetMenuBar( wxMenuBar *menuBar );
|
||||||
|
|
||||||
#if wxUSE_STATUSBAR
|
#if wxUSE_STATUSBAR
|
||||||
|
virtual void PositionStatusBar();
|
||||||
|
|
||||||
virtual wxStatusBar* CreateStatusBar(int number = 1,
|
virtual wxStatusBar* CreateStatusBar(int number = 1,
|
||||||
long style = wxST_SIZEGRIP,
|
long style = wxST_SIZEGRIP,
|
||||||
wxWindowID id = 0,
|
wxWindowID id = 0,
|
||||||
|
@@ -2447,6 +2447,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
|
|||||||
{
|
{
|
||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case WXK_RETURN:
|
case WXK_RETURN:
|
||||||
if ( event.ControlDown() )
|
if ( event.ControlDown() )
|
||||||
|
@@ -985,6 +985,13 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
|
|||||||
return wxFrameBase::CreateStatusBar( number, style, id, name );
|
return wxFrameBase::CreateStatusBar( number, style, id, name );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxFrame::PositionStatusBar()
|
||||||
|
{
|
||||||
|
if ( !m_frameStatusBar )
|
||||||
|
return;
|
||||||
|
|
||||||
|
m_sizeSet = FALSE;
|
||||||
|
}
|
||||||
#endif // wxUSE_STATUSBAR
|
#endif // wxUSE_STATUSBAR
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
@@ -985,6 +985,13 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
|
|||||||
return wxFrameBase::CreateStatusBar( number, style, id, name );
|
return wxFrameBase::CreateStatusBar( number, style, id, name );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxFrame::PositionStatusBar()
|
||||||
|
{
|
||||||
|
if ( !m_frameStatusBar )
|
||||||
|
return;
|
||||||
|
|
||||||
|
m_sizeSet = FALSE;
|
||||||
|
}
|
||||||
#endif // wxUSE_STATUSBAR
|
#endif // wxUSE_STATUSBAR
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user