X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bbf1f0e5cffb8c01696eb26e254857a61f017d70..81c9effa8462662263c3b4eac2cfae1ef5caae2c:/samples/nativdlg/nativdlg.cpp diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index 32d24f893c..764f619784 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart and Markus Holzem -// Licence: wxWindows license +// Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -24,6 +24,10 @@ #include "wx/wx.h" #endif +#ifndef __WXMSW__ +#error Sorry, this sample is only appropriate under Windows. +#endif + #include "wx/resource.h" #include @@ -72,8 +76,8 @@ bool MyApp::OnInit(void) } BEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) - EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) + EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) + EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) END_EVENT_TABLE() // Define my frame constructor @@ -85,13 +89,13 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c void MyFrame::OnQuit(wxCommandEvent& event) { - Close(TRUE); + Close(TRUE); } void MyFrame::OnTest1(wxCommandEvent& event) { MyDialog *dialog = new MyDialog; - if (dialog->LoadNativeDialog(this, dialog1)) + if (dialog->LoadNativeDialog(this, "dialog1")) { /* wxTextCtrl *text = (wxTextCtrl *)wxFindWindowByName("multitext3", dialog); @@ -104,16 +108,9 @@ void MyFrame::OnTest1(wxCommandEvent& event) dialog->Close(TRUE); } -bool MyFrame::OnClose(void) -{ - Show(FALSE); - - return TRUE; -} - BEGIN_EVENT_TABLE(MyDialog, wxDialog) - EVT_BUTTON(wxID_OK, MyDialog::OnOk) - EVT_BUTTON(wxID_CANCEL, MyDialog::OnCancel) + EVT_BUTTON(wxID_OK, MyDialog::OnOk) + EVT_BUTTON(wxID_CANCEL, MyDialog::OnCancel) END_EVENT_TABLE()