Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index 4e52a9ad23bf0cdad791d1d01cbaa4a1811fc88e..16daebfdd8bd290105a241649918a3b1149cd280 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        nativdlg.cpp
+// Name:        samples/nativdlg/nativdlg.cpp

 // Purpose:     Native Windows dialog sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     Native Windows dialog sample
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -24,16 +24,26 @@
 #error Sorry, this sample is only appropriate under Windows.
 #endif
 
 #error Sorry, this sample is only appropriate under Windows.
 #endif
 

+#ifndef wxHAS_IMAGES_IN_RESOURCES
+    #include "../sample.xpm"
+#endif
+

 #include <ctype.h>
 #include "nativdlg.h"
 #include "resource.h"
 
 #include <ctype.h>
 #include "nativdlg.h"
 #include "resource.h"
 

+
+
+

 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {
 IMPLEMENT_APP(MyApp)
 
 bool MyApp::OnInit(void)
 {

+  if ( !wxApp::OnInit() )
+    return false;
+

   // Create the main frame window
   // Create the main frame window

-  MyFrame   *frame = new MyFrame(NULL, wxID_ANY, _T("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));
+  MyFrame   *frame = new MyFrame(NULL, wxID_ANY, wxT("wxWidgets Native Dialog Sample"), wxPoint(0, 0), wxSize(300, 250));

 
 #if wxUSE_STATUSBAR
   // Give it a status line
 
 #if wxUSE_STATUSBAR
   // Give it a status line


@@ -43,23 +53,20 @@ bool MyApp::OnInit(void)
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
 

-  file_menu->Append(RESOURCE_TEST1, _T("&Dialog box test"),                _T("Test dialog box resource"));
-  file_menu->Append(RESOURCE_QUIT, _T("E&xit"),                _T("Quit program"));
+  file_menu->Append(RESOURCE_TEST1, wxT("&Dialog box test"),                wxT("Test dialog box resource"));
+  file_menu->Append(RESOURCE_QUIT, wxT("E&xit"),                wxT("Quit program"));

 
   wxMenuBar *menu_bar = new wxMenuBar;
 
 
   wxMenuBar *menu_bar = new wxMenuBar;
 

-  menu_bar->Append(file_menu, _T("&File"));
+  menu_bar->Append(file_menu, wxT("&File"));

 
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
   // Make a panel
 
   // Associate the menu bar with the frame
   frame->SetMenuBar(menu_bar);
 
   // Make a panel

-  frame->panel = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400), 0, _T("MyMainFrame"));
+  frame->panel = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400), 0, wxT("MyMainFrame"));

   frame->Show(true);
 
   frame->Show(true);
 

-  // Return the main frame window
-  SetTopWindow(frame);
-

   return true;
 }
 
   return true;
 }
 


@@ -72,7 +79,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)
 {
 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))
 }
 
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))


@@ -82,14 +91,14 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnTest1(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;
     MyDialog dialog;

-    if (dialog.LoadNativeDialog(this, _T("dialog1")))
+    if (dialog.LoadNativeDialog(this, wxT("dialog1")))

     {
         dialog.ShowModal();
     }
 #else
     {
         dialog.ShowModal();
     }
 #else

-    wxMessageBox(_T("No native dialog support"),_T("Platform limitation"));
+    wxMessageBox(wxT("No native dialog support"),wxT("Platform limitation"));

 #endif
 }
 
 #endif
 }
 


@@ -101,12 +110,10 @@ END_EVENT_TABLE()
 
 void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 {

-  EndModal(wxID_OK);
+    EndModal(wxID_OK);

 }
 
 void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void MyDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
 {

-  EndModal(wxID_CANCEL);
+    EndModal(wxID_CANCEL);

 }
 }

-
-