Add semi-public wxDynamicLibrary::MSWGetModuleHandle().

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

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index dce90cc97da7913461841bc6573733aaf70223be..73d53aacc207c1ccdc09d87799da21da88960398 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -24,10 +24,17 @@
 #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)
@@ -36,7 +43,7 @@ bool MyApp::OnInit(void)
     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));
+  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
@@ -46,18 +53,18 @@ bool MyApp::OnInit(void)
   // 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;
 
-  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
-  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);
 
   // Return the main frame window
@@ -75,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))
@@ -87,12 +96,12 @@ void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event))
 {
 #if ( defined(__WXPM__) || defined(__WXMSW__) ) && !defined(__WXUNIVERSAL__)
     MyDialog dialog;
-    if (dialog.LoadNativeDialog(this, _T("dialog1")))
+    if (dialog.LoadNativeDialog(this, wxT("dialog1")))
     {
         dialog.ShowModal();
     }
 #else
-    wxMessageBox(_T("No native dialog support"),_T("Platform limitation"));
+    wxMessageBox(wxT("No native dialog support"),wxT("Platform limitation"));
 #endif
 }
 
@@ -104,10 +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);
 }