Removed helpwxht.h/cpp (old wxHelpControllerHtml class)

[wxWidgets.git] / samples / resource / resource.cpp

diff --git a/samples/resource/resource.cpp b/samples/resource/resource.cpp
index 836cf563a4f43b27ee2acc74725bd54146245570..807c387fa13dcb1e93be5b2f2e834428e3535b86 100644 (file)
--- a/samples/resource/resource.cpp
+++ b/samples/resource/resource.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__
@@ -113,12 +113,14 @@ bool MyApp::OnInit(void)
 
 MyApp::~MyApp()
 {
+#if defined(__WXMSW__)
     delete dialog1;
     delete menu1;
+#endif
 }
 
 BEGIN_EVENT_TABLE(MyPanel, wxPanel)
-       EVT_LEFT_DOWN( MyPanel::OnClick)
+    EVT_LEFT_DOWN( MyPanel::OnClick)
 END_EVENT_TABLE()
 
 MyPanel::MyPanel( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, 
@@ -136,9 +138,9 @@ void MyPanel::OnClick( wxMouseEvent &WXUNUSED(event2) )
 
 
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-       EVT_MENU(RESOURCE_ABOUT, MyFrame::OnAbout)
-       EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit)
-       EVT_MENU(RESOURCE_TESTDIALOG, MyFrame::OnTestDialog)
+    EVT_MENU(RESOURCE_ABOUT, MyFrame::OnAbout)
+    EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit)
+    EVT_MENU(RESOURCE_TESTDIALOG, MyFrame::OnTestDialog)
 END_EVENT_TABLE()
 
 // Define my frame constructor
@@ -157,7 +159,7 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
-       Close(TRUE);
+    Close(TRUE);
 }
 
 void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
@@ -173,16 +175,9 @@ void MyFrame::OnTestDialog(wxCommandEvent& WXUNUSED(event) )
       dialog->Close(TRUE);
 }
 
-bool MyFrame::OnClose(void)
-{
-  Show(FALSE);
-
-  return TRUE;
-}
-
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
-  //   EVT_BUTTON(RESOURCE_OK, MyDialog::OnOk)
-       EVT_BUTTON(ID_BUTTON109, MyDialog::OnCancel)
+    //EVT_BUTTON(RESOURCE_OK, MyDialog::OnOk)
+    EVT_BUTTON(ID_BUTTON109, MyDialog::OnCancel)
 END_EVENT_TABLE()