Add wxART_FULL_SCREEN icon.

Use stock GTK+ icon in wxGTK and Tango icon elsewhere.

See #2662.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-10-11 16:30:06 +00:00
parent 2f51147732
commit 793187de9d
10 changed files with 299 additions and 3 deletions

View File

@@ -28,6 +28,7 @@
#include "wx/wx.h"
#endif
#include "wx/artprov.h"
#include "wx/bookctrl.h"
#include "wx/sysopt.h"
@@ -206,7 +207,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
wxMenu *menuDisplay = new wxMenu;
menuDisplay->Append(Display_FromPoint, _("Find from &point..."));
menuDisplay->AppendSeparator();
menuDisplay->AppendCheckItem(Display_FullScreen, _("Full &screen\tF12"));
wxMenuItem* const
itemFullScreen = new wxMenuItem(menuDisplay,
Display_FullScreen,
_("Full &screen\tF12"));
itemFullScreen->SetBitmap(
wxArtProvider::GetBitmap(wxART_FULL_SCREEN, wxART_MENU)
);
menuDisplay->Append(itemFullScreen);
menuDisplay->AppendSeparator();
menuDisplay->Append(Display_Quit, _("E&xit\tAlt-X"), _("Quit this program"));
@@ -364,9 +372,9 @@ void MyFrame::OnFromPoint(wxCommandEvent& WXUNUSED(event))
CaptureMouse();
}
void MyFrame::OnFullScreen(wxCommandEvent& event)
void MyFrame::OnFullScreen(wxCommandEvent& WXUNUSED(event))
{
ShowFullScreen(event.IsChecked());
ShowFullScreen(!IsFullScreen());
}
#if wxUSE_DISPLAY