X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5b208a1796ecf1b9ab267d200705b4f3b4d10e3..814028444d682b23af3809227cd485f4bebc1286:/samples/clipboard/clipboard.cpp?ds=sidebyside diff --git a/samples/clipboard/clipboard.cpp b/samples/clipboard/clipboard.cpp index faaa532c72..1dc3a4216c 100644 --- a/samples/clipboard/clipboard.cpp +++ b/samples/clipboard/clipboard.cpp @@ -22,7 +22,7 @@ #include "wx/clipbrd.h" -#if !defined(__WXMSW__) && !defined(__WXPM__) +#ifndef wxHAS_IMAGES_IN_RESOURCES #include "../sample.xpm" #endif @@ -115,7 +115,7 @@ MyFrame::MyFrame(const wxString& title) // the "About" item should be in the help menu wxMenu *helpMenu = new wxMenu; - helpMenu->Append(ID_About, "&About...\tF1", "Show about dialog"); + helpMenu->Append(ID_About, "&About\tF1", "Show about dialog"); fileMenu->Append(ID_Quit, "E&xit\tAlt-X", "Quit this program"); @@ -131,7 +131,7 @@ MyFrame::MyFrame(const wxString& title) wxPanel *panel = new wxPanel( this, -1 ); wxBoxSizer *main_sizer = new wxBoxSizer( wxVERTICAL ); - main_sizer->Add( new wxButton( panel, ID_Write, "Get clipboard text" ) ); + main_sizer->Add( new wxButton( panel, ID_Write, "Get clipboard text" ), 0, wxALL, 5 ); m_textctrl = new wxTextCtrl( panel, ID_Text, "", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ); main_sizer->Add( m_textctrl, 1, wxGROW );