X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/329e86bfdedacf2736fa77eea1ae171c3c732355..530e7fa307b74800391cd58f573ea2aa2addbb9f:/samples/dialogs/dialogs.cpp diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index a3efceb355..daf445cefb 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -117,8 +117,8 @@ void MyFrame::ExtDialog(wxCommandEvent& WXUNUSED(event) ) // other platforms. Also, it will not be resizable // anywhere. - wxExtDialog dialog( this, -1, "Test 1 for wxExtDialog", - wxOK|wxFORWARD|wxBACKWARD ); + wxExtDialog dialog( this, -1, "Test 1 for wxExtDialog", wxOK|wxFORWARD|wxBACKWARD ); + dialog.AddButton( new wxButton( &dialog, -1, "Custom") ); dialog.SetClientWindow( new wxTextCtrl( &dialog, -1, "Test", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ) ); @@ -133,7 +133,8 @@ void MyFrame::ExtDialog(wxCommandEvent& WXUNUSED(event) ) // all platforms. wxExtDialog dialog2( this, -1, "Test 2 for wxExtDialog", - wxOK|wxFORWARD|wxBACKWARD|wxCANCEL, wxDefaultPosition, wxSize(400,170), + wxOK|wxFORWARD|wxBACKWARD|wxCANCEL, + wxDefaultPosition, wxSize(400,170), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxED_BUTTONS_RIGHT | wxED_STATIC_LINE | wxED_CLIENT_MARGIN ); dialog2.SetClientWindow( new wxTextCtrl( &dialog2, -1, "Test", wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE ) ); @@ -311,6 +312,7 @@ void MyFrame::DirChoose(wxCommandEvent& WXUNUSED(event) ) void MyFrame::ShowTip(wxCommandEvent& event) { +#if wxUSE_STARTUP_TIPS static size_t s_index = (size_t)-1; if ( s_index == (size_t)-1 ) @@ -334,6 +336,7 @@ void MyFrame::ShowTip(wxCommandEvent& event) s_index = tipProvider->GetCurrentTip(); delete tipProvider; +#endif } void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) )