X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e79049db32b48d5334a89e7cb56f74161ac1d10..60f8c22b2502f825e054cb4cacd7c119a5aca8dd:/samples/nativdlg/nativdlg.cpp?ds=inline

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 1ab4ea4940..dce90cc97d 100644
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        nativdlg.cpp
+// Name:        samples/nativdlg/nativdlg.cpp
 // Purpose:     Native Windows dialog sample
 // Author:      Julian Smart
 // Modified by:
@@ -9,10 +9,6 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -34,18 +30,18 @@
 
 IMPLEMENT_APP(MyApp)
 
-// Testing of ressources
-MyApp::MyApp()
-{
-}
-
 bool MyApp::OnInit(void)
 {
+  if ( !wxApp::OnInit() )
+    return false;
+
   // Create the main frame window
-  MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWindows Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
+  MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 
+#if wxUSE_STATUSBAR
   // Give it a status line
   frame->CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -89,16 +85,14 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
-#if ( defined(__WXOS2__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
-      MyDialog *dialog = new MyDialog;
-      if (dialog->LoadNativeDialog(this, _T("dialog1")))
-      {
-    dialog->SetModal(true);
-        dialog->ShowModal();
-      }
-  dialog->Close(true);
+#if ( defined(__WXPM__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
+    MyDialog dialog;
+    if (dialog.LoadNativeDialog(this, _T("dialog1")))
+    {
+        dialog.ShowModal();
+    }
 #else
-  wxMessageBox(_T("No native dialog support"),_T("Platform limitation"));
+    wxMessageBox(_T("No native dialog support"),_T("Platform limitation"));
 #endif
 }
 
@@ -117,5 +111,3 @@ void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
   EndModal(wxID_CANCEL);
 }
-
-