mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-22 22:24:56 +08:00
Revert "Wrap label if necessary in wxInfoBar in wxGTK"
This reverts commit 32d8b5954a which was
broken in both the generic and GTK version: generic one didn't work at
all and GTK one didn't adjust the height of the infobar correctly.
See #1443, #14121.
This commit is contained in:
@@ -166,7 +166,6 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
#endif // wxUSE_LOG_DIALOG
|
||||
#if wxUSE_INFOBAR
|
||||
EVT_MENU(DIALOGS_INFOBAR_SIMPLE, MyFrame::InfoBarSimple)
|
||||
EVT_MENU(DIALOGS_INFOBAR_SIMPLE_WRAPPED, MyFrame::InfoBarSimpleWrapped)
|
||||
EVT_MENU(DIALOGS_INFOBAR_ADVANCED, MyFrame::InfoBarAdvanced)
|
||||
#endif // wxUSE_INFOBAR
|
||||
|
||||
@@ -580,7 +579,6 @@ bool MyApp::OnInit()
|
||||
|
||||
#if wxUSE_INFOBAR
|
||||
info_menu->Append(DIALOGS_INFOBAR_SIMPLE, "Simple &info bar\tCtrl-I");
|
||||
info_menu->Append(DIALOGS_INFOBAR_SIMPLE_WRAPPED, "Simple info bar with wrapped text");
|
||||
info_menu->Append(DIALOGS_INFOBAR_ADVANCED, "&Advanced info bar\tShift-Ctrl-I");
|
||||
#endif // wxUSE_INFOBAR
|
||||
|
||||
@@ -950,11 +948,6 @@ void MyFrame::InfoBarSimple(wxCommandEvent& WXUNUSED(event))
|
||||
);
|
||||
}
|
||||
|
||||
void MyFrame::InfoBarSimpleWrapped(wxCommandEvent &WXUNUSED(event))
|
||||
{
|
||||
m_infoBarSimple->ShowMessage( "This is very very long message to try the label wrapping on the info bar" );
|
||||
}
|
||||
|
||||
void MyFrame::InfoBarAdvanced(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
m_infoBarAdvanced->ShowMessage("Sorry, it didn't work out.", wxICON_WARNING);
|
||||
|
||||
Reference in New Issue
Block a user