X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..acd32ffcdb319f162633c20e0202db3f8542998a:/samples/nativdlg/nativdlg.cpp

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 4e52a9ad23..ef9b9f06b4 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:
@@ -24,14 +24,24 @@
 #error Sorry, this sample is only appropriate under Windows.
 #endif
 
+#ifndef __WXMSW__
+    #include "../sample.xpm"
+#endif
+
 #include <ctype.h>
 #include "nativdlg.h"
 #include "resource.h"
 
+
+
+
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
+  if ( !wxApp::OnInit() )
+    return false;
+
   // Create the main frame window
   MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
 
@@ -72,7 +82,9 @@ END_EVENT_TABLE()
 MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size):
   wxFrame(parent, id, title, pos, size)
 {
-  panel = NULL;
+    SetIcon(wxICON(sample));
+
+    panel = NULL;
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
@@ -82,7 +94,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
-#if ( defined(__WXOS2__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
+#if ( defined(__WXPM__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
     MyDialog dialog;
     if (dialog.LoadNativeDialog(this, _T("dialog1")))
     {
@@ -101,12 +113,10 @@ END_EVENT_TABLE()
 
 void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 {
-  EndModal(wxID_OK);
+    EndModal(wxID_OK);
 }
 
 void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
-  EndModal(wxID_CANCEL);
+    EndModal(wxID_CANCEL);
 }
-
-